diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2f53cc1..6a5995a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -125,6 +125,7 @@
                   android:theme="@style/Theme.Settings.Home"
                   android:taskAffinity="com.android.settings.root"
                   android:launchMode="singleTask"
+                  android:exported="true"
                   android:configChanges="keyboard|keyboardHidden">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.SETTINGS" />
@@ -137,6 +138,7 @@
         <activity android:name=".network.telephony.MobileNetworkActivity"
                   android:label="@string/network_settings_title"
                   android:theme="@style/Theme.Settings.Home"
+                  android:exported="true"
                   android:launchMode="singleTask">
             <intent-filter android:priority="1">
                 <!-- Displays the MobileNetworkActivity and opt-in dialog for capability discovery. -->
@@ -153,6 +155,7 @@
                 android:label="@string/settings_label_launcher"
                 android:taskAffinity="com.android.settings.root"
                 android:launchMode="singleTask"
+                android:exported="true"
                 android:targetActivity=".homepage.SettingsHomepageActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -162,7 +165,8 @@
             <meta-data android:name="android.app.shortcuts" android:resource="@xml/shortcuts"/>
         </activity-alias>
 
-        <receiver android:name=".SettingsInitialize">
+        <receiver android:name=".SettingsInitialize"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.USER_INITIALIZE"/>
                 <action android:name="android.intent.action.PRE_BOOT_COMPLETED"/>
@@ -172,6 +176,7 @@
         <activity android:name=".SubSettings"/>
 
         <activity android:name=".Settings$CreateShortcutActivity"
+                  android:exported="true"
                   android:label="@string/settings_shortcut">
             <intent-filter>
                 <action android:name="android.intent.action.CREATE_SHORTCUT" />
@@ -186,6 +191,7 @@
         <activity
             android:name=".Settings$NetworkDashboardActivity"
             android:label="@string/network_dashboard_title"
+            android:exported="true"
             android:icon="@drawable/ic_homepage_network">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.WIRELESS_SETTINGS" />
@@ -205,6 +211,7 @@
         </activity>
 
         <activity android:name=".Settings$MobileNetworkListActivity"
+                  android:exported="true"
                   android:label="@string/network_settings_title">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.MOBILE_NETWORK_LIST" />
@@ -219,6 +226,7 @@
         <activity
             android:name=".Settings$ConnectedDeviceDashboardActivity"
             android:label="@string/connected_devices_dashboard_title"
+            android:exported="true"
             android:icon="@drawable/ic_homepage_connected_device">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.BLUETOOTH_SETTINGS" />
@@ -255,6 +263,7 @@
             android:name="Settings$WifiSettingsActivity"
             android:label="@string/wifi_settings"
             android:icon="@drawable/ic_homepage_network"
+            android:exported="true"
             android:configChanges="orientation|keyboardHidden|screenSize">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.WIFI_SETTINGS" />
@@ -271,26 +280,8 @@
         </activity>
 
         <activity
-            android:name="Settings$WifiSettings2Activity"
-            android:label="@string/wifi_settings"
-            android:icon="@drawable/ic_homepage_network"
-            android:configChanges="orientation|keyboardHidden|screenSize">
-            <intent-filter android:priority="1">
-                <action android:name="android.settings.WIFI_SETTINGS2" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <intent-filter android:priority="1">
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.settings.SHORTCUT" />
-            </intent-filter>
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.wifi.WifiSettings2" />
-            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
-                       android:value="true" />
-        </activity>
-
-        <activity
-            android:name=".wifi.WifiPickerActivity">
+            android:name=".wifi.WifiPickerActivity"
+            android:exported="true">
             <intent-filter android:priority="1">
                 <action android:name="android.net.wifi.PICK_WIFI_NETWORK" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -303,6 +294,7 @@
             android:name="Settings$ConfigureWifiSettingsActivity"
             android:label="@string/wifi_configure_settings_preference_title"
             android:icon="@drawable/ic_settings_wireless"
+            android:exported="true"
             android:configChanges="orientation|keyboardHidden|screenSize">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.WIFI_IP_SETTINGS" />
@@ -323,6 +315,7 @@
             android:name="Settings$SavedAccessPointsSettingsActivity"
             android:label="@string/wifi_saved_access_points_label"
             android:icon="@drawable/ic_settings_wireless"
+            android:exported="true"
             android:configChanges="orientation|keyboardHidden|screenSize">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.WIFI_SAVED_NETWORK_SETTINGS" />
@@ -334,7 +327,8 @@
                 android:value="true" />
         </activity>
 
-        <activity android:name=".Settings$WifiInfoActivity">
+        <activity android:name=".Settings$WifiInfoActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
@@ -344,7 +338,8 @@
                        android:value="com.android.settings.wifi.WifiInfo" />
         </activity>
 
-        <activity android:name=".wifi.WifiConfigInfo">
+        <activity android:name=".wifi.WifiConfigInfo"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
@@ -352,7 +347,8 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".Settings$WifiAPITestActivity">
+        <activity android:name=".Settings$WifiAPITestActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
@@ -362,7 +358,8 @@
                        android:value="com.android.settings.wifi.WifiAPITest" />
         </activity>
 
-        <activity android:name=".wifi.WifiStatusTest">
+        <activity android:name=".wifi.WifiStatusTest"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
@@ -375,7 +372,7 @@
                   android:excludeFromRecents="true"
                   android:exported="true"
                   android:permission="android.permission.NETWORK_STACK"
-                  android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert">
+                  android:theme="@*android:style/Theme.DeviceDefault.Dialog.Alert.DayNight">
             <intent-filter>
                 <action android:name="android.net.conn.PROMPT_UNVALIDATED" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -391,6 +388,7 @@
         <activity android:name="Settings$ApnSettingsActivity"
                 android:label="@string/apn_settings"
                 android:launchMode="singleTask"
+                android:exported="true"
                 android:configChanges="orientation|keyboardHidden|screenSize">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.APN_SETTINGS" />
@@ -433,6 +431,7 @@
 
         <activity android:name="Settings$AssistGestureSettingsActivity"
             android:label="@string/assist_gesture_title"
+            android:exported="true"
             android:icon="@drawable/ic_settings_gestures">
             <intent-filter>
                 <action android:name="android.settings.ASSIST_GESTURE_SETTINGS" />
@@ -444,6 +443,7 @@
 
         <activity android:name="Settings$FaceSettingsActivity"
             android:label="@string/security_settings_face_preference_title"
+            android:exported="true"
             android:icon="@drawable/ic_face_header">
             <intent-filter>
                 <action android:name="android.settings.FACE_SETTINGS" />
@@ -455,6 +455,7 @@
 
         <activity android:name="Settings$FingerprintSettingsActivity"
                   android:label="@string/security_settings_fingerprint_preference_title"
+                  android:exported="true"
                   android:icon="@drawable/ic_fingerprint_header">
             <intent-filter>
                 <action android:name="android.settings.FINGERPRINT_SETTINGS" />
@@ -467,6 +468,7 @@
         <activity android:name=".bluetooth.DevicePickerActivity"
                 android:label="@string/device_picker"
                 android:configChanges="orientation|keyboardHidden|screenSize"
+                android:exported="true"
                 android:clearTaskOnLaunch="true">
             <intent-filter>
                 <action android:name="android.bluetooth.devicepicker.action.LAUNCH" />
@@ -492,6 +494,7 @@
         <activity
             android:name="Settings$TetherSettingsActivity"
             android:label="@string/tether_settings_title_all"
+            android:exported="true"
             android:icon="@drawable/ic_homepage_network">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -506,6 +509,7 @@
         <activity
             android:name="Settings$WifiTetherSettingsActivity"
             android:label="@string/wifi_hotspot_checkbox_text"
+            android:exported="true"
             android:icon="@drawable/ic_wifi_tethering">
             <intent-filter>
                 <action android:name="com.android.settings.WIFI_TETHER_SETTINGS" />
@@ -530,7 +534,8 @@
                 android:value="com.android.settings.TetherSettings" />
         </activity-alias>
 
-        <activity android:name="Settings$WifiP2pSettingsActivity">
+        <activity android:name="Settings$WifiP2pSettingsActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -543,6 +548,7 @@
         <activity
             android:name="Settings$VpnSettingsActivity"
             android:label="@string/vpn_settings_title"
+            android:exported="true"
             android:icon="@drawable/ic_settings_wireless">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.VPN_SETTINGS" />
@@ -561,6 +567,7 @@
 
         <activity
             android:name="Settings$DataSaverSummaryActivity"
+            android:exported="true"
             android:label="@string/data_saver_title">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.DATA_SAVER_SETTINGS" />
@@ -573,6 +580,7 @@
         <activity
             android:name="Settings$DateTimeSettingsActivity"
             android:label="@string/date_and_time"
+            android:exported="true"
             android:icon="@drawable/ic_settings_date_time">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.DATE_SETTINGS" />
@@ -593,6 +601,7 @@
         <activity
             android:name="Settings$LocalePickerActivity"
             android:label="@string/language_picker_title"
+            android:exported="true"
             android:icon="@drawable/ic_settings_language">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.LOCALE_SETTINGS" />
@@ -618,6 +627,7 @@
         <activity
             android:name=".Settings$LanguageAndInputSettingsActivity"
             android:label="@string/language_settings"
+            android:exported="true"
             android:icon="@drawable/ic_settings_language">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -631,6 +641,7 @@
         </activity>
 
         <activity android:name="Settings$AvailableVirtualKeyboardActivity"
+            android:exported="true"
             android:label="@string/available_virtual_keyboard_category">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.INPUT_METHOD_SETTINGS" />
@@ -642,6 +653,7 @@
 
         <activity
             android:name="Settings$ManageAssistActivity"
+            android:exported="true"
             android:label="@string/assist_and_voice_input_title">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.VOICE_INPUT_SETTINGS" />
@@ -661,6 +673,7 @@
 
         <activity android:name="Settings$PhysicalKeyboardActivity"
             android:label="@string/physical_keyboard_title"
+            android:exported="true"
             android:clearTaskOnLaunch="true">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.HARD_KEYBOARD_SETTINGS" />
@@ -682,6 +695,7 @@
 
         <activity
             android:name="Settings$SpellCheckersSettingsActivity"
+            android:exported="true"
             android:label="@string/spellcheckers_settings_title">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -694,6 +708,7 @@
 
         <activity android:name=".inputmethod.InputMethodAndSubtypeEnablerActivity"
                 android:label=""
+                android:exported="true"
                 android:clearTaskOnLaunch="true">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.INPUT_METHOD_SUBTYPE_SETTINGS" />
@@ -708,6 +723,7 @@
 
         <activity
             android:name="Settings$UserDictionarySettingsActivity"
+            android:exported="true"
             android:label="@string/user_dict_settings_title">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.USER_DICTIONARY_SETTINGS" />
@@ -728,6 +744,7 @@
                   android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar"
                   android:windowSoftInputMode="stateVisible"
                   android:noHistory="true"
+                  android:exported="true"
                   android:excludeFromRecents="true">
             <intent-filter android:priority="1">
                 <action android:name="com.android.settings.USER_DICTIONARY_INSERT" />
@@ -762,6 +779,7 @@
             android:name=".notification.zen.ZenSuggestionActivity"
             android:label="@string/zen_mode_settings_title"
             android:icon="@drawable/ic_suggestion_dnd"
+            android:exported="true"
             android:theme="@android:style/Theme.NoDisplay">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -821,6 +839,7 @@
         <activity android:name=".wallpaper.WallpaperSuggestionActivity"
                   android:label="@string/wallpaper_settings_title"
                   android:icon="@drawable/ic_wallpaper"
+                  android:exported="true"
                   android:theme="@android:style/Theme.NoDisplay">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -842,6 +861,7 @@
         <activity android:name=".wallpaper.StyleSuggestionActivity"
                   android:label="@string/style_suggestion_title"
                   android:icon="@drawable/ic_theme"
+                  android:exported="true"
                   android:theme="@android:style/Theme.NoDisplay">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -889,6 +909,7 @@
         <activity
             android:name="Settings$DisplaySettingsActivity"
             android:label="@string/display_settings"
+            android:exported="true"
             android:icon="@drawable/ic_homepage_display">
             <intent-filter android:priority="1">
                 <action android:name="com.android.settings.DISPLAY_SETTINGS" />
@@ -909,6 +930,7 @@
             android:name="Settings$NightDisplaySettingsActivity"
             android:label="@string/night_display_title"
             android:enabled="@*android:bool/config_nightDisplayAvailable"
+            android:exported="true"
             android:icon="@drawable/ic_homepage_night_display">
             <intent-filter android:priority="32">
                 <action android:name="android.intent.action.MAIN" />
@@ -927,6 +949,7 @@
         <activity
                 android:name="Settings$DarkThemeSettingsActivity"
                 android:label="@string/dark_ui_auto_mode_title"
+                android:exported="true"
                 android:enabled="true">
             <intent-filter android:priority="32">
                 <action android:name="android.intent.action.MAIN" />
@@ -945,6 +968,7 @@
         <activity
             android:name="Settings$NightDisplaySuggestionActivity"
             android:enabled="@*android:bool/config_nightDisplayAvailable"
+            android:exported="true"
             android:icon="@drawable/ic_suggestion_night_display">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -964,6 +988,7 @@
 
         <activity android:name=".Settings$MyDeviceInfoActivity"
                   android:label="@string/about_settings"
+                  android:exported="true"
                   android:icon="@drawable/ic_homepage_about">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.DEVICE_INFO_SETTINGS" />
@@ -983,6 +1008,7 @@
         <activity
             android:name="SettingsLicenseActivity"
             android:label="@string/settings_license_activity_title"
+            android:exported="true"
             android:configChanges="orientation|screenSize">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.LICENSE" />
@@ -993,6 +1019,7 @@
         </activity>
 
         <activity android:name=".Settings$ModuleLicensesActivity"
+                  android:exported="true"
                   android:label="@string/module_license_title">
             <intent-filter>
                 <action android:name="android.settings.MODULE_LICENSES" />
@@ -1006,6 +1033,7 @@
 
         <activity
             android:name="Settings$ManageApplicationsActivity"
+            android:exported="true"
             android:label="@string/applications_settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.APPLICATION_SETTINGS" />
@@ -1034,6 +1062,7 @@
 
         <activity
             android:name="Settings$ManageDomainUrlsActivity"
+            android:exported="true"
             android:label="@string/domain_urls_title">
             <intent-filter>
                 <action android:name="android.settings.MANAGE_DOMAIN_URLS" />
@@ -1045,6 +1074,7 @@
 
         <activity android:name="Settings$AppMemoryUsageActivity"
                   android:label="@string/app_list_memory_use"
+                  android:exported="true"
                   android:icon="@drawable/ic_settings_memory">
             <intent-filter>
                 <action android:name="android.settings.APP_MEMORY_USAGE" />
@@ -1056,6 +1086,7 @@
 
         <activity
             android:name="Settings$HighPowerApplicationsActivity"
+            android:exported="true"
             android:label="@string/high_power_apps">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.IGNORE_BATTERY_OPTIMIZATION_SETTINGS" />
@@ -1069,6 +1100,7 @@
 
         <activity
             android:name=".datausage.AppDataUsageActivity"
+            android:exported="true"
             android:noHistory="true">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS" />
@@ -1080,7 +1112,8 @@
         <activity
             android:name=".fuelgauge.RequestIgnoreBatteryOptimizations"
             android:label="@string/high_power_apps"
-            android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert">
+            android:exported="true"
+            android:theme="@*android:style/Theme.DeviceDefault.Dialog.Alert.DayNight">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -1092,6 +1125,7 @@
             android:name=".slices.SliceDeepLinkSpringBoard"
             android:excludeFromRecents="true"
             android:theme="@android:style/Theme.NoDisplay"
+            android:exported="true"
             android:permission="android.permission.MODIFY_PHONE_STATE">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -1155,6 +1189,7 @@
 
         <!-- Provide direct entry into manage apps showing running services. -->
         <activity android:name="Settings$RunningServicesActivity"
+                android:exported="true"
                 android:label="@string/runningservices_settings_title">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -1171,6 +1206,7 @@
         <!-- Provide direct entry into manage apps showing storage usage of apps. -->
         <activity
             android:name="Settings$StorageUseActivity"
+            android:exported="true"
             android:label="@string/storageuse_settings_title">
             <intent-filter android:priority="1">
                 <action android:name="android.intent.action.MANAGE_PACKAGE_STORAGE" />
@@ -1190,6 +1226,7 @@
 
         <activity
             android:name="Settings$NotificationStationActivity"
+            android:exported="true"
             android:label="@string/notification_log_title">
             <intent-filter android:priority="22">
                 <action android:name="android.intent.action.MAIN" />
@@ -1201,6 +1238,7 @@
 
         <activity
             android:name=".notification.history.NotificationHistoryActivity"
+            android:exported="true"
             android:label="@string/notification_history_title">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.NOTIFICATION_HISTORY" />
@@ -1214,6 +1252,7 @@
 
         <activity android:name=".notification.zen.ZenModeVoiceActivity"
                 android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar"
+                android:exported="true"
                 android:label="@string/zen_mode_settings_title">
             <intent-filter>
                 <action android:name="android.settings.VOICE_CONTROL_DO_NOT_DISTURB_MODE" />
@@ -1226,6 +1265,7 @@
             android:name="Settings$LocationSettingsActivity"
             android:label="@string/location_settings_title"
             android:icon="@drawable/ic_homepage_location"
+            android:exported="true"
             android:configChanges="orientation|keyboardHidden|screenSize">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.LOCATION_SOURCE_SETTINGS" />
@@ -1244,6 +1284,7 @@
             android:name="Settings$ScanningSettingsActivity"
             android:label="@string/location_scanning_screen_title"
             android:icon="@drawable/ic_homepage_location"
+            android:exported="true"
             android:configChanges="orientation|keyboardHidden|screenSize">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.LOCATION_SCANNING_SETTINGS" />
@@ -1259,6 +1300,7 @@
             android:name=".Settings$SecurityDashboardActivity"
             android:label="@string/security_settings_title"
             android:icon="@drawable/ic_homepage_security"
+            android:exported="true"
             android:configChanges="orientation|keyboardHidden|screenSize">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.SECURITY_SETTINGS" />
@@ -1279,6 +1321,7 @@
         <activity android:name="MonitoringCertInfoActivity"
                 android:label=""
                 android:theme="@style/Transparent"
+                android:exported="true"
                 android:excludeFromRecents="true">
             <intent-filter android:priority="1">
                 <action android:name="com.android.settings.MONITORING_CERT_INFO" />
@@ -1289,6 +1332,7 @@
         <activity
             android:name="Settings$TrustedCredentialsSettingsActivity"
             android:label="@string/trusted_credentials"
+            android:exported="true"
             android:icon="@drawable/ic_settings_security">
             <intent-filter android:priority="1">
                 <action android:name="com.android.settings.TRUSTED_CREDENTIALS" />
@@ -1304,6 +1348,7 @@
         <activity android:name="Settings$PrivacySettingsActivity"
                 android:label="@string/privacy_settings_title"
                 android:icon="@drawable/ic_settings_backup"
+                android:exported="true"
                 android:configChanges="orientation|keyboardHidden|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -1318,6 +1363,7 @@
 
         <activity android:name="Settings$PrivacyDashboardActivity"
                   android:label="@string/privacy_dashboard_title"
+                  android:exported="true"
                   android:icon="@drawable/ic_settings_privacy">
             <intent-filter>
                 <action android:name="android.settings.PRIVACY_SETTINGS" />
@@ -1340,6 +1386,7 @@
         <activity android:name=".security.CredentialStorage"
                 android:theme="@style/Transparent"
                 android:launchMode="singleTop"
+                android:exported="true"
                 android:configChanges="orientation|keyboardHidden|screenSize">
             <intent-filter android:priority="1">
                 <action android:name="com.android.credentials.INSTALL" />
@@ -1355,6 +1402,7 @@
 
         <activity
             android:name="Settings$DeviceAdminSettingsActivity"
+            android:exported="true"
             android:label="@string/device_admin_settings_title">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -1376,6 +1424,7 @@
 
         <activity android:name=".applications.specialaccess.deviceadmin.DeviceAdminAdd"
                   android:label="@string/device_admin_add_title"
+                  android:exported="true"
                   android:clearTaskOnLaunch="true">
             <intent-filter>
                 <action android:name="android.app.action.ADD_DEVICE_ADMIN" />
@@ -1386,6 +1435,7 @@
         <activity android:name=".applications.specialaccess.deviceadmin.ProfileOwnerAdd"
                   android:excludeFromRecents="true"
                   android:theme="@style/Transparent"
+                  android:exported="true"
                   android:clearTaskOnLaunch="true">
             <intent-filter android:priority="1000">
                 <action android:name="android.app.action.SET_PROFILE_OWNER" />
@@ -1395,6 +1445,7 @@
 
         <activity
             android:name="Settings$UsageAccessSettingsActivity"
+            android:exported="true"
             android:label="@string/usage_access_title">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.USAGE_ACCESS_SETTINGS" />
@@ -1408,6 +1459,7 @@
 
         <activity
             android:name="Settings$AppUsageAccessSettingsActivity"
+            android:exported="true"
             android:label="@string/usage_access_title">
             <intent-filter>
                 <action android:name="android.settings.USAGE_ACCESS_SETTINGS"/>
@@ -1420,6 +1472,7 @@
         </activity>
 
         <activity android:name="Settings$IccLockSettingsActivity"
+                android:exported="true"
                 android:label="@string/sim_lock_settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -1434,6 +1487,7 @@
             android:name="Settings$AccessibilitySettingsActivity"
             android:label="@string/accessibility_settings"
             android:icon="@drawable/ic_homepage_accessibility"
+            android:exported="true"
             android:configChanges="orientation|keyboardHidden|screenSize">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.ACCESSIBILITY_SETTINGS" />
@@ -1452,6 +1506,7 @@
         <activity
             android:name="Settings$AccessibilityDetailsSettingsActivity"
             android:label="@string/accessibility_settings"
+            android:exported="true"
             android:permission="android.permission.OPEN_ACCESSIBILITY_DETAILS_SETTINGS">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.ACCESSIBILITY_DETAILS_SETTINGS" />
@@ -1466,6 +1521,7 @@
         <activity android:name=".accessibility.AccessibilitySettingsForSetupWizardActivity"
                 android:icon="@drawable/ic_accessibility_suggestion"
                 android:label="@string/vision_settings_title"
+                android:exported="true"
                 android:theme="@style/GlifV3Theme.Light">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.ACCESSIBILITY_SETTINGS_FOR_SUW" />
@@ -1495,6 +1551,7 @@
 
         <activity
             android:name="Settings$AccessibilityDaltonizerSettingsActivity"
+            android:exported="true"
             android:label="@string/accessibility_display_daltonizer_preference_title">
             <intent-filter android:priority="1">
                 <action android:name="com.android.settings.ACCESSIBILITY_COLOR_SPACE_SETTINGS" />
@@ -1512,6 +1569,7 @@
 
         <activity
             android:name="Settings$CaptioningSettingsActivity"
+            android:exported="true"
             android:label="@string/accessibility_captioning_title">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.CAPTIONING_SETTINGS" />
@@ -1530,6 +1588,7 @@
 
         <activity
             android:name="Settings$TextToSpeechSettingsActivity"
+            android:exported="true"
             android:label="@string/tts_settings">
             <intent-filter android:priority="1">
                 <action android:name="com.android.settings.TTS_SETTINGS" />
@@ -1543,6 +1602,7 @@
 
         <activity
             android:name="Settings$EnterprisePrivacySettingsActivity"
+            android:exported="true"
             android:label="@string/enterprise_privacy_settings">
             <intent-filter>
                 <action android:name="android.settings.ENTERPRISE_PRIVACY_SETTINGS" />
@@ -1720,6 +1780,7 @@
 
         <activity android:name=".password.SetupChooseLockGeneric"
             android:theme="@style/GlifTheme.Light"
+            android:exported="true"
             android:label="@string/lock_settings_picker_title">
             <intent-filter android:priority="1">
                 <action android:name="com.android.settings.SETUP_LOCK_SCREEN" />
@@ -1739,6 +1800,7 @@
 
         <activity android:name=".password.SetNewPasswordActivity"
             android:theme="@android:style/Theme.NoDisplay"
+            android:exported="true"
             android:excludeFromRecents="true" >
             <intent-filter android:priority="1">
                 <action android:name="android.app.action.SET_NEW_PASSWORD" />
@@ -1750,6 +1812,7 @@
         </activity>
 
         <activity android:name=".password.ScreenLockSuggestionActivity"
+            android:exported="true"
             android:icon="@drawable/ic_suggestion_security">
             <intent-filter android:priority="1">
                 <action android:name="android.intent.action.MAIN" />
@@ -1764,6 +1827,7 @@
         </activity>
 
         <activity android:name=".biometrics.fingerprint.FingerprintEnrollSuggestionActivity"
+            android:exported="true"
             android:icon="@drawable/ic_suggestion_fingerprint">
             <intent-filter android:priority="2">
                 <action android:name="android.intent.action.MAIN" />
@@ -1812,6 +1876,7 @@
         <activity
             android:name=".Settings$StorageDashboardActivity"
             android:label="@string/storage_settings"
+            android:exported="true"
             android:icon="@drawable/ic_homepage_storage">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.INTERNAL_STORAGE_SETTINGS" />
@@ -1837,6 +1902,7 @@
 
         <activity
             android:name="Settings$PublicVolumeSettingsActivity"
+            android:exported="true"
             android:label="@string/storage_settings_title">
             <intent-filter>
                 <action android:name="android.provider.action.DOCUMENT_ROOT_SETTINGS" />
@@ -1897,6 +1963,7 @@
 
         <activity android:name="Settings$ApnEditorActivity"
                 android:configChanges="orientation|keyboardHidden|screenSize"
+                android:exported="true"
                 android:label="@string/apn_edit">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -1918,6 +1985,7 @@
             android:name="Settings$DevelopmentSettingsDashboardActivity"
             android:label="@string/development_settings_title"
             android:icon="@drawable/ic_settings_development"
+            android:exported="true"
             android:enabled="false">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />
@@ -1945,6 +2013,7 @@
             android:icon="@drawable/ic_settings_development"
             android:label="@string/development_settings_title"
             android:excludeFromRecents="true"
+            android:exported="true"
             android:theme="@style/Transparent">
             <intent-filter android:priority="-1">
                 <action android:name="android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />
@@ -1956,6 +2025,7 @@
         <activity
             android:name="Settings$PrintSettingsActivity"
             android:label="@string/print_settings"
+            android:exported="true"
             android:icon="@drawable/ic_settings_print">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.ACTION_PRINT_SETTINGS" />
@@ -1971,6 +2041,7 @@
         </activity>
 
         <activity android:name="Settings$PrintJobSettingsActivity"
+                android:exported="true"
                 android:label="@string/print_print_job">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.ACTION_PRINT_SETTINGS" />
@@ -2017,6 +2088,7 @@
                   android:excludeFromRecents="true"
                   android:windowSoftInputMode="stateVisible|adjustResize"
                   android:theme="@style/Theme.AlertDialog"
+                  android:exported="true"
                   android:taskAffinity=".bluetooth.BluetoothPairingDialog">
             <intent-filter android:priority="1">
                 <action android:name="android.bluetooth.device.action.PAIRING_REQUEST" />
@@ -2027,6 +2099,7 @@
         <activity android:name=".bluetooth.RequestPermissionActivity"
                   android:excludeFromRecents="true"
                   android:permission="android.permission.BLUETOOTH"
+                  android:exported="true"
                   android:theme="@style/Theme.BluetoothPermission">
             <intent-filter android:priority="1">
                 <action android:name="android.bluetooth.adapter.action.REQUEST_DISCOVERABLE" />
@@ -2038,6 +2111,7 @@
 
         <activity android:name=".wifi.WifiScanModeActivity"
                   android:excludeFromRecents="true"
+                  android:exported="true"
                   android:theme="@style/Transparent">
             <intent-filter android:priority="1">
                 <action android:name="android.net.wifi.action.REQUEST_SCAN_ALWAYS_AVAILABLE" />
@@ -2068,18 +2142,20 @@
                   android:label="@string/bluetooth_pairing_request"
                   android:excludeFromRecents="true"
                   android:permission="android.permission.BLUETOOTH"
-                  android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert">
+                  android:theme="@*android:style/Theme.DeviceDefault.Dialog.Alert.DayNight">
         </activity>
 
         <service android:name=".bluetooth.BluetoothPairingService" />
 
-        <receiver android:name=".bluetooth.BluetoothPairingRequest">
+        <receiver android:name=".bluetooth.BluetoothPairingRequest"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.bluetooth.device.action.PAIRING_REQUEST" />
             </intent-filter>
         </receiver>
 
         <receiver android:name=".bluetooth.BluetoothPermissionRequest"
+                  android:exported="true"
                   android:permission="android.permission.BLUETOOTH_ADMIN">
             <intent-filter>
                 <action android:name="android.bluetooth.device.action.CONNECTION_ACCESS_REQUEST" />
@@ -2091,6 +2167,7 @@
                   android:label="@string/bluetooth_connection_permission_request"
                   android:excludeFromRecents="true"
                   android:permission="android.permission.BLUETOOTH_ADMIN"
+                  android:exported="true"
                   android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert">
             <intent-filter android:priority="1">
                 <action android:name="android.bluetooth.device.action.CONNECTION_ACCESS_REQUEST" />
@@ -2101,7 +2178,8 @@
 
         <activity android:name="ActivityPicker"
                 android:label="@string/activity_picker_label"
-                android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert"
+                android:theme="@*android:style/Theme.DeviceDefault.Dialog.Alert.DayNight"
+                android:exported="true"
                 android:finishOnCloseSystemDialogs="true">
             <intent-filter android:priority="1">
                 <action android:name="android.intent.action.PICK_ACTIVITY" />
@@ -2112,6 +2190,7 @@
         <!-- NFC settings -->
         <activity
             android:name="Settings$AndroidBeamSettingsActivity"
+            android:exported="true"
             android:label="@string/android_beam_settings_title">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.NFCSHARING_SETTINGS" />
@@ -2126,6 +2205,7 @@
         <activity
             android:name="Settings$WifiDisplaySettingsActivity"
             android:label="@string/wifi_display_settings_title"
+            android:exported="true"
             android:icon="@drawable/ic_cast_24dp">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.CAST_SETTINGS" />
@@ -2140,7 +2220,8 @@
                 android:value="com.android.settings.TestingSettings" />
         </activity>
 
-        <receiver android:name=".TestingSettingsBroadcastReceiver">
+        <receiver android:name=".TestingSettingsBroadcastReceiver"
+            android:exported="true">
             <intent-filter>
                  <action android:name="android.telephony.action.SECRET_CODE" />
                  <data android:scheme="android_secret_code" android:host="4636" />
@@ -2150,7 +2231,8 @@
         <!-- Standard picker for widgets -->
         <activity android:name="AppWidgetPickActivity"
                 android:label="@string/widget_picker_title"
-                android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert"
+                android:theme="@*android:style/Theme.DeviceDefault.Dialog.Alert.DayNight"
+                android:exported="true"
                 android:finishOnCloseSystemDialogs="true">
             <intent-filter android:priority="1">
                 <action android:name="android.appwidget.action.APPWIDGET_PICK" />
@@ -2159,8 +2241,9 @@
         </activity>
 
         <activity android:name="AllowBindAppWidgetActivity"
-                android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert"
+                android:theme="@*android:style/Theme.DeviceDefault.Dialog.Alert.DayNight"
                 android:finishOnCloseSystemDialogs="true"
+                android:exported="true"
                 android:excludeFromRecents="true">
             <intent-filter android:priority="1">
                 <action android:name="android.appwidget.action.APPWIDGET_BIND" />
@@ -2169,6 +2252,7 @@
         </activity>
 
         <activity android:name="UsageStatsActivity"
+                  android:exported="true"
                   android:label="@string/usage_stats_label">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -2179,6 +2263,7 @@
         <activity
             android:name="Settings$PowerUsageSummaryActivity"
             android:label="@string/power_usage_summary_title"
+            android:exported="true"
             android:icon="@drawable/ic_homepage_battery">
             <intent-filter android:priority="1">
                 <action android:name="android.intent.action.POWER_USAGE_SUMMARY" />
@@ -2195,6 +2280,7 @@
         <activity
             android:name="Settings$BatterySaverSettingsActivity"
             android:label="@string/battery_saver"
+            android:exported="true"
             android:icon="@drawable/ic_settings_battery">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.BATTERY_SAVER_SETTINGS" />
@@ -2219,6 +2305,7 @@
 
         <activity
             android:name="Settings$AccountSyncSettingsActivity"
+            android:exported="true"
             android:label="@string/account_sync_settings_title">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.ACCOUNT_SYNC_SETTINGS" />
@@ -2232,6 +2319,7 @@
         <activity
             android:name="Settings$ManagedProfileSettingsActivity"
             android:label="@string/managed_profile_settings_title"
+            android:exported="true"
             android:permission="android.permission.MANAGE_USERS">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.MANAGED_PROFILE_SETTINGS" />
@@ -2245,6 +2333,7 @@
             android:name="com.android.settings.accounts.AddAccountSettings"
             android:theme="@android:style/Theme.Translucent.NoTitleBar"
             android:configChanges="orientation|keyboardHidden|screenSize"
+            android:exported="true"
             android:label="@string/header_add_an_account">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.ADD_ACCOUNT_SETTINGS" />
@@ -2271,6 +2360,7 @@
                   android:windowSoftInputMode="adjustResize"
                   android:screenOrientation="nosensor"
                   android:taskAffinity="com.android.settings.CryptKeeper"
+                  android:exported="true"
                   android:process=":CryptKeeper">
             <intent-filter android:priority="10">
                 <action android:name="android.intent.action.MAIN" />
@@ -2285,6 +2375,7 @@
                   android:label=""
                   android:screenOrientation="nosensor"
                   android:taskAffinity="com.android.settings.FallbackHome"
+                  android:exported="true"
                   android:theme="@style/FallbackHome">
             <intent-filter android:priority="-1000">
                 <action android:name="android.intent.action.MAIN" />
@@ -2307,6 +2398,7 @@
 
         <!-- Pseudo-activity used to provide an intent-filter entry point to encryption settings -->
         <activity android:name="Settings$CryptKeeperSettingsActivity"
+                android:exported="true"
                 android:label="@string/crypt_keeper_encrypt_title">
             <intent-filter android:priority="1">
                 <action android:name="android.app.action.START_ENCRYPTION" />
@@ -2319,6 +2411,7 @@
         <activity
             android:name="Settings$DataUsageSummaryActivity"
             android:label="@string/data_usage_summary_title"
+            android:exported="true"
             android:icon="@drawable/ic_settings_data_usage">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.DATA_USAGE_SETTINGS" />
@@ -2333,6 +2426,7 @@
         </activity>
         <activity
             android:name="Settings$MobileDataUsageListActivity"
+            android:exported="true"
             android:label="@string/cellular_data_usage">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.MOBILE_DATA_USAGE" />
@@ -2345,6 +2439,7 @@
         <activity
             android:name="Settings$DreamSettingsActivity"
             android:label="@string/screensaver_settings_title"
+            android:exported="true"
             android:icon="@drawable/ic_settings_display">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.DREAM_SETTINGS" />
@@ -2359,6 +2454,7 @@
         <activity
             android:name="Settings$UserSettingsActivity"
             android:label="@string/user_settings_title"
+            android:exported="true"
             android:icon="@drawable/ic_settings_multiuser">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.USER_SETTINGS" />
@@ -2381,6 +2477,7 @@
         <activity
             android:name="Settings$PaymentSettingsActivity"
             android:label="@string/nfc_payment_settings_title"
+            android:exported="true"
             android:icon="@drawable/ic_settings_nfc_payment">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.NFC_PAYMENT_SETTINGS" />
@@ -2399,6 +2496,7 @@
         <activity android:name=".nfc.PaymentDefaultDialog"
                   android:label="@string/nfc_payment_set_default_label"
                   android:excludeFromRecents="true"
+                  android:exported="true"
                   android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert">
             <intent-filter android:priority="1">
                 <action android:name="android.nfc.cardemulation.action.ACTION_CHANGE_DEFAULT" />
@@ -2415,6 +2513,7 @@
 
         <activity
             android:name="Settings$NotificationAccessSettingsActivity"
+            android:exported="true"
             android:label="@string/manage_notification_access_title">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS" />
@@ -2426,6 +2525,7 @@
 
         <activity
             android:name="Settings$NotificationAccessDetailsActivity"
+            android:exported="true"
             android:label="@string/manage_notification_access_title" >
             <intent-filter android:priority="1">
                 <action android:name="android.settings.NOTIFICATION_LISTENER_DETAIL_SETTINGS" />
@@ -2437,6 +2537,7 @@
 
         <activity
             android:name="Settings$NotificationAssistantSettingsActivity"
+            android:exported="true"
             android:label="@string/notification_assistant_title">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.NOTIFICATION_ASSISTANT_SETTINGS" />
@@ -2448,6 +2549,7 @@
 
         <activity
             android:name="Settings$VrListenersSettingsActivity"
+            android:exported="true"
             android:label="@string/vr_listeners_title">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.VR_LISTENER_SETTINGS" />
@@ -2459,6 +2561,7 @@
 
         <activity
             android:name="Settings$PictureInPictureSettingsActivity"
+            android:exported="true"
             android:label="@string/picture_in_picture_title">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.PICTURE_IN_PICTURE_SETTINGS" />
@@ -2474,6 +2577,7 @@
 
         <activity
             android:name="Settings$AppPictureInPictureSettingsActivity"
+            android:exported="true"
             android:label="@string/picture_in_picture_title">
             <intent-filter>
                 <action android:name="android.settings.PICTURE_IN_PICTURE_SETTINGS" />
@@ -2486,6 +2590,7 @@
 
         <activity
             android:name="Settings$InteractAcrossProfilesSettingsActivity"
+            android:exported="true"
             android:label="@string/interact_across_profiles_title">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.MANAGE_CROSS_PROFILE_ACCESS" />
@@ -2496,6 +2601,7 @@
         </activity>
 
         <activity android:name="Settings$AppInteractAcrossProfilesSettingsActivity"
+                  android:exported="true"
                   android:label="@string/interact_across_profiles_title">
             <intent-filter>
                 <action android:name="android.settings.MANAGE_CROSS_PROFILE_ACCESS" />
@@ -2509,6 +2615,7 @@
         <activity
             android:name="Settings$ZenAccessDetailSettingsActivity"
             android:label="@string/manage_zen_access_title"
+            android:exported="true"
             android:excludeFromRecents="true">
             <intent-filter>
                 <action android:name="android.settings.NOTIFICATION_POLICY_ACCESS_DETAIL_SETTINGS" />
@@ -2521,6 +2628,7 @@
 
         <activity
             android:name="Settings$ZenAccessSettingsActivity"
+            android:exported="true"
             android:label="@string/manage_zen_access_title">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.NOTIFICATION_POLICY_ACCESS_SETTINGS" />
@@ -2564,6 +2672,7 @@
 
         <activity
             android:name="Settings$AppBubbleNotificationSettingsActivity"
+            android:exported="true"
             android:label="@string/bubbles_app_toggle_title">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.APP_NOTIFICATION_BUBBLE_SETTINGS" />
@@ -2634,6 +2743,7 @@
         <activity
             android:name="ManualDisplayActivity"
             android:label="@string/manual"
+            android:exported="true"
             android:enabled="@bool/config_show_manual">
             <intent-filter>
                 <action android:name="android.settings.SHOW_MANUAL" />
@@ -2647,6 +2757,7 @@
         <activity
             android:name="RegulatoryInfoDisplayActivity"
             android:label="@string/regulatory_labels"
+            android:exported="true"
             android:enabled="@bool/config_show_regulatory_info">
             <intent-filter>
                 <action android:name="android.settings.SHOW_REGULATORY_INFO" />
@@ -2660,20 +2771,23 @@
         <activity android:name=".notification.NotificationAccessConfirmationActivity"
                   android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert" />
 
-        <receiver android:name="com.android.settingslib.bluetooth.BluetoothDiscoverableTimeoutReceiver">
+        <receiver android:name="com.android.settingslib.bluetooth.BluetoothDiscoverableTimeoutReceiver"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.bluetooth.intent.DISCOVERABLE_TIMEOUT" />
             </intent-filter>
         </receiver>
 
         <!-- Watch for ContactsContract.Profile changes and update the user's photo.  -->
-        <receiver android:name=".users.ProfileUpdateReceiver">
+        <receiver android:name=".users.ProfileUpdateReceiver"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.provider.Contacts.PROFILE_CHANGED" />
             </intent-filter>
         </receiver>
 
-        <receiver android:name=".sim.SimSelectNotification">
+        <receiver android:name=".sim.SimSelectNotification"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.telephony.action.PRIMARY_SUBSCRIPTION_LIST_CHANGED"/>
                 <action android:name="android.settings.ENABLE_MMS_DATA_REQUEST"/>
@@ -2700,6 +2814,7 @@
             android:name=".wifi.RequestToggleWiFiActivity"
             android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert"
             android:excludeFromRecents="true"
+            android:exported="true"
             android:permission="android.permission.CHANGE_WIFI_STATE">
             <intent-filter>
                 <action android:name="android.net.wifi.action.REQUEST_ENABLE" />
@@ -2746,6 +2861,7 @@
             android:theme="@style/Theme.AlertDialog"
             android:label="@string/sim_settings_title"
             android:launchMode="singleTop"
+            android:exported="true"
             android:excludeFromRecents="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -2761,6 +2877,7 @@
 
         <activity
             android:name="Settings$WifiCallingSettingsActivity"
+            android:exported="true"
             android:label="@string/wifi_calling_settings_title">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -2776,6 +2893,7 @@
 
         <activity android:name=".wifi.calling.WifiCallingSuggestionActivity"
                   android:label="@string/wifi_calling_settings_title"
+                  android:exported="true"
                   android:icon="@drawable/ic_suggestion_wireless">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -2814,6 +2932,7 @@
 
         <activity
             android:name="Settings$OverlaySettingsActivity"
+            android:exported="true"
             android:label="@string/draw_overlay">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.action.MANAGE_OVERLAY_PERMISSION" />
@@ -2833,6 +2952,7 @@
         <activity
             android:name="Settings$AppDrawOverlaySettingsActivity"
             android:label="@string/draw_overlay"
+            android:exported="true"
             android:permission="android.permission.INTERNAL_SYSTEM_WINDOW">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.MANAGE_APP_OVERLAY_PERMISSION" />
@@ -2845,6 +2965,7 @@
 
         <activity
             android:name="Settings$WriteSettingsActivity"
+            android:exported="true"
             android:label="@string/write_settings_title">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.action.MANAGE_WRITE_SETTINGS" />
@@ -2858,6 +2979,7 @@
 
         <activity
             android:name="Settings$AppWriteSettingsActivity"
+            android:exported="true"
             android:label="@string/write_settings_title">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.action.MANAGE_WRITE_SETTINGS" />
@@ -2870,6 +2992,7 @@
 
         <activity
             android:name="Settings$ManageExternalSourcesActivity"
+            android:exported="true"
             android:label="@string/install_other_apps">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.MANAGE_UNKNOWN_APP_SOURCES" />
@@ -2882,6 +3005,7 @@
         </activity>
 
         <activity android:name="Settings$ManageAppExternalSourcesActivity"
+                  android:exported="true"
                   android:label="@string/install_other_apps">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.MANAGE_UNKNOWN_APP_SOURCES" />
@@ -2896,6 +3020,7 @@
                 android:theme="@style/Transparent"
                 android:taskAffinity="com.android.settings.enterprise"
                 android:excludeFromRecents="true"
+                android:exported="true"
                 android:launchMode="singleTop">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.SHOW_ADMIN_SUPPORT_DETAILS" />
@@ -2905,6 +3030,7 @@
 
         <activity
             android:name="Settings$ManageExternalStorageActivity"
+            android:exported="true"
             android:label="@string/manage_external_storage_title">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.MANAGE_ALL_FILES_ACCESS_PERMISSION" />
@@ -2918,6 +3044,7 @@
 
         <activity
             android:name="Settings$AppManageExternalStorageActivity"
+            android:exported="true"
             android:label="@string/manage_external_storage_title">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.MANAGE_APP_ALL_FILES_ACCESS_PERMISSION" />
@@ -2951,6 +3078,7 @@
 
         <activity android:name=".backup.UserBackupSettingsActivity"
                   android:label="@string/privacy_settings_title"
+                  android:exported="true"
                   android:icon="@drawable/ic_settings_backup">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -2986,9 +3114,10 @@
             android:name=".fuelgauge.AdvancedPowerUsageDetailActivity"
             android:excludeFromRecents="true"
             android:launchMode="singleInstance"
+            android:exported="true"
             android:theme="@android:style/Theme.NoDisplay">
             <intent-filter>
-                <action android:name="android.settings.APP_BATTERY_SETTINGS" />
+                <action android:name="android.settings.VIEW_ADVANCED_POWER_USAGE_DETAIL" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:scheme="package" />
             </intent-filter>
@@ -3006,6 +3135,7 @@
         <activity
             android:name=".Settings$AccountDashboardActivity"
             android:label="@string/account_dashboard_title"
+            android:exported="true"
             android:icon="@drawable/ic_homepage_accounts">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.SYNC_SETTINGS" />
@@ -3024,6 +3154,7 @@
         <activity
             android:name=".Settings$SystemDashboardActivity"
             android:label="@string/header_category_system"
+            android:exported="true"
             android:icon="@drawable/ic_homepage_system_dashboard">
             <intent-filter android:priority="70">
                 <action android:name="android.intent.action.MAIN" />
@@ -3037,6 +3168,7 @@
                   android:label="@string/page_tab_title_support"
                   android:icon="@drawable/ic_homepage_support"
                   android:theme="@android:style/Theme.DeviceDefault.Light.Panel"
+                  android:exported="true"
                   android:enabled="@bool/config_support_enabled">
             <intent-filter>
                 <action android:name="com.android.settings.action.SUPPORT_SETTINGS" />
@@ -3055,6 +3187,7 @@
             android:label="@string/debug_layout"
             android:icon="@drawable/tile_icon_show_layout"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
+            android:exported="true"
             android:enabled="false">
             <intent-filter>
                 <action android:name="android.service.quicksettings.action.QS_TILE" />
@@ -3067,6 +3200,7 @@
             android:label="@string/track_frame_time"
             android:icon="@drawable/tile_icon_graphics"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
+            android:exported="true"
             android:enabled="false">
             <intent-filter>
                 <action android:name="android.service.quicksettings.action.QS_TILE" />
@@ -3079,6 +3213,7 @@
             android:label="@string/force_rtl_layout_all_locales"
             android:icon="@drawable/tile_icon_force_rtl"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
+            android:exported="true"
             android:enabled="false">
             <intent-filter>
                 <action android:name="android.service.quicksettings.action.QS_TILE" />
@@ -3091,6 +3226,7 @@
             android:label="@string/window_animation_scale_title"
             android:icon="@drawable/tile_icon_animation_speed"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
+            android:exported="true"
             android:enabled="false">
             <intent-filter>
                 <action android:name="android.service.quicksettings.action.QS_TILE" />
@@ -3104,6 +3240,7 @@
             android:label="@string/winscope_trace_quick_settings_title"
             android:icon="@drawable/tile_icon_winscope_trace"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
+            android:exported="true"
             android:enabled="false">
             <intent-filter>
                 <action android:name="android.service.quicksettings.action.QS_TILE" />
@@ -3117,6 +3254,7 @@
             android:label="@string/sensors_off_quick_settings_title"
             android:icon="@drawable/tile_icon_sensors_off"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
+            android:exported="true"
             android:enabled="false">
             <intent-filter>
                 <action android:name="android.service.quicksettings.action.QS_TILE" />
@@ -3130,6 +3268,21 @@
             android:label="@string/enable_adb_wireless"
             android:icon="@drawable/tile_icon_debugging_wireless"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
+            android:exported="true"
+            android:enabled="false">
+            <intent-filter>
+                <action android:name="android.service.quicksettings.action.QS_TILE" />
+            </intent-filter>
+            <meta-data android:name="android.service.quicksettings.TOGGLEABLE_TILE"
+                       android:value="true"/>
+        </service>
+
+        <service
+            android:name=".development.qstile.DevelopmentTiles$ShowTaps"
+            android:label="@string/show_touches"
+            android:icon="@drawable/tile_icon_show_taps"
+            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
+            android:exported="true"
             android:enabled="false">
             <intent-filter>
                 <action android:name="android.service.quicksettings.action.QS_TILE" />
@@ -3156,6 +3309,7 @@
                 android:theme="@android:style/Theme.NoDisplay"
                 android:excludeFromRecents="true"
                 android:launchMode="singleInstance"
+                android:exported="true"
                 android:label="@string/autofill_app">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.REQUEST_SET_AUTOFILL_SERVICE" />
@@ -3165,6 +3319,7 @@
         </activity>
 
         <activity android:name="Settings$AdvancedConnectedDeviceActivity"
+                  android:exported="true"
                   android:label="@string/connected_device_connections_title">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.NFC_SETTINGS" />
@@ -3182,6 +3337,7 @@
 
         <activity android:name="Settings$BluetoothDeviceDetailActivity"
                   android:label="@string/device_details_title"
+                  android:exported="true"
                   android:permission="android.permission.BLUETOOTH_ADMIN">
             <intent-filter android:priority="1">
                 <action android:name="com.android.settings.BLUETOOTH_DEVICE_DETAIL_SETTINGS" />
@@ -3223,6 +3379,7 @@
                   android:theme="@style/Theme.Panel"
                   android:launchMode="singleInstance"
                   android:excludeFromRecents="true"
+                  android:exported="true"
                   android:configChanges="orientation|keyboardHidden|screenSize">
             <intent-filter>
                 <action android:name="android.settings.WIFI_ADD_NETWORKS" />
@@ -3233,6 +3390,7 @@
         <activity-alias
             android:name="MediaOutputSlice"
             android:label="@string/media_output_panel_title"
+            android:exported="true"
             android:targetActivity=".panel.SettingsPanelActivity">
                 <intent-filter>
                     <action android:name="com.android.settings.panel.action.MEDIA_OUTPUT" />
@@ -3263,7 +3421,8 @@
         <receiver android:name=".fuelgauge.batterytip.AnomalyDetectionReceiver"
                   android:exported="false" />
 
-        <receiver android:name=".fuelgauge.batterytip.AnomalyConfigReceiver">
+        <receiver android:name=".fuelgauge.batterytip.AnomalyConfigReceiver"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.app.action.STATSD_STARTED"/>
                 <action android:name="android.intent.action.BOOT_COMPLETED"/>
@@ -3296,7 +3455,8 @@
         </provider>
 
         <activity
-            android:name=".wifi.dpp.WifiDppConfiguratorActivity">
+            android:name=".wifi.dpp.WifiDppConfiguratorActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.settings.WIFI_DPP_CONFIGURATOR_QR_CODE_SCANNER"/>
                 <action android:name="android.settings.WIFI_DPP_CONFIGURATOR_QR_CODE_GENERATOR"/>
@@ -3310,7 +3470,8 @@
         </activity>
 
         <activity
-            android:name=".wifi.dpp.WifiDppEnrolleeActivity">
+            android:name=".wifi.dpp.WifiDppEnrolleeActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.settings.WIFI_DPP_ENROLLEE_QR_CODE_SCANNER"/>
                 <category android:name="android.intent.category.DEFAULT"/>
@@ -3326,6 +3487,7 @@
         <activity
             android:name="Settings$WifiCallingDisclaimerActivity"
             android:label="@string/wifi_calling_settings_title"
+            android:exported="true"
             android:taskAffinity="com.android.settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -3336,6 +3498,7 @@
         </activity>
 
         <activity android:name="Settings$BatterySaverScheduleSettingsActivity"
+            android:exported="true"
             android:label="@string/battery_saver_schedule_settings_title">
             <intent-filter>
                 <action android:name="com.android.settings.BATTERY_SAVER_SCHEDULE_SETTINGS" />
@@ -3346,6 +3509,7 @@
         </activity>
 
         <activity android:name="Settings$GlobalActionsPanelSettingsActivity"
+            android:exported="true"
             android:label="@string/cards_passes_sentence">
             <intent-filter>
                 <action android:name="com.android.settings.GLOBAL_ACTIONS_PANEL_SETTINGS" />
@@ -3356,6 +3520,7 @@
         </activity>
 
         <activity android:name="Settings$PowerMenuSettingsActivity"
+                  android:exported="true"
                   android:label="@string/power_menu_setting_name">
             <intent-filter>
                 <action android:name="android.settings.ACTION_POWER_MENU_SETTINGS" />
@@ -3366,6 +3531,7 @@
         </activity>
 
         <activity android:name="Settings$DeviceControlsSettingsActivity"
+                      android:exported="true"
                       android:label="@string/device_controls_sentence">
             <intent-filter>
                 <action android:name="android.settings.ACTION_DEVICE_CONTROLS_SETTINGS" />
@@ -3378,6 +3544,7 @@
         <activity
             android:name="Settings$GestureNavigationSettingsActivity"
             android:label="@string/gesture_settings_activity_title"
+            android:exported="true"
             android:enabled="true">
             <intent-filter android:priority="32">
                 <action android:name="android.intent.action.MAIN" />
@@ -3404,6 +3571,15 @@
                        android:value="com.android.settings.sound.MediaControlsSettings" />
         </activity>
 
+        <receiver
+            android:name=".media.BluetoothPairingReceiver"
+            android:exported="true"
+            android:permission="android.permission.BLUETOOTH_ADMIN">
+            <intent-filter>
+                <action android:name="com.android.settings.action.LAUNCH_BLUETOOTH_PAIRING"/>
+            </intent-filter>/>
+        </receiver>
+
         <!-- This is the longest AndroidManifest.xml ever. -->
     </application>
 </manifest>
diff --git a/MODULE_LICENSE_APACHE2 b/MODULE_LICENSE_APACHE2
deleted file mode 100644
index e69de29..0000000
--- a/MODULE_LICENSE_APACHE2
+++ /dev/null
diff --git a/color-check-baseline.xml b/color-check-baseline.xml
index f959f91..22b9ad4 100644
--- a/color-check-baseline.xml
+++ b/color-check-baseline.xml
@@ -41,38 +41,6 @@
         priority="4"
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="        android:color=&quot;@color/notification_importance_button_selected&quot;/>"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/drawable/button_border_selected.xml"
-            line="23"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="        android:color=&quot;@color/notification_importance_button_selected&quot;/>"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/drawable/button_border_selected.xml"
-            line="23"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
         errorLine1="        android:color=&quot;@color/notification_importance_button_unselected&quot;/>"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
@@ -297,6 +265,22 @@
         priority="4"
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;notification_history_background&quot;>#5F6368&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-night/colors.xml"
+            line="30"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
         errorLine1="    &lt;color name=&quot;setup_lock_pattern_view_error_color_dark&quot;>#fff44336&lt;/color>"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
@@ -1529,27 +1513,11 @@
         priority="4"
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="    &lt;color name=&quot;palette_list_color_pink&quot;>#e52592&lt;/color> &lt;!-- Material Pink 600 -->"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/values/colors.xml"
-            line="161"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
         errorLine1="    &lt;color name=&quot;palette_list_dark_mode_color_red&quot;>#f28b82&lt;/color> &lt;!-- Material Red 300 -->"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="164"
+            line="163"
             column="5"/>
     </issue>
 
@@ -1565,7 +1533,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="165"
+            line="164"
             column="5"/>
     </issue>
 
@@ -1581,7 +1549,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="166"
+            line="165"
             column="5"/>
     </issue>
 
@@ -1597,7 +1565,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="167"
+            line="166"
             column="5"/>
     </issue>
 
@@ -1613,7 +1581,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="168"
+            line="167"
             column="5"/>
     </issue>
 
@@ -1629,7 +1597,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="169"
+            line="168"
             column="5"/>
     </issue>
 
@@ -1645,7 +1613,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="170"
+            line="169"
             column="5"/>
     </issue>
 
@@ -1657,11 +1625,187 @@
         priority="4"
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="    &lt;color name=&quot;palette_list_dark_mode_color_pink&quot;>#ff8bcb&lt;/color> &lt;!-- Material Pink 300 -->"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="    &lt;color name=&quot;SIM_color_teal&quot;>#ff00796b&lt;/color> &lt;!-- Material Teal 700 -->"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="171"
+            line="172"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;SIM_color_blue&quot;>#ff3367d6&lt;/color> &lt;!-- Material Blue 700 -->"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="173"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;SIM_color_indigo&quot;>#ff303f9f&lt;/color> &lt;!-- Material Indigo 700 -->"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="174"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;SIM_color_purple&quot;>#ff7b1fa2&lt;/color> &lt;!-- Material Purple 700 -->"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="175"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;SIM_color_pink&quot;>#ffc2185b&lt;/color> &lt;!-- Material Pink 700 -->"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="176"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;SIM_color_red&quot;>#ffd32f2f&lt;/color> &lt;!-- Material Red 700 -->"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="177"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;SIM_dark_mode_color_teal&quot;>#ff80cbc4&lt;/color> &lt;!-- Material Teal 200 -->"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="180"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;SIM_dark_mode_color_blue&quot;>#ff90caf9&lt;/color> &lt;!-- Material Blue 200 -->"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="181"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;SIM_dark_mode_color_indigo&quot;>#ffc5cae9&lt;/color> &lt;!-- Material Indigo 100 -->"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="182"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;SIM_dark_mode_color_purple&quot;>#ffe1bee7&lt;/color> &lt;!-- Material Purple 100 -->"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="183"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;SIM_dark_mode_color_pink&quot;>#fff48fb1&lt;/color> &lt;!-- Material Pink 200 -->"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="184"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;SIM_dark_mode_color_red&quot;>#ffef9a9a&lt;/color> &lt;!-- Material Red 200 -->"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="185"
             column="5"/>
     </issue>
 
@@ -2330,7 +2474,7 @@
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
         errorLine1="            android:color=&quot;@color/homepage_generic_icon_background&quot; />"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/drawable/ic_homepage_night_display.xml"
             line="24"
@@ -2346,7 +2490,7 @@
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
         errorLine1="            android:color=&quot;@color/homepage_generic_icon_background&quot; />"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/drawable/ic_homepage_notification.xml"
             line="24"
@@ -2361,22 +2505,6 @@
         priority="4"
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="                android:color=&quot;@color/notification_alert_color&quot; />"
-        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/drawable/ic_notification_alert.xml"
-            line="22"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
         errorLine1="                    android:color=&quot;@color/notification_block_color&quot;/>"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
@@ -2905,11 +3033,27 @@
         priority="4"
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;string name=&quot;sync_plug&quot; msgid=&quot;7956982719077985381&quot;>&quot;‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‏‎‎‏‏‏‎‎‎‎‏‏‎‏‎‎‎‎‎‎‎‎‎‎‏‏‎‏‎‎‏‎‎‎‎‏‎‏‎‏‏‎‎‎‏‏‎‎‏‎‏‎‎‏‎‎‏‏‎&quot;&lt;font fgcolor=&quot;#ffffffff&quot;>&quot;‎‏‎‎‏‏‏‎Welcome to Google sync!‎‏‎‎‏‏‎&quot;&lt;/font>&quot;‎‏‎‎‏‏‏‎ ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎A Google approach to syncing data to allow access to your contacts, appointments, and more from wherever you are.‎‏‎‎‏‎&quot;&lt;/string>"
+        errorLine2="                                                                                                                                                                         ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="2763"
+            column="170"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
         errorLine1="    &lt;string name=&quot;sync_plug&quot; msgid=&quot;7956982719077985381&quot;>&lt;font fgcolor=&quot;#ffffffff&quot;>&quot;Welcome to Google sync!&quot;&lt;/font>&quot; \nA Google approach to syncing data to allow access to your contacts, appointments and more from wherever you are.&quot;&lt;/string>"
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values-en-rAU/strings.xml"
-            line="2689"
+            line="2765"
             column="64"/>
     </issue>
 
@@ -2925,7 +3069,7 @@
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values-en-rCA/strings.xml"
-            line="2689"
+            line="2765"
             column="64"/>
     </issue>
 
@@ -2941,7 +3085,7 @@
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values-en-rGB/strings.xml"
-            line="2689"
+            line="2765"
             column="64"/>
     </issue>
 
@@ -2957,7 +3101,7 @@
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values-en-rIN/strings.xml"
-            line="2689"
+            line="2765"
             column="64"/>
     </issue>
 
@@ -2969,27 +3113,11 @@
         priority="4"
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="    &lt;string name=&quot;sync_plug&quot; msgid=&quot;7956982719077985381&quot;>&quot;‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‏‎‎‏‏‏‎‎‎‎‏‏‎‏‎‎‎‎‎‎‎‎‎‎‏‏‎‏‎‎‏‎‎‎‎‏‎‏‎‏‏‎‎‎‏‏‎‎‏‎‏‎‎‏‎‎‏‏‎&quot;&lt;font fgcolor=&quot;#ffffffff&quot;>&quot;‎‏‎‎‏‏‏‎Welcome to Google sync!‎‏‎‎‏‏‎&quot;&lt;/font>&quot;‎‏‎‎‏‏‏‎ ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎A Google approach to syncing data to allow access to your contacts, appointments, and more from wherever you are.‎‏‎‎‏‎&quot;&lt;/string>"
-        errorLine2="                                                                                                                                                                         ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/values-en-rXC/strings.xml"
-            line="2689"
-            column="170"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
         errorLine1="    &lt;string name=&quot;sync_plug&quot;>&lt;font fgcolor=&quot;#ffffffff&quot;>Welcome to Google sync!&lt;/font>"
         errorLine2="                                   ~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/strings.xml"
-            line="6228"
+            line="6408"
             column="36"/>
     </issue>
 
@@ -3005,7 +3133,7 @@
         errorLine2="                                        ^">
         <location
             file="res/values/styles.xml"
-            line="163"
+            line="202"
             column="41"/>
     </issue>
 
@@ -3021,7 +3149,7 @@
         errorLine2="                                           ^">
         <location
             file="res/values/styles.xml"
-            line="378"
+            line="417"
             column="44"/>
     </issue>
 
@@ -3037,7 +3165,7 @@
         errorLine2="                                           ^">
         <location
             file="res/values/styles.xml"
-            line="384"
+            line="423"
             column="44"/>
     </issue>
 
@@ -3053,7 +3181,7 @@
         errorLine2="                                           ^">
         <location
             file="res/values/styles.xml"
-            line="385"
+            line="424"
             column="44"/>
     </issue>
 
@@ -3069,7 +3197,7 @@
         errorLine2="                                 ^">
         <location
             file="res/values/styles.xml"
-            line="421"
+            line="460"
             column="34"/>
     </issue>
 
@@ -3181,7 +3309,7 @@
         errorLine2="                                         ^">
         <location
             file="res/values/themes.xml"
-            line="254"
+            line="258"
             column="42"/>
     </issue>
 
@@ -3341,7 +3469,7 @@
         errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/layout/user_info_header.xml"
-            line="93"
+            line="128"
             column="11"/>
     </issue>
 
diff --git a/res/drawable/accessibility_magnification_full_screen.png b/res/drawable/accessibility_magnification_full_screen.png
index 7fcd17d..2e87ab8 100644
--- a/res/drawable/accessibility_magnification_full_screen.png
+++ b/res/drawable/accessibility_magnification_full_screen.png
Binary files differ
diff --git a/res/drawable/accessibility_magnification_window_screen.png b/res/drawable/accessibility_magnification_window_screen.png
index db1f332..a7f2a25 100644
--- a/res/drawable/accessibility_magnification_window_screen.png
+++ b/res/drawable/accessibility_magnification_window_screen.png
Binary files differ
diff --git a/res/drawable/ic_emergency_contact.xml b/res/drawable/ic_emergency_contact.xml
new file mode 100644
index 0000000..65db179
--- /dev/null
+++ b/res/drawable/ic_emergency_contact.xml
@@ -0,0 +1,27 @@
+<!--
+  ~ Copyright (C) 2020 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24"
+        android:tint="?android:attr/colorControlNormal">
+    <path
+        android:pathData="M22,3H2C0.9,3 0,3.9 0,5V19C0,20.1 0.9,21 2,21H22C23.1,21 23.99,20.1 23.99,19L24,5C24,3.9 23.1,3 22,3ZM22,5V19H2V5H22ZM12,9C12,10.66 10.66,12 9,12C7.34,12 6,10.66 6,9C6,7.34 7.34,6 9,6C10.66,6 12,7.34 12,9ZM9,8C9.55,8 10,8.45 10,9C10,9.55 9.55,10 9,10C8.45,10 8,9.55 8,9C8,8.45 8.45,8 9,8ZM9,12.75C11,12.75 15,13.76 15,15.75V18H3V15.75C3,13.76 7,12.75 9,12.75ZM5,16V15.91C5.48,15.41 7.51,14.75 9,14.75C10.49,14.75 12.52,15.41 13,15.91V16H5ZM18.8039,6H17.1962V7.6077L15.8038,6.8039L15,8.1962L16.3923,9L15,9.8038L15.8038,11.1961L17.1962,10.3922V11.9999H18.8039V10.3922L20.1962,11.1961L21,9.8038L19.6077,9L21,8.1962L20.1962,6.8039L18.8039,7.6076V6Z"
+        android:fillColor="@android:color/white"
+        android:fillType="evenOdd"/>
+</vector>
diff --git a/res/drawable/ic_hand_gesture.xml b/res/drawable/ic_hand_gesture.xml
new file mode 100644
index 0000000..34067ea
--- /dev/null
+++ b/res/drawable/ic_hand_gesture.xml
@@ -0,0 +1,32 @@
+<!--
+  ~ Copyright (C) 2020 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24"
+        android:tint="?android:attr/colorControlNormal">
+    <path
+        android:pathData="M5.64,6.64l2.36,-1.14l-2.36,-1.14l-1.14,-2.36l-1.14,2.36l-2.36,1.14l2.36,1.14l1.14,2.36z"
+        android:fillColor="#000000"/>
+    <path
+        android:pathData="M20.3,15.7l-1.3,-2.7l-1.3,2.7l-2.7,1.3l2.7,1.3l1.3,2.7l1.3,-2.7l2.7,-1.3z"
+        android:fillColor="#000000"/>
+    <path
+        android:pathData="M12.33,20.5c-0.73,0 -1.41,-0.31 -1.89,-0.86l-4.39,-5.06l0.35,-0.35c0.09,-0.09 0.36,-0.24 0.63,-0.06c1.95,1.3 1.18,0.79 3.97,2.65c0,-3.92 0,-6.81 0,-10.8c0,-0.28 0.22,-0.5 0.5,-0.5S12,5.72 12,6c0,1.5 0,6 0,6h1.5c0,-2.92 0,-5.06 0,-8c0,-0.28 0.22,-0.5 0.5,-0.5s0.5,0.22 0.5,0.5c0,0.08 0,1.13 0,8H16c0,0 0,-0.51 0,-7c0,-0.28 0.22,-0.5 0.5,-0.5S17,4.72 17,5v2c0,1.25 0,5 0,5h1.5c0,0 0,-3.75 0,-5c0,-0.28 0.22,-0.5 0.5,-0.5s0.5,0.22 0.5,0.5v3.5H21V7c0,-1.1 -0.9,-2 -2,-2c-0.17,0 -0.34,0.03 -0.5,0.07V5c0,-1.1 -0.9,-2 -2,-2c-0.25,0 -0.48,0.05 -0.7,0.13C15.47,2.47 14.79,2 14,2c-1.1,0 -2,0.9 -2,2v0.07C11.84,4.03 11.67,4 11.5,4c-1.1,0 -2,0.9 -2,2c0,2.92 0,5.02 0,8l-1.64,-1.09c-0.79,-0.53 -1.85,-0.42 -2.52,0.25L4,14.5l5.3,6.12C10.06,21.5 11.17,22 12.33,22h4.17l-0.75,-1.5H12.33z"
+        android:fillColor="#000000"/>
+</vector>
diff --git a/res/drawable/ic_hearing.xml b/res/drawable/ic_hearing.xml
new file mode 100644
index 0000000..37d3b95
--- /dev/null
+++ b/res/drawable/ic_hearing.xml
@@ -0,0 +1,26 @@
+<!--
+  ~ Copyright (C) 2020 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24"
+        android:tint="?android:attr/colorControlNormal">
+    <path
+        android:pathData="M17,20c-0.29,0 -0.56,-0.06 -0.76,-0.15 -0.71,-0.37 -1.21,-0.88 -1.71,-2.38 -0.51,-1.56 -1.47,-2.29 -2.39,-3 -0.79,-0.61 -1.61,-1.24 -2.32,-2.53C9.29,10.98 9,9.93 9,9c0,-2.8 2.2,-5 5,-5s5,2.2 5,5h2c0,-3.93 -3.07,-7 -7,-7S7,5.07 7,9c0,1.26 0.38,2.65 1.07,3.9 0.91,1.65 1.98,2.48 2.85,3.15 0.81,0.62 1.39,1.07 1.71,2.05 0.6,1.82 1.37,2.84 2.73,3.55 0.51,0.23 1.07,0.35 1.64,0.35 2.21,0 4,-1.79 4,-4h-2c0,1.1 -0.9,2 -2,2zM7.64,2.64L6.22,1.22C4.23,3.21 3,5.96 3,9s1.23,5.79 3.22,7.78l1.41,-1.41C6.01,13.74 5,11.49 5,9s1.01,-4.74 2.64,-6.36zM11.5,9c0,1.38 1.12,2.5 2.5,2.5s2.5,-1.12 2.5,-2.5 -1.12,-2.5 -2.5,-2.5 -2.5,1.12 -2.5,2.5z"
+        android:fillColor="#000000"/>
+</vector>
diff --git a/res/drawable/ic_illustration_adaptive_connectivity.xml b/res/drawable/ic_illustration_adaptive_connectivity.xml
new file mode 100644
index 0000000..748dd66
--- /dev/null
+++ b/res/drawable/ic_illustration_adaptive_connectivity.xml
@@ -0,0 +1,99 @@
+<!--
+    Copyright (C) 2020 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="412dp"
+    android:height="300dp"
+    android:viewportWidth="412"
+    android:viewportHeight="300">
+  <path
+      android:pathData="M0,0h412v300h-412z"
+      android:fillColor="#fff"/>
+  <path
+      android:pathData="M206,150m-118,0a118,118 0,1 1,236 0a118,118 0,1 1,-236 0"
+      android:strokeAlpha="0.2"
+      android:fillColor="#8ab4f8"
+      android:fillAlpha="0.2"/>
+  <path
+      android:pathData="M206,150m-101.17,0a101.17,101.17 0,1 1,202.34 0a101.17,101.17 0,1 1,-202.34 0"
+      android:strokeAlpha="0.2"
+      android:fillColor="#8ab4f8"
+      android:fillAlpha="0.2"/>
+  <path
+      android:pathData="M206,150m-84.44,0a84.44,84.44 0,1 1,168.88 0a84.44,84.44 0,1 1,-168.88 0"
+      android:strokeAlpha="0.2"
+      android:fillColor="#8ab4f8"
+      android:fillAlpha="0.2"/>
+  <path
+      android:pathData="M141.15,25.48h129.87v250.83h-129.87z"
+      android:fillColor="#fff"/>
+  <path
+      android:pathData="M199.19,237.66h15.2a4.83,4.83 0,0 1,4.83 4.83h0a4.84,4.84 0,0 1,-4.83 4.84h-15.2a4.84,4.84 0,0 1,-4.83 -4.84h0A4.83,4.83 0,0 1,199.19 237.66Z"
+      android:fillColor="#d2e3fc"/>
+  <path
+      android:pathData="M212.32,235.59h0a6.9,6.9 0,0 1,6.9 6.9h0a6.9,6.9 0,0 1,-6.9 6.91h0a6.91,6.91 0,0 1,-6.91 -6.91h0A6.9,6.9 0,0 1,212.32 235.59Z"
+      android:fillColor="#1a73e8"/>
+  <path
+      android:pathData="M262.43,25.48a5,5 0,0 1,5 5V269.54a5,5 0,0 1,-5 5H147.87a5,5 0,0 1,-5 -5V30.46a5,5 0,0 1,5 -5H262.43m0,-6.23H147.87a11.22,11.22 0,0 0,-11.2 11.21V269.54a11.22,11.22 0,0 0,11.2 11.21H262.43a11.22,11.22 0,0 0,11.21 -11.21V30.46a11.22,11.22 0,0 0,-11.21 -11.21Z"
+      android:fillColor="#f1f3f4"/>
+  <path
+      android:pathData="M262.43,282H147.87a12.46,12.46 0,0 1,-12.45 -12.45V30.46A12.46,12.46 0,0 1,147.87 18H262.43a12.46,12.46 0,0 1,12.45 12.45V269.54A12.46,12.46 0,0 1,262.43 282ZM147.87,20.5a10,10 0,0 0,-10 10V269.54a10,10 0,0 0,10 10H262.43a10,10 0,0 0,10 -10V30.46a10,10 0,0 0,-10 -10Z"
+      android:fillColor="#dadce0"/>
+  <path
+      android:pathData="M274.88,82.76h0.69a1.8,1.8 0,0 1,1.8 1.8V95.9a1.8,1.8 0,0 1,-1.8 1.8h-0.69a0,0 0,0 1,0 0V82.76A0,0 0,0 1,274.88 82.76Z"
+      android:fillColor="#dadce0"/>
+  <path
+      android:pathData="M274.88,117.62h0.69a1.8,1.8 0,0 1,1.8 1.8v26.28a1.8,1.8 0,0 1,-1.8 1.8h-0.69a0,0 0,0 1,0 0V117.62a0,0 0,0 1,0 0Z"
+      android:fillColor="#dadce0"/>
+  <path
+      android:pathData="M206.64,182.08m-16.56,0a16.56,16.56 0,1 1,33.12 0a16.56,16.56 0,1 1,-33.12 0"
+      android:fillColor="#f1f3f4"/>
+  <path
+      android:pathData="M190.08,182.08a16.56,16.53 0,1 0,33.12 0a16.56,16.53 0,1 0,-33.12 0z"
+      android:fillColor="#fdd663"/>
+  <path
+      android:pathData="M206.64,174.54l-6.21,4.66l0,9.32l3.88,0l0,-5.44l4.66,0l0,5.44l3.88,0l0,-9.32l-6.21,-4.66z"
+      android:fillColor="#f29900"/>
+  <path
+      android:pathData="M165.84,101.31m-16.53,0a16.53,16.53 0,1 1,33.06 0a16.53,16.53 0,1 1,-33.06 0"
+      android:fillColor="#f6aea9"/>
+  <path
+      android:pathData="M169.77,108.12V96.07a1,1 0,0 0,-1 -1h-1.32V93.46h-3.14V95H163a1,1 0,0 0,-1 1v12a1,1 0,0 0,1 1h5.76A1,1 0,0 0,169.77 108.12ZM168.2,96.6v5.64h-4.71V96.6Z"
+      android:fillColor="#ea4335"/>
+  <path
+      android:pathData="M246.16,152.08m-16.56,0a16.56,16.56 0,1 1,33.12 0a16.56,16.56 0,1 1,-33.12 0"
+      android:fillColor="#f6aea9"/>
+  <path
+      android:pathData="M251.88,146a1.18,1.18 0,0 0,-1.12 -0.79h-8.63A1.19,1.19 0,0 0,241 146l-1.63,4.7L239.37,157a0.78,0.78 0,0 0,0.78 0.79L241,157.79a0.78,0.78 0,0 0,0.78 -0.79v-0.78h9.42L251.2,157a0.79,0.79 0,0 0,0.79 0.79h0.78a0.79,0.79 0,0 0,0.79 -0.79v-6.28ZM242.88,153.84a1.18,1.18 0,1 1,1.18 -1.17A1.17,1.17 0,0 1,242.91 153.88ZM249.95,153.84a1.18,1.18 0,1 1,1.17 -1.17A1.17,1.17 0,0 1,250 153.88ZM241.52,149.22 L242.37,146.78h8.08l0.85,2.44Z"
+      android:fillColor="#ea4335"/>
+  <path
+      android:pathData="M165.84,152.08m-16.56,0a16.56,16.56 0,1 1,33.12 0a16.56,16.56 0,1 1,-33.12 0"
+      android:fillColor="#aecbfa"/>
+  <path
+      android:pathData="M173.24,149.16a4,4 0,0 0,-4 -3.34h-6.11a4.06,4.06 0,0 0,-4 3.34s-1.27,7.34 -1.27,7.45a1.73,1.73 0,0 0,1.73 1.73,1.7 1.7,0 0,0 1.22,-0.49l2.89,-2.85h5l2.88,2.85a1.71,1.71 0,0 0,1.23 0.49,1.73 1.73,0 0,0 1.73,-1.73C174.52,156.5 173.24,149.16 173.24,149.16ZM165.34,150.83h-1.67v1.67h-0.84v-1.67h-1.66L161.17,150h1.66v-1.67h0.84L163.67,150h1.67ZM167.68,151.08a0.67,0.67 0,1 1,0.66 -0.67A0.67,0.67 0,0 1,167.68 151.08ZM169.09,152.5a0.67,0.67 0,1 1,0.66 -0.67A0.67,0.67 0,0 1,169.09 152.5ZM169.09,149.66a0.67,0.67 0,1 1,0.66 -0.67A0.67,0.67 0,0 1,169.09 149.66ZM170.51,151.08a0.67,0.67 0,1 1,0.67 -0.67A0.67,0.67 0,0 1,170.51 151.08Z"
+      android:fillColor="#4285f4"/>
+  <path
+      android:pathData="M246.16,101.31m-16.53,0a16.53,16.53 0,1 1,33.06 0a16.53,16.53 0,1 1,-33.06 0"
+      android:fillColor="#aecbfa"/>
+  <path
+      android:pathData="M242.91,96.47a4.51,4.51 0,0 0,0 6.49l0.83,-0.83a3.47,3.47 0,0 1,-1 -2.42,3.23 3.23,0 0,1 1,-2.41ZM251.06,94.81 L250.23,95.64a5.84,5.84 0,0 1,0 8.14l0.83,0.83a6.77,6.77 0,0 0,2 -4.9A7.08,7.08 0,0 0,251.06 94.81ZM242.06,95.64 L241.24,94.81a7,7 0,0 0,0 9.8l0.82,-0.83a5.84,5.84 0,0 1,0 -8.14ZM249.38,96.47 L248.55,97.3a3.46,3.46 0,0 1,1 2.41,3.25 3.25,0 0,1 -1,2.42l0.83,0.83a4.61,4.61 0,0 0,1.38 -3.25A4.92,4.92 0,0 0,249.4 96.47ZM246.16,98a1.71,1.71 0,0 0,-1.73 1.72,1.76 1.76,0 0,0 1,1.59v6h1.38v-6a1.75,1.75 0,0 0,1 -1.59A1.71,1.71 0,0 0,246.16 98Z"
+      android:fillColor="#1a73e8"/>
+  <path
+      android:pathData="M206.64,71.31m-16.5,0a16.5,16.5 0,1 1,33 0a16.5,16.5 0,1 1,-33 0"
+      android:fillColor="#a8dab5"/>
+  <path
+      android:pathData="M212.14,65.81h-2.06l1.38,2.75h-2.07L208,65.81h-1.38L208,68.56L206,68.56l-1.37,-2.75L203.2,65.81l1.38,2.75h-2.06l-1.38,-2.75a1.37,1.37 0,0 0,-1.37 1.38v8.25a1.37,1.37 0,0 0,1.37 1.37h11a1.38,1.38 0,0 0,1.38 -1.37L213.52,67.19A1.38,1.38 0,0 0,212.14 65.81ZM212.14,75.44h-11v-5.5h11Z"
+      android:fillColor="#34a853"/>
+</vector>
diff --git a/res/drawable/tile_icon_show_taps.xml b/res/drawable/tile_icon_show_taps.xml
new file mode 100644
index 0000000..26f4328
--- /dev/null
+++ b/res/drawable/tile_icon_show_taps.xml
@@ -0,0 +1,25 @@
+<!--
+Copyright (C) 2020 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0"
+    android:tint="?android:attr/colorControlNormal">
+  <path
+    android:fillColor="#FF000000"
+    android:pathData="M9,11.24L9,7.5C9,6.12 10.12,5 11.5,5S14,6.12 14,7.5v3.74c1.21,-0.81 2,-2.18 2,-3.74C16,5.01 13.99,3 11.5,3S7,5.01 7,7.5c0,1.56 0.79,2.93 2,3.74zM18.84,15.87l-4.54,-2.26c-0.17,-0.07 -0.35,-0.11 -0.54,-0.11L13,13.5v-6c0,-0.83 -0.67,-1.5 -1.5,-1.5S10,6.67 10,7.5v10.74l-3.43,-0.72c-0.08,-0.01 -0.15,-0.03 -0.24,-0.03 -0.31,0 -0.59,0.13 -0.79,0.33l-0.79,0.8 4.94,4.94c0.27,0.27 0.65,0.44 1.06,0.44h6.79c0.75,0 1.33,-0.55 1.44,-1.28l0.75,-5.27c0.01,-0.07 0.02,-0.14 0.02,-0.2 0,-0.62 -0.38,-1.16 -0.91,-1.38z"/>
+</vector>
diff --git a/res/layout-land/crypt_keeper_progress.xml b/res/layout-land/crypt_keeper_progress.xml
index c2fe2f7..7c182cb 100644
--- a/res/layout-land/crypt_keeper_progress.xml
+++ b/res/layout-land/crypt_keeper_progress.xml
@@ -77,7 +77,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_margin="32dip"
-            android:text="@string/master_clear_button_text"
+            android:text="@string/main_clear_button_text"
             android:visibility="gone"
         />
     </LinearLayout>
diff --git a/res/layout-sw600dp/crypt_keeper_progress.xml b/res/layout-sw600dp/crypt_keeper_progress.xml
index a2e32d7..025d895 100644
--- a/res/layout-sw600dp/crypt_keeper_progress.xml
+++ b/res/layout-sw600dp/crypt_keeper_progress.xml
@@ -100,7 +100,7 @@
             android:layout_alignParentBottom="true"
             android:layout_marginBottom="80dip"
             android:layout_marginEnd="16dip"
-            android:text="@string/master_clear_button_text"
+            android:text="@string/main_clear_button_text"
             android:visibility="gone"
         />
 
diff --git a/res/layout/accessibility_edit_magnification_shortcut.xml b/res/layout/accessibility_edit_magnification_shortcut.xml
new file mode 100644
index 0000000..bed1255
--- /dev/null
+++ b/res/layout/accessibility_edit_magnification_shortcut.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright (C) 2020 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License
+  -->
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/container_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:scrollbarStyle="outsideOverlay">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:padding="24dp">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/accessibility_magnification_switch_shortcut_message"
+            android:textAppearance="?android:attr/textAppearanceListItemSecondary"
+            android:textColor="?android:attr/textColorSecondary"
+            android:layout_marginBottom="24dp"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <Button
+                android:id="@+id/switch_shortcut_positive_button"
+                style="@style/AccessibilityDialogButton"
+                android:gravity="center|end"
+                android:text="@string/accessibility_magnification_switch_shortcut_positive_button"/>
+
+            <Button
+                android:id="@+id/switch_shortcut_negative_button"
+                style="@style/AccessibilityDialogButton"
+                android:gravity="center|end"
+                android:text="@string/accessibility_magnification_switch_shortcut_negative_button"/>
+
+        </LinearLayout>
+    </LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/res/layout/adaptive_connectivity_header.xml b/res/layout/adaptive_connectivity_header.xml
new file mode 100644
index 0000000..4c5fb0c
--- /dev/null
+++ b/res/layout/adaptive_connectivity_header.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2020 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:contentDescription="@null"
+        android:scaleType="fitCenter"
+        android:src="@drawable/ic_illustration_adaptive_connectivity"/>
+
+</FrameLayout>
diff --git a/res/layout/bubble_preference.xml b/res/layout/bubble_preference.xml
index 8a64716..08f25b4 100644
--- a/res/layout/bubble_preference.xml
+++ b/res/layout/bubble_preference.xml
@@ -44,7 +44,7 @@
             android:id="@+id/bubble_all_icon"
             android:src="@drawable/ic_bubble_all"
             android:background="@android:color/transparent"
-            android:layout_gravity="center"
+            android:layout_centerVertical="true"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:clickable="false"
@@ -53,6 +53,7 @@
             android:id="@+id/bubble_all_label"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
             android:ellipsize="end"
             android:maxLines="2"
             android:clickable="false"
@@ -75,7 +76,7 @@
             android:id="@+id/bubble_selected_icon"
             android:src="@drawable/ic_bubble_selected"
             android:background="@android:color/transparent"
-            android:layout_gravity="center"
+            android:layout_centerVertical="true"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:clickable="false"
@@ -84,6 +85,7 @@
             android:id="@+id/bubble_selected_label"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
             android:ellipsize="end"
             android:maxLines="2"
             android:clickable="false"
@@ -106,7 +108,7 @@
             android:id="@+id/bubble_none_icon"
             android:src="@drawable/ic_bubble_none"
             android:background="@android:color/transparent"
-            android:layout_gravity="center"
+            android:layout_centerVertical="true"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:clickable="false"
@@ -115,6 +117,7 @@
             android:id="@+id/bubble_none_label"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
             android:ellipsize="end"
             android:maxLines="2"
             android:clickable="false"
@@ -125,4 +128,4 @@
             android:text="@string/bubble_app_setting_none"/>
     </com.android.settings.notification.NotificationButtonRelativeLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/res/layout/crypt_keeper_progress.xml b/res/layout/crypt_keeper_progress.xml
index 6b8e65f..16cc7a1 100644
--- a/res/layout/crypt_keeper_progress.xml
+++ b/res/layout/crypt_keeper_progress.xml
@@ -73,7 +73,7 @@
         android:layout_height="wrap_content"
         android:layout_margin="32dip"
         android:layout_gravity="center"
-        android:text="@string/master_clear_button_text"
+        android:text="@string/main_clear_button_text"
         android:visibility="gone"
     />
 
diff --git a/res/layout/daltonizer_preview.xml b/res/layout/daltonizer_preview.xml
index bdf1070..de462f1 100644
--- a/res/layout/daltonizer_preview.xml
+++ b/res/layout/daltonizer_preview.xml
@@ -17,13 +17,13 @@
 
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/preview_viewport"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <com.android.settings.accessibility.PaletteListView
-        android:id="@+id/palette_listView"
+    <LinearLayout
+        android:id="@+id/palette_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:importantForAccessibility="noHideDescendants" />
-
+        android:orientation="vertical"
+        android:importantForAccessibility="noHideDescendants"/>
 </FrameLayout>
diff --git a/res/layout/master_clear.xml b/res/layout/main_clear.xml
similarity index 86%
rename from res/layout/master_clear.xml
rename to res/layout/main_clear.xml
index 04c8f8d..1cf1909 100644
--- a/res/layout/master_clear.xml
+++ b/res/layout/main_clear.xml
@@ -23,17 +23,17 @@
     android:orientation="vertical"
     android:theme="@style/GlifV3Theme.Footer"
     android:icon="@drawable/ic_delete_accent"
-    app:sucHeaderText="@string/master_clear_title">
+    app:sucHeaderText="@string/main_clear_title">
 
     <ScrollView
-        android:id="@+id/master_clear_scrollview"
+        android:id="@+id/main_clear_scrollview"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginStart="@dimen/reset_master_clear_margin_start"
-        android:layout_marginEnd="@dimen/reset_master_clear_margin_end">
+        android:layout_marginStart="@dimen/reset_main_clear_margin_start"
+        android:layout_marginEnd="@dimen/reset_main_clear_margin_end">
 
         <LinearLayout
-            android:id="@+id/master_clear_container"
+            android:id="@+id/main_clear_container"
             style="@style/SudContentFrame"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -44,35 +44,35 @@
                 android:id="@+id/sud_layout_description"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/master_clear_desc"/>
+                android:text="@string/main_clear_desc"/>
             <TextView
                 android:id="@+id/also_erases_external"
                 style="@style/TextAppearance.SudGlifItemSummary"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:visibility="gone"
-                android:text="@string/master_clear_desc_also_erases_external"/>
+                android:text="@string/main_clear_desc_also_erases_external"/>
             <TextView
                 android:id="@+id/also_erases_esim"
                 style="@style/TextAppearance.SudGlifItemSummary"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:visibility="gone"
-                android:text="@string/master_clear_desc_also_erases_esim"/>
+                android:text="@string/main_clear_desc_also_erases_esim"/>
             <TextView
                 android:id="@+id/accounts_label"
                 style="@style/TextAppearance.SudGlifItemSummary"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:visibility="gone"
-                android:text="@string/master_clear_accounts"/>
+                android:text="@string/main_clear_accounts"/>
             <LinearLayout
                 android:id="@+id/accounts"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
                 android:visibility="gone">
-                <!-- Do not add any children here as they will be removed in the MasterClear.java
+                <!-- Do not add any children here as they will be removed in the MainClear.java
                     code. A list of accounts will be inserted programmatically. -->
             </LinearLayout>
             <TextView
@@ -81,20 +81,20 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:visibility="gone"
-                android:text="@string/master_clear_other_users_present"/>
+                android:text="@string/main_clear_other_users_present"/>
             <TextView
                 android:id="@+id/no_cancel_mobile_plan"
                 style="@style/TextAppearance.SudGlifItemSummary"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:visibility="gone"
-                android:text="@string/master_clear_desc_no_cancel_mobile_plan"/>
+                android:text="@string/main_clear_desc_no_cancel_mobile_plan"/>
             <TextView
                 android:id="@+id/erase_external_option_text"
                 style="@style/TextAppearance.SudGlifItemSummary"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/master_clear_desc_erase_external_storage"/>
+                android:text="@string/main_clear_desc_erase_external_storage"/>
             <LinearLayout
                 android:id="@+id/erase_external_container"
                 android:layout_width="match_parent"
diff --git a/res/layout/master_clear_account.xml b/res/layout/main_clear_account.xml
similarity index 100%
rename from res/layout/master_clear_account.xml
rename to res/layout/main_clear_account.xml
diff --git a/res/layout/master_clear_confirm.xml b/res/layout/main_clear_confirm.xml
similarity index 92%
rename from res/layout/master_clear_confirm.xml
rename to res/layout/main_clear_confirm.xml
index a236cd3..95262a0 100644
--- a/res/layout/master_clear_confirm.xml
+++ b/res/layout/main_clear_confirm.xml
@@ -22,7 +22,7 @@
     android:theme="@style/SudThemeGlifV3.DayNight"
     android:id="@+id/setup_wizard_layout"
     android:icon="@drawable/ic_delete_accent"
-    app:sucHeaderText="@string/master_clear_confirm_title">
+    app:sucHeaderText="@string/main_clear_confirm_title">
 
     <LinearLayout
         style="@style/SudContentFrame"
@@ -35,6 +35,6 @@
             style="@style/SudItemTitle.GlifDescription"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/master_clear_final_desc"/>
+            android:text="@string/main_clear_final_desc"/>
     </LinearLayout>
 </com.google.android.setupdesign.GlifLayout>
diff --git a/res/layout/master_clear_disallowed_screen.xml b/res/layout/main_clear_disallowed_screen.xml
similarity index 95%
rename from res/layout/master_clear_disallowed_screen.xml
rename to res/layout/main_clear_disallowed_screen.xml
index 80326ca..ea9f2cd 100644
--- a/res/layout/master_clear_disallowed_screen.xml
+++ b/res/layout/main_clear_disallowed_screen.xml
@@ -34,6 +34,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:gravity="center"
-                android:text="@string/master_clear_not_available"
+                android:text="@string/main_clear_not_available"
                 android:textAppearance="?android:attr/textAppearanceMedium" />
 </FrameLayout>
\ No newline at end of file
diff --git a/res/layout/notif_priority_conversation_preference.xml b/res/layout/notif_priority_conversation_preference.xml
index f68dbde..5da1238 100644
--- a/res/layout/notif_priority_conversation_preference.xml
+++ b/res/layout/notif_priority_conversation_preference.xml
@@ -32,7 +32,7 @@
         android:clickable="true"
         android:focusable="true">
         <ImageView
-            android:id="@+id/priority_icon"
+            android:id="@+id/icon"
             android:src="@drawable/ic_important_outline"
             android:background="@android:color/transparent"
             android:layout_gravity="center"
@@ -41,19 +41,19 @@
             android:clickable="false"
             android:focusable="false"/>
         <TextView
-            android:id="@+id/priority_label"
+            android:id="@+id/label"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:ellipsize="end"
             android:maxLines="1"
             android:clickable="false"
             android:focusable="false"
-            android:layout_toEndOf="@id/priority_icon"
+            android:layout_toEndOf="@id/icon"
             android:layout_marginStart="@dimen/notification_importance_drawable_padding"
             android:textAppearance="@style/TextAppearance.NotificationImportanceButton.Unselected"
             android:text="@string/notification_priority_title"/>
         <TextView
-            android:id="@+id/priority_summary"
+            android:id="@+id/summary"
             android:paddingTop="@dimen/notification_importance_button_padding"
             android:text="@string/notification_channel_summary_priority"
             android:layout_width="match_parent"
@@ -61,8 +61,8 @@
             android:clickable="false"
             android:focusable="false"
             android:ellipsize="end"
-            android:maxLines="3"
-            android:layout_below="@id/priority_icon"
+            android:maxLines="4"
+            android:layout_below="@id/icon"
             android:textAppearance="@style/TextAppearance.NotificationImportanceDetail"
             android:visibility="gone" />
     </com.android.settings.notification.NotificationButtonRelativeLayout>
@@ -76,7 +76,7 @@
         android:clickable="true"
         android:focusable="true">
         <ImageView
-            android:id="@+id/alert_icon"
+            android:id="@+id/icon"
             android:src="@drawable/ic_notifications_alert"
             android:background="@android:color/transparent"
             android:layout_gravity="center"
@@ -85,19 +85,19 @@
             android:clickable="false"
             android:focusable="false"/>
         <TextView
-            android:id="@+id/alert_label"
+            android:id="@+id/label"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:ellipsize="end"
             android:maxLines="1"
             android:clickable="false"
             android:focusable="false"
-            android:layout_toEndOf="@id/alert_icon"
+            android:layout_toEndOf="@id/icon"
             android:layout_marginStart="@dimen/notification_importance_drawable_padding"
             android:textAppearance="@style/TextAppearance.NotificationImportanceButton.Unselected"
             android:text="@string/notification_alert_title"/>
         <TextView
-            android:id="@+id/alert_summary"
+            android:id="@+id/summary"
             android:paddingTop="@dimen/notification_importance_button_padding"
             android:text="@string/notification_channel_summary_default"
             android:layout_width="match_parent"
@@ -106,7 +106,7 @@
             android:focusable="false"
             android:ellipsize="end"
             android:maxLines="2"
-            android:layout_below="@id/alert_icon"
+            android:layout_below="@id/icon"
             android:textAppearance="@style/TextAppearance.NotificationImportanceDetail"
             android:visibility="gone" />
     </com.android.settings.notification.NotificationButtonRelativeLayout>
@@ -120,7 +120,7 @@
         android:clickable="true"
         android:focusable="true">
         <ImageView
-            android:id="@+id/silence_icon"
+            android:id="@+id/icon"
             android:src="@drawable/ic_notifications_off_24dp"
             android:background="@android:color/transparent"
             android:layout_gravity="center"
@@ -129,19 +129,19 @@
             android:clickable="false"
             android:focusable="false"/>
         <TextView
-            android:id="@+id/silence_label"
+            android:id="@+id/label"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:ellipsize="end"
             android:maxLines="1"
             android:clickable="false"
             android:focusable="false"
-            android:layout_toEndOf="@id/silence_icon"
+            android:layout_toEndOf="@id/icon"
             android:layout_marginStart="@dimen/notification_importance_drawable_padding"
             android:textAppearance="@style/TextAppearance.NotificationImportanceButton.Unselected"
             android:text="@string/notification_silence_title"/>
         <TextView
-            android:id="@+id/silence_summary"
+            android:id="@+id/summary"
             android:paddingTop="@dimen/notification_importance_button_padding"
             android:text="@string/notification_conversation_summary_low"
             android:layout_width="match_parent"
@@ -150,7 +150,7 @@
             android:focusable="false"
             android:ellipsize="end"
             android:maxLines="2"
-            android:layout_below="@id/silence_icon"
+            android:layout_below="@id/icon"
             android:textAppearance="@style/TextAppearance.NotificationImportanceDetail"
             android:visibility="gone" />
     </com.android.settings.notification.NotificationButtonRelativeLayout>
diff --git a/res/layout/notification_history_app_layout.xml b/res/layout/notification_history_app_layout.xml
index a1b3be7..aaca0fd 100644
--- a/res/layout/notification_history_app_layout.xml
+++ b/res/layout/notification_history_app_layout.xml
@@ -24,6 +24,7 @@
         android:id="@+id/app_header"
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
+        android:background="@drawable/button_ripple_radius"
         android:paddingTop="12dp"
         android:paddingBottom="12dp"
         android:paddingStart="16dp">
@@ -54,17 +55,19 @@
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
                 android:paddingStart="6dp"
-                android:layout_gravity="center_vertical"
+                android:layout_gravity="start|center_vertical"
+                android:textDirection="locale"
                 android:paddingTop="8dp"
                 android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Notification.Title"/>
         </LinearLayout>
-        <ImageButton
+        <ImageView
             android:id="@+id/expand"
             android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
             android:layout_height="48dp"
             android:layout_width="48dp"
-            android:background="@drawable/button_ripple_radius"
+            android:scaleType="center"
+            android:contentDescription="@null"
             android:src="@*android:drawable/ic_expand_more"/>
     </RelativeLayout>
 
diff --git a/res/layout/notification_sbn_log_row.xml b/res/layout/notification_sbn_log_row.xml
index 6156d26..ee143b0 100644
--- a/res/layout/notification_sbn_log_row.xml
+++ b/res/layout/notification_sbn_log_row.xml
@@ -130,6 +130,6 @@
     <View
         android:id="@+id/divider"
         android:layout_width="match_parent"
-        android:layout_height="0.5dp"
-        android:background="@color/material_grey_300" />
+        android:layout_height="wrap_content"
+        android:background="?android:attr/listDivider" />
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/preference_balance_slider.xml b/res/layout/preference_balance_slider.xml
index 32010c3..80cb996 100644
--- a/res/layout/preference_balance_slider.xml
+++ b/res/layout/preference_balance_slider.xml
@@ -87,7 +87,7 @@
                 android:orientation="horizontal">
                 <TextView
                     android:id="@+id/left_text"
-                    android:text="@string/accessibility_toggle_master_balance_left_label"
+                    android:text="@string/accessibility_toggle_primary_balance_left_label"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -95,7 +95,7 @@
                     android:textAlignment="viewStart" />
                 <TextView
                     android:id="@+id/right_text"
-                    android:text="@string/accessibility_toggle_master_balance_right_label"
+                    android:text="@string/accessibility_toggle_primary_balance_right_label"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
diff --git a/res/layout/preference_two_target_radio.xml b/res/layout/preference_two_target_radio.xml
index f454c87..c7d0f5e 100644
--- a/res/layout/preference_two_target_radio.xml
+++ b/res/layout/preference_two_target_radio.xml
@@ -54,7 +54,8 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:paddingTop="16dp"
-            android:paddingBottom="16dp">
+            android:paddingBottom="16dp"
+            android:paddingEnd="16dp">
 
             <TextView
                 android:id="@android:id/title"
diff --git a/res/layout/preference_widget_master_checkbox.xml b/res/layout/preference_widget_primary_checkbox.xml
similarity index 100%
rename from res/layout/preference_widget_master_checkbox.xml
rename to res/layout/preference_widget_primary_checkbox.xml
diff --git a/res/layout/preference_widget_master_switch.xml b/res/layout/preference_widget_primary_switch.xml
similarity index 100%
rename from res/layout/preference_widget_master_switch.xml
rename to res/layout/preference_widget_primary_switch.xml
diff --git a/res/layout/preference_widget_zen_master_icon.xml b/res/layout/preference_widget_zen_master_icon.xml
deleted file mode 100644
index 64c0db8..0000000
--- a/res/layout/preference_widget_zen_master_icon.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Layout used by CheckBoxPreference for the checkbox style. This is inflated
-     inside android.R.layout.preference. -->
-<RadioButton xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@android:id/checkbox"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center"
-    android:background="@null"
-    android:focusable="false"
-    android:clickable="false" />
diff --git a/res/layout/restricted_preference_widget_master_switch.xml b/res/layout/restricted_preference_widget_primary_switch.xml
similarity index 92%
rename from res/layout/restricted_preference_widget_master_switch.xml
rename to res/layout/restricted_preference_widget_primary_switch.xml
index 60abeb2..81d7291 100644
--- a/res/layout/restricted_preference_widget_master_switch.xml
+++ b/res/layout/restricted_preference_widget_primary_switch.xml
@@ -18,5 +18,5 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
     <include layout="@layout/restricted_icon"/>
 
-    <include layout="@layout/preference_widget_master_switch"/>
+    <include layout="@layout/preference_widget_primary_switch"/>
 </merge>
\ No newline at end of file
diff --git a/res/layout/settings_base_layout.xml b/res/layout/settings_base_layout.xml
index 0a4437e..9fbc2a2 100644
--- a/res/layout/settings_base_layout.xml
+++ b/res/layout/settings_base_layout.xml
@@ -26,8 +26,7 @@
         style="?android:attr/actionBarStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:theme="?android:attr/actionBarTheme"
-        android:navigationContentDescription="@*android:string/back_button_label" />
+        android:theme="?android:attr/actionBarTheme" />
     <FrameLayout
         android:id="@+id/content_frame"
         android:layout_width="match_parent"
diff --git a/res/layout/wifi_dialog.xml b/res/layout/wifi_dialog.xml
index 45ecd61..2cc6c8a 100644
--- a/res/layout/wifi_dialog.xml
+++ b/res/layout/wifi_dialog.xml
@@ -141,6 +141,24 @@
                             android:prompt="@string/wifi_eap_method" />
                 </LinearLayout>
 
+                <LinearLayout android:id="@+id/l_sim"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:visibility="gone"
+                        style="@style/wifi_item" >
+                    <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            style="@style/wifi_item_label"
+                            android:text="@string/sim_card" />
+
+                    <Spinner android:id="@+id/sim"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            style="@style/wifi_item_spinner"
+                            android:prompt="@string/sim_card" />
+                </LinearLayout>
+
                 <LinearLayout android:id="@+id/l_phase2"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -196,18 +214,6 @@
                             android:entries="@array/eap_ocsp_type" />
                 </LinearLayout>
 
-                <LinearLayout android:id="@+id/no_ca_cert_warning"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:visibility="gone"
-                        style="@style/wifi_item" >
-                    <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            style="@style/wifi_item_warning"
-                            android:text="@string/wifi_do_not_validate_eap_server_warning" />
-                </LinearLayout>
-
                 <LinearLayout android:id="@+id/l_domain"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -329,7 +335,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     style="@style/wifi_item" >
-                <!--  Dummy to enable right-justification of checkbox -->
+                <!--  Placeholder to enable right-justification of checkbox -->
                 <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -439,7 +445,7 @@
                     android:layout_height="wrap_content"
                     style="@style/wifi_item"
                     android:visibility="gone">
-                <!--  Dummy to enable right-justification of warning -->
+                <!--  Placeholder to enable right-justification of warning -->
                 <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
diff --git a/res/layout/wifi_dpp_qrcode_generator_fragment.xml b/res/layout/wifi_dpp_qrcode_generator_fragment.xml
index 1f8b37c..76eecb0 100644
--- a/res/layout/wifi_dpp_qrcode_generator_fragment.xml
+++ b/res/layout/wifi_dpp_qrcode_generator_fragment.xml
@@ -56,6 +56,9 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
                 android:textAlignment="center"
+                android:textIsSelectable="true"
+                android:focusable="true"
+                android:longClickable="true"
                 android:textAppearance="@android:style/TextAppearance.Material.Body1"
                 android:textColor="?android:attr/textColorSecondary"/>
         </LinearLayout>
diff --git a/res/values-af/arrays.xml b/res/values-af/arrays.xml
index 5b8ed28..9e4ce2a 100644
--- a/res/values-af/arrays.xml
+++ b/res/values-af/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Middelmatig"</item>
     <item msgid="6740026006576843477">"Lank"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Kort"</item>
+    <item msgid="7397961711906421599">"Medium"</item>
+    <item msgid="4079132024502041928">"Lank"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Verstek"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Globaal"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Net TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Globaal"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index cda838f..684b6ed 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Wys profiel-inligting op slotskerm"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Rekeninge"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Ligging"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Gebruik ligging"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Gebruik ligging"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Af"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">Aan – <xliff:g id="COUNT_1">%1$d</xliff:g> programme het toegang tot ligging</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Gebruik jou gesig om te staaf"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Begin"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"As toeganklikheidgesigslot afgeskakel is, sal sommige opstellingstappe dalk nie behoorlik werk met TalkBack nie."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Gaan terug"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Gaan aan met opstelling"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Gebruik toeganklikheidopstelling"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="one">Moet minder as <xliff:g id="NUMBER_0">%d</xliff:g> syfer wees</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Toesteladministrateur laat nie toe dat jy \'n onlangse PIN gebruik nie"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Jou IT-administrateur blokkeer algemene PIN\'e. Probeer \'n ander PIN."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Dit mag nie \'n ongeldige karakter insluit nie"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Moet minstens een letter bevat"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Moet minstens een syfer bevat"</string>
@@ -653,7 +655,6 @@
       <item quantity="one">Moet minstens 1 nienumeriese karakter bevat</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Toesteladministrateur laat nie toe dat jy \'n onlangse wagwoord gebruik nie"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Jou IT-administrateur blokkeer algemene wagwoorde. Probeer \'n ander wagwoord."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Stygende, dalende of herhalende volgorde van syfers word nie toegelaat nie"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Bevestig"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Kanselleer"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Skakel Wi-Fi aan"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Gebruik Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Gebruik Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wi-Fi-instellings"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Stel en beheer draadlose toegangspunte"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Sentreer die QR-kode hieronder om aan “<xliff:g id="SSID">%1$s</xliff:g>” te koppel"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Skandeer \'n QR-kode om by W-Fi aan te sluit"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Deel Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Skandeer hierdie QR-kode om aan “<xliff:g id="SSID">%1$s</xliff:g>” te koppel en die wagwoord te deel"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Skandeer hierdie QR-kode met \'n ander toestel om by “<xliff:g id="SSID">%1$s</xliff:g>” aan te sluit"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Skandeer hierdie QR-kode om aan “<xliff:g id="SSID">%1$s</xliff:g>” te koppel"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Probeer weer. Kontak die toestelvervaardiger as die kwessie voortduur"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Iets is fout"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi-Fi-wagwoord: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Warmkolwagwoord: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Outokoppel"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Laat foon toe om outomaties te koppel naby hierdie netwerk"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Laat tablet toe om outomaties te koppel naby hierdie netwerk"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Laat aansluiting aan hierdie netwerk toe wanneer dit binne bereik is"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Voeg toestel by"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Gebruik \'n QR-kode om \'n toestel by hierdie netwerk te voeg"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR-kode is nie \'n geldige formaat nie"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Gebruik stelselsertifikate"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Moenie verskaf nie"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Moenie staaf nie"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Geen sertifikaat is gespesifiseer nie. Jou verbinding sal nie privaat wees nie."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Netwerknaam is te lank."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Moet \'n domein spesifiseer."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Sertifikaat word vereis."</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Koppel"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi is aangeskakel"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Gekoppel aan <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Koppel tans aan <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Koppel tans …"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Netwerkverbinding het misluk"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Netwerk nie binne sendbereik nie"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Program deel tans inhoud. Skakel warmkol af en dan aan om internetverbinding te deel"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Geen wagwoord is gestel nie"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Warmkolnaam"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Skakel tans aan <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> …"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Skakel tans <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> aan …"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Ander toestelle kan aan <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> koppel"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Warmkolwagwoord"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP-band"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Gladde Vertoning"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Verhoog die herlaaikoers vir sommige inhoud outomaties van 60 tot 90 Hz. Verhoog batterygebruik."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Gladde vertoonskerm"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Dwing herlaaikoers van 90 Hz af"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Hoogste herlaaikoers vir verbeterde raaksensitiwiteit en animasiegehalte. Verhoog batterygebruik."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Skermaandag"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Aan / skerm sal nie afskakel as jy daarna kyk nie"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android-weergawe"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android-sekuriteitopdatering"</string>
     <string name="model_info" msgid="8997566254717810904">"Model"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Model: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Model en hardeware"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Hardewareweergawe"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Toerusting-ID"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Netwerkinstellings is teruggestel"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Kan nie SIM-kaarte uitvee nie"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Afgelaaide SIM-kaarte kan weens \'n fout nie uitgevee word nie.\n\nHerbegin jou toestel en probeer weer."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Vee alle data uit (fabriekterugstelling)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Vee alle data uit (fabriekterugstelling)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Dit sal al die data uit jou tablet se "<b>"interne berging"</b>" uitvee, insluitend: \n\n"<li>"Jou Google-rekening"</li>\n" "<li>"Stelsel- en programdata en -instellings"</li>\n<li>"Afgelaaide programme"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Dit sal alle data uit jou foon se "<b>"interne berging"</b>" uitvee, insluitend:\n\n"<li>"Jou Google-rekening"</li>\n<li>"Stelsel- en programdata en -instellings"</li>\n<li>"Afgelaaide programme"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Jy is tans aangemeld by die volgende rekeninge:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Daar is ander gebruikers op hierdie toestel teenwoordig.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Musiek"</li>\n<li>"Foto\'s"</li>\n<li>"Ander gebruikerdata"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"e-SIM\'e"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Dit sal nie jou mobiele diensplan kanselleer nie."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Om musiek, prente en ander gebruikersdata uit te vee, moet die "<b>"USB-berging"</b>" uitgevee word."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Om musiek, prente en ander gebruikersdata uit te vee, moet die "<b>"SD-kaart"</b>" uitgevee word."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Vee alle data uit (fabriekterugstelling)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Vee alle data uit (fabriekterugstelling)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Dit sal al die data uit jou tablet se "<b>"interne berging"</b>" uitvee, insluitend:\n\n"<li>"Jou Google-rekening"</li>\n" "<li>"Stelsel- en programdata en -instellings"</li>\n<li>"Afgelaaide programme"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Dit sal alle data uit jou foon se "<b>"interne berging"</b>" uitvee, insluitend:\n\n"<li>"Jou Google-rekening"</li>\n<li>"Stelsel- en programdata en -instellings"</li>\n<li>"Afgelaaide programme"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Jy is tans aangemeld by die volgende rekeninge:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Daar is ander gebruikers op hierdie toestel teenwoordig.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Musiek"</li>\n<li>"Foto\'s"</li>\n<li>"Ander gebruikerdata"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"e-SIM-kaarte"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Dit sal nie jou mobiele diensplan kanselleer nie."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Om musiek, prente en ander gebruikerdata uit te vee, moet die "<b>"USB-berging"</b>" uitgevee word."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Om musiek, prente en ander gebruikerdata uit te vee, moet die "<b>"SD-kaart"</b>" uitgevee word."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Vee USB-berging uit"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Vee SD-kaart uit"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Vee alle data op die interne USB-berging uit, soos musiek of foto\'s."</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Vee al die data op die SD-kaart uit, soos musiek of foto\'s."</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Vee alle data uit"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Vee alle data uit"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Al jou persoonlike inligting en afgelaaide programme sal uitgevee word. Jy kan nie hierdie handeling ontdoen nie."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Al jou persoonlike inligting, insluitend afgelaaide programme en SIM-kaarte, sal uitgevee word. Jy kan nie hierdie handeling ontdoen nie."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Vee alles uit"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Omdat die Stelsel Skoonmaak-diens nie beskikbaar was nie, is geen terugstel gedoen nie."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Vee alle data uit?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Fabriekterugstelling is nie vir hierdie gebruiker beskikbaar nie"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Vee tans uit"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Wag asseblief …"</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Vee alle data uit"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Vee alle data uit"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Al jou persoonlike inligting en afgelaaide programme sal uitgevee word. Jy kan nie hierdie handeling ontdoen nie."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Al jou persoonlike inligting, insluitend afgelaaide programme en SIM-kaarte, sal uitgevee word. Jy kan nie hierdie handeling ontdoen nie."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Vee alle data uit?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Fabriekterugstelling is nie vir hierdie gebruiker beskikbaar nie"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Vee tans uit"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Wag asseblief …"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Oproepinstellings"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Stel stemboodskapdiens, oproepaanstuur, oproep wag, beller-ID op"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB-verbinding"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Kan nie aan meer as <xliff:g id="MAXCONNECTION">%1$d</xliff:g> toestelle verbind nie."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sal ontverbind word."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ethernet-verbinding"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Deel foon se internetverbinding via USB Ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Deel foon se internetverbinding via Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Gebruik warmkol en verbinding om deur jou mobiele dataverbinding internet aan ander toestelle te verskaf. Programme kan ook \'n warmkol skep om inhoud met nabygeleë toestelle te deel."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Gebruik warmkol en verbinding om deur jou Wi-Fi- of mobiele dataverbinding internet aan ander toestelle te verskaf. Programme kan ook \'n warmkol skep om inhoud met toestelle in die omtrek te deel."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Hulp"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Onderskrifvoorkeure"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Vergroting"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Vergrotingarea"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Vergroting is geaktiveer"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Kies die vergrotingarea(s) wat jy wil gebruik wanneer jy die skerm vergroot"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Volskerm"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Deel van skerm"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Volskerm en deel van skerm"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Vergroot die hele skerm"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Vergroot deel van skerm"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Skakel oor na toeganklikheidknoppie?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"As jy tripeltik gebruik om \'n deel van die skerm te vergroot, sal dit veroorsaak dat tik- en ander handelinge vertraag word.\n\nWil jy daarna toe oorskakel om die toeganklikheidknoppie vir vergroting te gebruik?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Skakel oor na toeganklikheidknoppie"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Hou tripeltik om te vergroot"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Vergrotinginstellings"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Vergroot met trippeltik"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Vergroot met kortpad"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Kragknoppie beëindig oproep"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Groot muiswyser"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Verwyder animasies"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Mono-oudio"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Kombineer kanale wanneer oudio gespeel word"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Oudiobalans"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Links"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Regs"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Mono-oudio"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Kombineer kanale wanneer oudio gespeel word"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Oudiobalans"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Links"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Regs"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Verstek"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 sekondes"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 sekondes"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Kennisgewingvibrasie"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Luivibrasie"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Raakterugvoer"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Gebruik <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Maak <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> oop"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Gebruik kleurregstelling"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Wys onderskrifte"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Net vir gesteunde program"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Gebruik <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Maak <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> oop"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Gebruik kleurregstelling"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Wys onderskrifte"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Net vir gesteunde program"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Grootte en styl van onderskrif"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>teksgrootte"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Meer opsies"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomalie"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomalie"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomalie"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Grysskaal"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Rooi-groen"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Rooi-groen"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Blou-geel"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Agtergrondbeperking"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Laat die program toe om in die agtergrond te loop"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Program word nie toegelaat om in die agtergrond te loop nie"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Agtergrondgebruik kan nie beperk word nie"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Agtergrondgebruik kan nie beperk word nie"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Beperk agtergrondaktiwiteit?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"As jy agtergrondaktiwiteit vir \'n program beperk, kan dit verkeerd werk"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Hierdie program is nie gestel om batterykrag te optimeer nie en daarom kan jy dit nie beperk nie.\n\nOm die program te beperk, moet jy eers batterykrag-optimering aanskakel."</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Stel \'n skedule"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Verleng batterylewe"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Skakel af wanneer dit gelaai is"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Batterybespaarder skakel af wanneer jou foon by <xliff:g id="PERCENT">%1$s</xliff:g> is"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Batterybespaarder skakel af wanneer jou tablet by <xliff:g id="PERCENT">%1$s</xliff:g> is"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Batterybespaarder skakel af wanneer jou toestel by <xliff:g id="PERCENT">%1$s</xliff:g> is"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Batterybespaarder skakel af wanneer jou foon bo <xliff:g id="PERCENT">%1$s</xliff:g> gelaai is"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Batterybespaarder skakel af wanneer jou tablet bo <xliff:g id="PERCENT">%1$s</xliff:g> gelaai is"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Batterybespaarder skakel af wanneer jou toestel bo <xliff:g id="PERCENT">%1$s</xliff:g> gelaai is"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Skakel aan"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Stel terug"</string>
     <string name="tts_play" msgid="2945513377250757221">"Speel"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Aanpasbare konnektiwiteit"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Verleng die batterylewe en verbeter die toestel se werkverrigting deur jou netwerkverbindings outomaties te bestuur"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Eiebewysberging"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Installeer \'n sertifikaat"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Installeer sertifikate uit berging"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Gebruikereiebewyse"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Bekyk en wysig gebergde eiebewyse"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Gevorderd"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Bergingtipe"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardeware-geondersteun"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Net sagteware"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Eiebewyse is nie vir hierdie gebruiker beskikbaar nie"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Geïnstalleer vir VPN en programme"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Geïnstalleer vir Wi-Fi"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Betaling by \'n terminaal"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Stel \'n betalingprogram op. Hou dan bloot die agterkant van jou foon naby enige terminaal met die kontaklose simbool."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Het dit"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Meer …"</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Meer …"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Stel verstekbetalingprogram"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Dateer verstekbetalingprogram op"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Betaal by \'n kontaklose terminaal met <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Gebruik dit altyd vir oproepe"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Kies \'n SIM vir data"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Kies \'n SIM vir SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Wissel tans data-SIM, dit kan tot \'n minuut neem …"</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Wissel tans data-SIM – dit kan tot \'n minuut neem …"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Bel met"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Kies \'n SIM-kaart"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"roetine, skedule, batterybespaarder, kragbespaarder, battery, outomaties, persent"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"VolTE, gevorderde oproepe, 4G-oproepe"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"voeg taal by, voeg \'n taal by"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"teksgrootte"</string>
     <string name="default_sound" msgid="6604374495015245195">"Verstekgeluid"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Lui- en kennisgewingvolume is op <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Volume, vibrasie, Moenie Steur Nie"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Aanskakel-klanke"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Kitsopskrif"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Gee outomaties mediaopskrifte"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Geen"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> skedules gestel</item>
-      <item quantity="one">1 skedule gestel</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Geen}=1{1 skedule gestel}other{# skedules gestel}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Moenie Steur Nie"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Word net deur belangrike mense en programme in kennis gestel"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Beperk onderbrekings"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Net prioriteit"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Aan / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Af / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Af"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Aan"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Vra elke keer"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Totdat jy dit afskakel"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> uur</item>
-      <item quantity="one">1 uur</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minute"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> skedules kan outomaties aanskakel</item>
-      <item quantity="one">1 skedule kan outomaties aanskakel</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 uur}other{# uur}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minuut}other{# minute}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Af}=1{Af / 1 skedule kan outomaties aanskakel}other{Af / # skedules kan outomaties aanskakel}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Wat Moenie Steur Nie kan onderbreek"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Mense"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Programme"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Stel kennisgewings met laer prioriteit outomaties op Lig"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Aanpasbare kennisgewingrangskikking"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Rangskik kennisgewings outomaties volgens relevantheid"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Aanpasbare kennisgewingterugvoer"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Dui verstellings aan wat aan kennisgewings gemaak is en wys die opsie om terugvoer aan die stelsel te verskaf"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Voorgestelde handelinge en antwoorde"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Wys voorgestelde handelinge en antwoorde outomaties"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Wys onlangse en gesluimerde kennisgewings"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Toegang tot Moenie Steur Nie"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Laat Moenie Steur Nie toe"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Geen geïnstalleerde programme het toegang tot Moenie Steur Nie versoek nie"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Laai tans programme …"</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Laai tans programme …"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Android keer tans op jou versoek dat hierdie program se kennisgewings op hierdie toestel verskyn"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Android keer tans op jou versoek dat hierdie kategorie kennisgewings op hierdie toestel verskyn"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Android keer tans op jou versoek dat hierdie groep kennisgewings op hierdie toestel verskyn"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Alle gesprekke"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Prioriteitgesprekke"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Geen"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> gesprekke</item>
-      <item quantity="one">1 gesprek</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Geen"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Geen}=1{1 gesprek}other{# gesprekke}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Wie kan onderbreek"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Oproepe"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Oproepe"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Kyk of jou toestel gestel is om te lui om seker te wees dat toegelate oproepe \'n klank maak"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Inkomende oproepe word vir \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" geblokkeer. Jy kan instellings verstel om dit vir jou vriende, familielede of ander kontakte moontlik te maak om jou te bereik."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Gesterde kontakte"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> ander mense</item>
-      <item quantity="one">1 ander persoon</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Geen"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Geen}=1{{contact_1}}=2{{contact_1} en {contact_2}}=3{{contact_1}, {contact_2} en {contact_3}}other{{contact_1}, {contact_2} en # ander mense}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Boodskappe"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"boodskappe"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Boodskappe"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Inkomende boodskappe word vir \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" geblokkeer. Jy kan instellings verstel om dit vir jou vriende, familielede of ander kontakte moontlik te maak om jou te bereik."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Alle boodskappe kan jou bereik"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Alle oproepe kan jou bereik"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Geen"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontakte</item>
-      <item quantity="one">1 kontak</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Geen}=1{1 kontak}other{# kontakte}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Enigiemand"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Kontakte"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Gesterde kontakte"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Alle kennisgewings"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Sommige kennisgewings"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Geselekteerde mense kan jou steeds bereik, selfs al laat jy nie programme toe om te onderbreek nie"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> kan onderbreek</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> kan onderbreek</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"Nog <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Geen programme kan onderbreek nie}=1{{app_1} kan onderbreek}=2{{app_1} en {app_2} kan onderbreek}=3{{app_1}, {app_2} en {app_3} kan onderbreek}other{{app_1}, {app_2} en nog # kan onderbreek}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Programme"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Alle kennisgewings"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Sommige kennisgewings"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Kennisgewings wat kan onderbreek"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Laat alle kennisgewings toe"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> kan onderbreek</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> kan onderbreek</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Niks kan onderbreek nie"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"Nog <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Niks kan onderbreek nie}=1{{sound_category_1} kan onderbreek}=2{{sound_category_1} en {sound_category_2} kan onderbreek}=3{{sound_category_1}, {sound_category_2} en {sound_category_3} kan onderbreek}other{{sound_category_1}, {sound_category_2} en nog # kan onderbreek}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Niks kan onderbreek nie"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Niemand kan onderbreek nie"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Sekere mense kan onderbreek"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Alle mense kan onderbreek"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB word beheer deur"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Gekoppelde toestel"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Hierdie toestel"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Skakel tans oor …"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Skakel tans oor …"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Kon nie oorskakel nie"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Laai tans hierdie toestel"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Laai tans gekoppelde toestel"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Bekyk besonderhede"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Databespaarder"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Onbeperkte data"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Agtergronddata is afgeskakel"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Agtergronddata is afgeskakel"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Aan"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Af"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Gebruik Databespaarder"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Verhinder die tik van antwoorde of ander teks in kennisgewings as die toestel gesluit is"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Verstekspeltoetser"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Kies speltoetser"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Gebruik speltoetser"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Gebruik speltoetser"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Nie gekies nie"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(geen)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Bergingbestuurder verwyder gerugsteunde foto\'s en video\'s van jou toestel af om te help om berginspasie beskikbaar te maak."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Verwyder foto\'s en video\'s"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Bergingbestuurder"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Gebruik Bergingbestuurder"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Gebruik Bergingbestuurder"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Outomaties"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Handmatig"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Maak nou spasie beskikbaar"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Dubbeltik om na foon te kyk"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Dubbeltik om na tablet te kyk"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Dubbeltik om na toestel te kyk"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Swiep vir kennisgewings"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Swiep af op die onderste rand van die skerm om jou kennisgewings te wys"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Eenhandmodus"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Gebruik eenhandmodus"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Verlaat wanneer jy tussen programme wissel"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Uitteltyd"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 sekondes"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 sekondes"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 sekondes"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"bereikbaarheid"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Dubbeltik op jou skerm om na die horlosie, kennisgewings en ander inligting te kyk."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Tel foon op om te kyk"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Tel op om na tablet te kyk"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Tik om na tablet te kyk"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Tik om na toestel te kyk"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Tik op jou skerm om na die horlosie, kennisgewings en ander inligting te kyk."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Paniekknoppie"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Begin die nood-SOS-handelinge deur die aan/af-skakelaar 5 keer vinnig te druk."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Waarskuwingsgeluid"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Waarsku voordat jy die handelinge begin"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Noodkontakte"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Swiep vingerafdruk vir kennisgewings"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Swiep vingerafdruk"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Swiep na onder op die vingerafdruksensor aan die agterkant van jou foon om jou kennisgewings na te gaan."</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Aktiveer vir alle programme"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Kies grafikadrywer"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Verstek"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Speletjiedrywer"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Speletjiedrywer"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Ontwikkelaardrywer"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Stelselgrafikadrywer"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Kon nie netwerke kry nie. Probeer weer."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(verbode)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Geen SIM-kaart nie"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Geen SIM nie"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Geen"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Benodig SIM om te koppel"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Benodig <xliff:g id="WIRELESS_CARRIER">%s</xliff:g>-SIM om te koppel"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Voorkeurnetwerkmodus: WCDMA verkies"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Voorkeurnetwerkmodus: net GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Voorkeurnetwerkmodus: net WCDMA"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobiele data"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Kry toegang tot data deur selnetwerk"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Foon sal outomaties na hierdie diensverskaffer oorskakel wanneer dit binne bereik is"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Geen SIM-kaart beskikbaar nie"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Oproepevoorkeur"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS-voorkeur"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Vra elke keer"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Laat skermoorleggers op Instellings toe"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Laat programme wat oor ander programme kan wys toe om Instellings-skerms te oorlê"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Media"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Versteek speler wanneer mediasessie geëindig het"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Die speler maak dit vir jou moontlik om \'n sessie vanaf die uitgebreide Kitsinstellings-paneel te hervat."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Mediaspeler in Kitsinstellings"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Wys mediaspeler vir \'n verlengde tydperk sodat terugspeel maklik kan hervat"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Versteek speler"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Wys speler"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Geen spelers beskikbaar nie"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Toegelate programme"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"media"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth sal aanskakel"</string>
 </resources>
diff --git a/res/values-am/arrays.xml b/res/values-am/arrays.xml
index f44cb48..09ef20a 100644
--- a/res/values-am/arrays.xml
+++ b/res/values-am/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"መካከለኛ"</item>
     <item msgid="6740026006576843477">"ረጅም"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"አጭር"</item>
+    <item msgid="7397961711906421599">"መካከለኛ"</item>
+    <item msgid="4079132024502041928">"ረጅም"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"ነባሪ"</item>
     <item msgid="4234707448428002595">"ጭረት-አልባ"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"ሁለንተናዊ"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA ብቻ"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"ሁለገብ"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index fb2ba7c..76de99d 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"የመገለጫ መረጃ በቁልፍ ማያ ገጽ ላይ አሳይ"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"መለያዎች"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"አካባቢ"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"አካባቢን ተጠቀም"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"አካባቢን ተጠቀም"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"ጠፍቷል"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">በርቷል - <xliff:g id="COUNT_1">%1$d</xliff:g> መተግበሪያዎች የአካባቢ መዳረሻ አላቸው</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"ለማረጋገጥ መልክዎን ይጠቀሙ"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"ጀምር"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"የተደራሽነት በመልክ መክፈት ከጠፋ አንዳንድ የቅንብር እርምጃዎች ከTalkBack ጋር በአግባቡ ላይሠሩ ይችላሉ።"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"ተመለስ"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"ማዋቀር ቀጥል"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"የተደራሽነት ቅንብርን ይጠቀሙ"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="other">ከ<xliff:g id="NUMBER_1">%d</xliff:g> አሃዞች ያነሰ መሆን አለበት</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"የመሣሪያ አስተዳዳሪው የቅርብ ጊዜ ፒን መጠቀም አይፈቅድም"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"የተለመዱ ፒኖች በአይቲ አስተዳዳሪዎ የታገዱ ናቸው። የተለየ ፒን ይሞክሩ።"</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"ይህ ልክ ያልሆነ ቁምፊ ማካተት አይችልም"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"ቢያንስ አንድ ፊደል መያዝ አለበት"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"ቢያንስ አንድ አሃዝ መያዝ አለበት"</string>
@@ -653,7 +655,6 @@
       <item quantity="other">ቢያንስ <xliff:g id="COUNT">%d</xliff:g> ቁጥር ያልሆኑ ቁምፊዎች ሊኖረው ይገባል</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"የመሣሪያ አስተዳዳሪው የቅርብ ጊዜ የይለፍ ቃልን መጠቀም አይፈቅድም"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"የተለመዱ የይለፍ ቃላት በአይቲ አስተዳዳሪዎ የታገዱ ናቸው። የተለየ የይለፍ ቃል ይሞክሩ።"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"ሽቅብ፣ ቁልቁል ወይም ተደጋጋሚ የአኃዞች ተከታታይ አይፈቀድም"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"ያረጋግጡ"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"ይቅር"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Wi-Fi ያብሩ"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Wi-Fiን ተጠቀም"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Wi-Fiን ተጠቀም"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"የWi-Fi ቅንብሮች"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"አዘጋጅ&amp; የገመድ አልባ ድረስ ነጥብ አደራጅ"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"ወደ «<xliff:g id="SSID">%1$s</xliff:g>» መሣሪያ ለማከል የQR ኮዱን ከዚህ በታች መሃል ላይ ያስቀምጡት"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"የQR ኮድን በመቃኘት Wi‑Fi ን ይቀላቀሉ"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Wi‑Fiን አጋራ"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"ወደ «<xliff:g id="SSID">%1$s</xliff:g>»ን ለማገናኘት ይህን የQR ኮድ ይቃኙ እና የይለፍ ቃሉን ያጋሩ"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"«<xliff:g id="SSID">%1$s</xliff:g>»ን ለመቀላቀል ይህን የQR ኮድ በሌላ መሣሪያ ይቃኙት"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"ወደ «<xliff:g id="SSID">%1$s</xliff:g>» ለማገናኘት ይህን የQR ኮድ ይቃኙት"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"እንደገና ይሞክሩ። ችግሩ ከቀጠለ የመሣሪያ አምራቹን ያነጋግሩ"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"የሆነ ችግር ተፈጥሯል"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"የWi-Fi ይለፍ ቃል፦ <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"የመገናኛ ነጥብ የይለፍ ቃል፦ <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"በራስ-ሰር ተገናኝ"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"ስልክ ከዚህ አውታረ መረብ አቅራቢያ በራስ-ሰር እንዲገናኝ ይፍቀዱለት"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"ጡባዊ ከዚህ አውታረ መረብ አቅራቢያ በራስ-ሰር እንዲገናኝ ይፍቀዱለት"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"በክልል ውስጥ ሲሆን ከዚህ አውታረ መረብ ጋር ግንኙነት ይፍቀዱ"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"መሣሪያ ያክሉ"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"አንድ መሣሪያ ወደዚህ አውታረ መረብ ለማከል የQR ኮድ ይጠቀሙ"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR ኮድ ልክ ያልኾነ ቅርጸት ነው"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"የሥርዓት የዕውቅና ማረጋገጫዎችን ይጠቀሙ"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"አታቅርብ"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"አታረጋግጥ"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"ምንም የእውቅና ማረጋገጫ አልተጠቀሰም። የእርስዎ ግንኙነት የግል አይሆንም።"</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"የአውታረ መረብ ስም ከልክ በላይ ረዥም ነው።"</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"ጎራ መጠቀስ አለበት።"</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"የእውቅና ማረጋገጫ ያስፈልጋል።"</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"አያይዝ"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi በርቷል"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"ከ<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ጋር ተገናኝቷል"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"ወደ <xliff:g id="NETWORK_NAME">%1$s</xliff:g> በመገናኘት ላይ"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"በመገናኘት ላይ…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"ከአውታረ መረቡ ጋር መገናኘት አልተሳካም"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"አውታረ መረብ በክክል ውስጥ አይደለም"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"መተግበሪያ ይዘትን እያጋራ ነው። የበይነመረብ ግንኙነትን ለማጋራት መገናኛ ነጥብን ያጥፉና ከዚያ ያብሩት"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"ምንም የይለፍ ቃል አልተቀናበረም"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"የመገናኛ ነጥብ ስም"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>ን በማብራት ላይ..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>ን በማብራት ላይ…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"ሌሎች መሣሪያዎች ወደ <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ሊገናኙ ይችላሉ"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"የመገናኛ ነጥብ የይለፍ ቃል"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"የኤፒ ባንድ"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"ለስላሳ ማሳያ"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"ለአንዳንድ ይዘት የማደሻ ፍጥነቱን በራስ-ሰር ከ60 ወደ 90 ኸርዝ ያሳድገዋል። የባትሪ ፍጆታን ይጨምራል።"</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"ለስላሳ ማሳያ"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"የ90 ኸርዝ እድሳትን አስገድድ"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"ለተሻሻለ የንክኪ አጸፋ እና የእነማ ጥራት በጣም ከፍተኛው ዕድሳት ፍጥነት የባትሪ ፍጆታን ይጨምራል።"</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"የማያ ገጽ ትኩረት"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"በርቷል / ማያ ገጽ እርስዎ እየተመለከቱት ያሉ ከሆነ አይጠፋም"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android ሥሪት"</string>
     <string name="security_patch" msgid="4071756145347865382">"የAndroid ደህንነት ዝማኔ"</string>
     <string name="model_info" msgid="8997566254717810904">"ሞዴል"</string>
-    <string name="model_summary" msgid="2246651782442466213">"ሞዴል፦ %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"ሞዴል እና ሃርድዌር"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"የሃርድዌር ስሪት"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"የመሣሪያ መታወቂያ"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"የአውታረ መረብ ቅንብሮች ዳግም ጀምረዋል።"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"ሲሞችን መደምሰስ አይቻልም"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"የወረዱ ሲሞች በስህተት ምክንያት ሊሰረዙ አይችሉም።\n\nየእርስዎን መሣሪያ ዳግም ያስጀምሩ እና እንደገና ይሞክሩ።"</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"ሁሉንም ውሂብ ደምስስ (የፋብሪካ ዳግም ማስጀመር)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"ሁሉንም ውሂብ ደምስስ (የፋብሪካ ዳግም ማስጀመር)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"ይህ የሚከተሉትንም ጨምሮ ሁሉንም ውሂብ ከእርስዎ ጡባዊ "<b>"ውስጣዊ ማከማቻ"</b>" ይሰርዛል፦\n\n"<li>"የእርስዎ Google መለያ"</li>\n<li>"የሥርዓት እና መተግበሪያ ውሂብ እና ቅንብሮች"</li>\n<li>"የወረዱ መተግበሪያዎች"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"ይሄ የሚከተሉትንም ጨምሮ ሁሉንም ውሂብ ከስልክዎ "<b>"ውስጣዊ ማከማቻ"</b>" ይደመስሰዋል፦\n\n"<li>"የእርስዎ Google መለያ"</li>\n<li>"የስርዓት እና መተግበሪያ ውሂብና ቅንብሮች"</li>\n<li>"የወረዱ መተግበሪያዎች"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n" እርስዎ በአሁን ጊዜ የሚከተለው መለያዎች ውስጥ ገብተዋል፡\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"በዚህ መሣሪያ ላይ ያሉ ሌሎች ተጠቃሚዎች አሉ።\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"ሙዚቃ"</li>\n<li>"ፎቶዎች"</li>\n<li>"ሌላ የተጠቃሚ ውሂብ"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIMዎች"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"ይሄ የተንቀሳቃሽ ስልክ አገልግሎት እቅድዎን አይሰርዘውም።"</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">"ሙዚቃ፣ ምስሎች፣ እና ሌላ ተጠቃሚ ውሂብ \n\nለማጥራት፣"<b>"USBማከማቻ"</b>" መጥፋት ያስፈልገዋል።"</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n" ሙዚቃ፣ ምስሎች፣ እና ሌላ ተጠቃሚ ውሂብ ለማጥራት፣"<b>" የSD ካርድ "</b>"መጥፋት ያስፈልገዋል።"</string>
+    <string name="main_clear_title" msgid="277664302144837723">"ሁሉንም ውሂብ ደምስስ (የፋብሪካ ዳግም ማስጀመር)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"ሁሉንም ውሂብ ደምስስ (የፋብሪካ ዳግም ማስጀመር)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"ይህ የሚከተሉትንም ጨምሮ ሁሉንም ውሂብ ከእርስዎ ጡባዊ "<b>"ውስጣዊ ማከማቻ"</b>" ይሰርዛል፦\n\n"<li>"የእርስዎ Google መለያ"</li>\n<li>"የሥርዓት እና መተግበሪያ ውሂብ እና ቅንብሮች"</li>\n<li>"የወረዱ መተግበሪያዎች"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"ይሄ የሚከተሉትንም ጨምሮ ሁሉንም ውሂብ ከስልክዎ "<b>"ውስጣዊ ማከማቻ"</b>" ይደመስሰዋል፦\n\n"<li>"የእርስዎ Google መለያ"</li>\n<li>"የስርዓት እና መተግበሪያ ውሂብና ቅንብሮች"</li>\n<li>"የወረዱ መተግበሪያዎች"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"እርስዎ በአሁኑ ጊዜ ውደሚከተሉት መለያዎች ገብተዋል፦\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"በዚህ መሣሪያ ላይ ያሉ ሌሎች ተጠቃሚዎች አሉ።\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"ሙዚቃ"</li>\n<li>"ፎቶዎች"</li>\n<li>"ሌላ የተጠቃሚ ውሂብ"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIMዎች"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"ይህ የተንቀሳቃሽ ስልክ አገልግሎት እቅድዎን አይሰርዘውም።"</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">"ሙዚቃ፣ ምስሎች እና ሌላ ተጠቃሚ ውሂብን \n\nለማጥራት "<b>"የዩኤስቢ ማከማቻ"</b>" መደምሰስ አለበት።"</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n" ሙዚቃ፣ ምስሎች እና ሌላ የተጠቃሚ ውሂብን ለማጥፋት"<b>" የኤስዲ ካርድ "</b>" መደምሰስ አለበት።"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USB ማከማቻ አጥፋ"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"የSD ካርድ አጥፋ"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"እንደ ሙዚቃ እና ፎቶዎች፣ ሁሉንም ውሂብ በውስጥ USB ማከማቻ አጥፋ።"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"እንደ ሙዚቃ እና ፎቶዎች፣ ሁሉንም ውሂብ በSD ካርድ ላይ አጥፋ።"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"ሁሉንም ውሂብ ደምስስ"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"ሁሉንም ውሂብ ደምስስ"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"ሁሉም የግል መረጃዎ እና የወረዱ መተግበሪያዎችዎ ይሰረዛሉ። ይህን ተግባር መቀልበስ አይችሉም።"</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"የወረዱ መተግበሪያዎች እና ሲሞችን ጨምሮ ሁሉም የግል መረጃዎ ይሰረዛሉ። ይህን ተግባር መቀልበስ አይችሉም።"</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"ሁሉንም አጥፋ"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"የስርዓቱ አገልግሎት አጽዳ ስላልተገኘ ዳግም ለማስጀመር ምንም አልተከናወነም።"</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"ሁሉም ውሂብ ይደምሰስ?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"የፋብሪካ ዳግም ማስጀመር ለዚህ ተጠቃሚ አይገኝም"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"በማጥፋት ላይ"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"እባክዎ ይጠብቁ..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"ሁሉንም ውሂብ ደምስስ"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"ሁሉንም ውሂብ ደምስስ"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"ሁሉም የእርስዎ የግል መረጃ እና የወረዱ መተግበሪያዎች ይሰረዛሉ። ይህን ተግባር መቀልበስ አይችሉም።"</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"የወረዱ መተግበሪያዎች እና ሲሞችን ጨምሮ ሁሉም የግል መረጃዎ ይሰረዛሉ። ይህን ተግባር መቀልበስ አይችሉም።"</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"ሁሉም ውሂብ ይደምሰስ?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"የፋብሪካ ዳግም ማስጀመር ለዚህ ተጠቃሚ አይገኝም"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"በመደምሰስ ላይ"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"እባክዎ ይጠብቁ…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"የጥሪ ቅንብሮች"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"የድምፅመልዕክት፣ የጥሪ ማስተላለፊያ፣መስመር ላይ ቆይ፣ የደዋይ ID አዋቅር"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB መሰካት"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"ከ<xliff:g id="MAXCONNECTION">%1$d</xliff:g> መሣሪያዎች በላይ ማገናኘት አይቻልም።"</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> አይያያዝም።"</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"የኢተርኔት ማስተሳሰር"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"የስልክ በይነመረብ ግንኙነትን በዩኤስቢ ኢተርኔት በኩል አጋራ"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"የስልክ በይነመረብ ግንኙነትን በዩኤስቢ ኢተርኔት በኩል አጋራ"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"በእርስዎ የተንቀሳቃሽ ስልክ ውሂብ ግንኙነት በኩል በይነመረቡ ለሌሎች መሣሪያዎች ለማቅረብ የመገናኛ ነጥብን እና እንደ ሞደም መሰካትን ይጠቀሙ። መተግበሪያዎች በአቅራቢያ ላሉ መሣሪያዎች ይዘትን ለማጋራት መገናኛ ነጥብን ሊፈጥሩ ይችላሉ።"</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"በእርስዎ Wi-Fi ወይም የተንቀሳቃሽ ስልክ ውሂብ ግንኙነት በኩል በይነመረቡ ለሌሎች መሣሪያዎች ለማቅረብ የመገናኛ ነጥብን እና እንደ ሞደም መሰካትን ይጠቀሙ። መተግበሪያዎች እንዲሁም ይዘቶችን በአቅራቢያ ላሉ መሣሪያዎች ለማጋራት መገናኛ ነጥብን መፍጠር ይችላሉ።"</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"እገዛ"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"የመግለጫ ጽሑፍ ምርጫዎች"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"ማጉላት"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"የማጉያ አካባቢ"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"ማጉላትን አንቃ"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"ማያ ገጹን በሚያጎሉበት ጊዜ መጠቀም የሚፈልጉትን(ዋቸውን) የማጉያ አካባቢ(ዎች) ይምረጡ"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"ሙሉ ማያ ገጽ"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"የማያ ገጽ ክፍል"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"ሙሉ ማያ ገጽ እና የማያ ገጽ ክፍል"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"ሙሉውን ማያ ገጽ አጉላ"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"የማያ ገጹን ክፍል አጉላ"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"ወደ የተደራሽነት አዝራር ይቀየር?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"የማያ ገጹን የተወሰነ ክፍል ለማጉላት ሶስት ጊዜ መታ ማድረግ መተየብ እና ሌሎች እርምጃዎች እንዲዘገዩ ያደርጋል።\n\nለማጉላት የተደራሽነት አዝራርን ወደ መጠቀም መቀየር ይፈልጋሉ?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"ወደ የተደራሽነት አዝራር ይቀይሩ"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"ለማጉላት ሶስት ጊዜ መታ ማድረግን ያቆዩት"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"የማጉያ ቅንብሮች"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"ሶስቴ መታ በማድረግ ያጉሉ"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"በአቋራጭ ያጉሉ"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"የኃይል አዘራር ጥሪውን ይዘገዋል"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"ትልቅ የመዳፊት ጠቋሚ"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"እነማዎችን ያስወግዱ"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"ሞኖ ኦዲዮ"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"ኦዲዮ ሲያጫውቱ ሰርጦችን ያጣምሩ"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"የኦዲዮ ሚዛን"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"ግራ"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"ቀኝ"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"ሞኖ ኦዲዮ"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"ኦዲዮ ሲያጫውቱ ሰርጦችን ያጣምሩ"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"የኦዲዮ ሚዛን"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"ግራ"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"ቀኝ"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"ነባሪ"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 ሰከንዶች"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 ሰከንዶች"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"የማሳወቂያ ንዝረት"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"የጥሪ ንዝረት"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"የንክኪ ግብረመልስ"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ን ይጠቀሙ"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>ን ክፈት"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"የቀለም ማስተካከያን ተጠቀም"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"መግለጫ ጽሑፎችን አሳይ"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"ለሚደገፍ መተግበሪያ ብቻ"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>ን ይጠቀሙ"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>ን ክፈት"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"የቀለም ማስተካከያን ተጠቀም"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"መግለጫ ጽሑፎችን አሳይ"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"ለሚደገፍ መተግበሪያ ብቻ"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"የመግለጫ ጽሑፍ መጠን እና ቅጥ"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> የጽሑፍ መጠን"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"ተጨማሪ አማራጮች"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"ዲውተራኖማሊ"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"ፕሮታኖማሊ"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"ትራይታኖማሊ"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"ግርጥነት"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"ቀይ-አረንጓዴ"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"ቀይ-አረንጓዴ"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"ሰማያዊ-ቢጫ"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"የዳራ ገደብ"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"መተግበሪያው በበስተጀርባ እንዲሄድ ይፍቀዱለት።"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"መተግበሪያው በጀርባ ውስጥ እንዲያሄድ አይፈቀድለትም"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"የዳራ አጠቃቀም ሊገደብ አይችልም"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"የበስተጀርባ አጠቃቀም ሊገደብ አይችልም"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"የጀርባ እንቅስቃሴ ይገደብ?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"የአንድ መተግበሪያ የጀርባ እንቅስቃሴን ከገደቡ ያልተገባ ባህሪ ሊያሳይ ይችላል"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"ይህ መተግበሪያ ባትሪን ለማላቅ አልተቀናበረም፣ ሊገድቡት አይችሉም።\n\nመተግበሪያውን ለመገደብ፣ የባትሪ ማላቅን በመጀመሪያ ያብሩ።"</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"መርሐግብር ያቀናብሩ"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"የባትሪ ዕድሜን አራዝም"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"ኃይል ሲሞላ አጥፋ"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"ባትሪ ቆጣቢ የእርስዎ ስልክ በ <xliff:g id="PERCENT">%1$s</xliff:g> ላይ ሲሆን ይጠፋል"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"ባትሪ ቆጣቢ የእርስዎ ጡባዊ በ <xliff:g id="PERCENT">%1$s</xliff:g> ላይ ሲሆን ይጠፋል"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"ባትሪ ቆጣቢ የእርስዎ መሣሪያ በ <xliff:g id="PERCENT">%1$s</xliff:g> ላይ ሲሆን ይጠፋል"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"የእርስዎ ስልክ ከ<xliff:g id="PERCENT">%1$s</xliff:g> በላይ ሲሞላ ባሪ ቆጣቢ ይጠፋል"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"የእርስዎ ጡባዊ ከ<xliff:g id="PERCENT">%1$s</xliff:g> በላይ ሲሞላ ባሪ ቆጣቢ ይጠፋል"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"የእርስዎ መሣሪያ ከ<xliff:g id="PERCENT">%1$s</xliff:g> በላይ ሲሞላ ባሪ ቆጣቢ ይጠፋል"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"አብራ"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"ዳግም አስጀምር"</string>
     <string name="tts_play" msgid="2945513377250757221">"አጫውት"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"ተለማማጅ ግንኙነት"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"የአውታረ መረብ ግንኙነቶችዎን በራስ-ሰር በማስተዳደር የባትሪ ዕድሜን ያራዝማል እንዲሁም የመሣሪያ አፈፃፀምን ያሻሽላል"</string>
     <string name="credentials_title" msgid="7535942196886123656">"መረጃ ማከማቻ"</string>
     <string name="credentials_install" msgid="3933218407598415827">"የእውቅና ማረጋገጫ ይጫኑ"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"ከማከማቻ ምስክሮች ጫን"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"የተጠቃሚ ምስክርነቶች"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"የተከማቹ ምስክርነቶችን ይመልከቱ እና ያሻሽሉ"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"ከፍተኛ"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"የማከማቻ አይነት"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"በሃርድዌር የተደገፈ"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"ሶፍትዌር ብቻ"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"ምስክርነቶች ለዚህ ተጠቃሚ አይገኙም"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"ለVPN እና መተግበሪያዎች ተጭኗል"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"ለWi-Fi ተጭኗል"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"ተርሚናል ላይ መክፈል"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"አንድ የክፍያ መተግበሪያ ያቀናብሩ። ከዚያም የስልክዎን ጀርባ ንክኪ-አልባ ምልክቱ ካለው ማንኛውም ተርሚናል ጋር ያቁሙት።"</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"ገባኝ"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"ተጨማሪ..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"ተጨማሪ…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"ነባሪ የክፍያ መተግበሪያ ያቀናብሩ"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"ነባሪ የክፍያ መተግበሪያ ያዘምኑ"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"ንክኪ-አልባ ተርሚናሉ ላይ በ<xliff:g id="APP">%1$s</xliff:g> ይክፈሉ"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"ለጥሪዎች ሁልጊዜ ይህንን ተጠቀም"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"ለውሂብ ሲም ይምረጡ"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"ለኤስኤምኤስ ሲም ይምረጡ"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"የውሂብ ሲም በመቀየር ላይ፣ ይሄ እስከ አንድ ደቂቃ ድረስ ሊወስድ ይችላል..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"የውሂብ ሲም በመቀየር ላይ፣ ይህ እስከ አንድ ደቂቃ ድረስ ሊወስድ ይችላል…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"ይደውሉ ከዚህ ጋር"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"ሲም ካርድ ይምረጡ"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"ሲም <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"ዕለታዊ ተግባር፣ መርሐግብር፣ ባትሪ ቆጣቢ፣ ኃይል ቆጣቢ፣ ባትሪ፣ ራስ-ሰር፣ በመቶ"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"ቮልት፣ የላቀ ጥሪ አደራረግ፣ 4g ጥሪ አደራረግ"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"ቋንቋ ያክሉ፣ አንድ ቋንቋ ያክሉ"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"የጽሁፍ መጠን"</string>
     <string name="default_sound" msgid="6604374495015245195">"ነባሪ ድምፅ"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"የጥሪ ድምጽ እና ማሳወቂያ ድምጽ መጠን <xliff:g id="PERCENTAGE">%1$s</xliff:g> ላይ"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"ድምፅ፣ ንዝረት፣ አትረብሽ"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"ድምፆችን ያብሩ"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"የቀጥታ ስርጭት መግለጫ ጽሑፍ"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"ራስሰር የሥዕል መግለጫ ጽሑፍን ሚዲያ"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"ምንም"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> መርሐግብሮች ተቀናብረዋል</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> መርሐግብሮች ተቀናብረዋል</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{ምንም}=1{1 መርሐግብር ተቀናብሯል}one{# መርሐግብሮች ተቀናብረዋል}other{# መርሐግብሮች ተቀናብረዋል}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"አይረብሹ"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"በአስፈላጊ ሰዎች እና መተግበሪያዎች ብቻ ማሳወቂያን ያግኙ"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"መቆራረጦችን ይገድቡ"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"ቅድሚያ የሚሰጠው ብቻ"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>። <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"በርቷል / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"ጠፍቷል / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"አጥፋ"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"አብራ"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"ሁልጊዜ ጠይቅ"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"እስኪያጠፉት ድረስ"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> ሰዓቶች</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> ሰዓቶች</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> ደቂቃዎች"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> መርሐ ግብሮች በራስ ሰር ሊበሩ ይችላሉ</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> መርሐ ግብሮች በራስ ሰር ሊበሩ ይችላሉ</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 ሰዓት}one{# ሰዓቶች}other{# ሰዓቶች}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 ደቂቃ}one{# ደቂቃዎች}other{# ደቂቃዎች}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{ጠፍቷል}=1{ጠፍቷል / 1 መርሐግብር በራስ-ሰር ሊበራ ይችላል}one{ጠፍቷል / # መርሐግብሮች በራስ-ሰር ሊበሩ ይችላሉ}other{ጠፍቷል / # መርሐግብሮች በራስ-ሰር ሊበሩ ይችላሉ}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"አትረብሽን ምን ሊያቋርጠው ይችላል"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"ሰዎች"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"መተግበሪያዎች"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"ዝቅተኛ ቅድሚያ ተሰጪ ማሳወቂያዎችን ወደ ተረጋጋ በራስ ሰር አቀናብር"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"ተስማሚ ማሳወቂያ ደረጃ አሰጣጥ"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"በተዛማጅነት ማሳወቂያዎችን በራስሰር ደረጃ ስጥ"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"ራስ-አስማሚ የማሳወቂያ ግብረመልስ"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"በማስታወቂያዎች ላይ የተደረጉ ማስተካከያዎችን ያመልክቱ እና ለስርዓቱ ግብረመልስ ለመስጠት አማራጩን ያሳዩ"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"በጥቆማ የቀረቡ እርምጃዎች እና ምላሾች"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"በጥቆማ የቀረቡ እርምጃዎችን እና ምላሾችን በራስሰር አሳይ"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"የቅርብ ጊዜ እና ያሸለቡ ማሳወቂያዎችን አሳይ"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"የአትረብሽ መዳረሻ"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"አትረብሽን ፍቀድ"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"ምንም የተጫኑ መተግበሪያዎች የተጠየቀው አትረብሽ መዳረሻ የላቸውም"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"መተግበሪያዎችን በመጫን ላይ..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"መተግበሪያዎችን በመጫን ላይ…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"በጥያቄዎ መሠረት Android የዚህ መተግበሪያ ማሳወቂያዎች በዚህ መሣሪያ ላይ እንዳይታዩ እያገደ ነው"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"በጥያቄዎ መሠረት Android ይህ የማሳወቂያዎች ምድብ በዚህ መሣሪያ ላይ እንዳይታይ እያገደ ነው"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"በጥያቄዎ መሠረት Android ይህን የማሳወቂያዎች ስብስብ በዚህ መሣሪያ ላይ እንዳይታይ እያገደ ነው"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"ሁሉም ውይይቶች"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"የቅድሚያ ውይይቶች"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"ምንም"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> ውይይቶች</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> ውይይቶች</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"ምንም"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{ምንም}=1{1 ውይይት}one{# ውይይቶች}other{# ውይይቶች}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"ማን አቋርጦ መግባት ይችላል"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"ጥሪዎች"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"ጥሪዎች"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"የተፈቀደላቸው ጥሪዎች ድምጽ የሚያሰሙ መሆናቸውን ለማረጋገጥ መሣሪያው ወደ መደወል መቀናበሩን ይፈትሹ።"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"ለ ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ ገቢ ጥሪዎች ታግደዋል። የእርስዎ ጓደኛዎች፣ ቤተሰብ ወይም ሌሎች እውቂያዎች እርስዎን ማግኘት እንዲችሉ ቅንብሮችን ማስተካከል ይችላሉ።"</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"ባለኮከብ ዕውቂያዎች"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one"><xliff:g id="NUM_PEOPLE">%d</xliff:g> ሌሎች</item>
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> ሌሎች</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"ምንም"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{ምንም}=1{{contact_1}}=2{{contact_1} እና {contact_2}}=3{{contact_1}፣ {contact_2} እና {contact_3}}one{{contact_1}፣ {contact_2} እና # ሌሎች}other{{contact_1}፣ {contact_2} እና # ሌሎች}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"መልዕክቶች"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"መልዕክቶች"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"መልዕክቶች"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"ለ«<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>» ገቢ መልዕክቶች ይታገዳሉ። የእርስዎ ጓደኛዎች፣ ቤተሰብ ወይም ሌሎች እውቂያዎች እርስዎን ማግኘት እንዲችሉ ቅንብሮችን ማስተካከል ይችላሉ።"</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"ሁሉም መልዕክቶች እርስዎን መድረስ ይችላሉ"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"ሁሉም ጥሪዎች እርስዎን መድረስ ይችላሉ"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"ምንም"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> እውቂያዎች</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> እውቂያዎች</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{ምንም}=1{1 እውቂያ}one{# እውቂያዎች}other{# እውቂያዎች}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"ማንኛውም ሰው"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"እውቂያዎች"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"ባለኮከብ ዕውቂያዎች"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"ሁሉም ማሳወቂያዎች"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"አንዳንድ ማሳወቂያዎች"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"የተመረጡ ሰዎች አሁንም እርስዎን መድረስ ይችላሉ፣ መተግበሪያዎች እንዲያቋርጡ ባይፈቅዱም እንኳ"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one"><xliff:g id="APP_NAMES">%s</xliff:g> ማቋረጥ ይችላሉ</item>
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> ማቋረጥ ይችላሉ</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> ተጨማሪ"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{ምንም መተግበሪያዎች ማቋረጥ አይችሉም}=1{{app_1} ማቋረጥ ይችላል}=2{{app_1} እና {app_2} ማቋረጥ ይችላሉ}=3{{app_1}፣ {app_2} እና {app_3} ማቋረጥ ይችላሉ}one{{app_1}፣ {app_2} እና # ተጨማሪ ማቋረጥ ይችላሉ}other{{app_1}፣ {app_2} እና # ተጨማሪ ማቋረጥ ይችላሉ}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"መተግበሪያዎች"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"ሁሉም ማሳወቂያዎች"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"አንዳንድ ማሳወቂያዎች"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"ማሳወቂያዎች ማቋረጥ ይችላሉ"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"ሁሉንም ማሳወቂያዎች ፍቀድ"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> ማቋረጥ ይችላሉ</item>
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> ማቋረጥ ይችላሉ</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"ምንም ማቋረጥ አይችልም"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> ተጨማሪ"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{ምንም ማቋረጥ አይችልም}=1{{sound_category_1} ማቋረጥ ይችላል}=2{{sound_category_1} እና {sound_category_2} ማቋረጥ ይችላሉ}=3{{sound_category_1}፣ {sound_category_2} እና {sound_category_3} ማቋረጥ ይችላሉ}one{{sound_category_1}፣ {sound_category_2} እና # ተጨማሪ ማቋረጥ ይችላሉ}other{{sound_category_1}፣ {sound_category_2} እና # ተጨማሪ ማቋረጥ ይችላሉ}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"ምንም ማቋረጥ አይችልም"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"ማንም ማቋረጥ አይችልም"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"አንዳንድ ሰዎች ማቋረጥ ይችላሉ"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"ሁሉም ሰዎች ማቋረጥ ይችላሉ"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"ዩኤስቢ በሚከተለው ቁጥጥር ይደረግበታል፦"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"የተገናኘ መሣሪያ"</string>
     <string name="usb_control_device" msgid="527916783743021577">"ይህ መሣሪያ"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"በመቀየር ላይ…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"በመቀየር ላይ…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"መቀየር አልተቻለም"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"የዚህን መሣሪያ ኃይል በመሙላት ላይ"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"የተገናኘ መሣሪያ ኃይል በመሙላት ላይ"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"ዝርዝሮችን አሳይ"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"ውሂብ ቆጣቢ"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"ያልተገደበ ውሂብ"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"የዳራ ውሂብ ጠፍቷል"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"የበስተጀርባ ውሂብ ጠፍቷል"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"በርቷል"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"ጠፍቷል"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"የውሂብ ቆጣቢን ይጠቀሙ"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"መሣሪያው ከተቆለፈ በማሳወቂያዎች ውስጥ ምላሾችን ወይም ሌላ ጽሑፍን መተየብ ከልክል"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"ነባሪ ፊደል አራሚ"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"ፊደል አራሚን ይምረጡ"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"ፊደል አራሚን ይጠቀሙ"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"ፊደል አራሚን ተጠቀም"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"አልተመረጠም"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(ባዶ)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">"፦ "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"የማከማቻ ባዶ ቦታን ነጻ ለማድረግ እንዲያግዝ የማከማቻ አስተዳዳሪ ከእርስዎ መሣሪያ ላይ በምትኬት የተቀመጡ ፎቶዎችን እና ቪዲዮዎችን አስወግዷል።"</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"ፎቶዎች እና ቪዲዮዎች አስወግድ"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"የማከማቻ አስተዳዳሪ"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"የማከማቻ አስተዳዳሪን ተጠቀም"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"የማከማቻ አስተዳዳሪን ተጠቀም"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"ራስ-ሰር"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"በራስ"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"አሁኑኑ ባዶ ቦታ ያስለቅቁ"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"ስልኩን ለመመልከት ሁለቴ መታ ያድርጉ"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"ጡባዊውን ለመመልከት ሁለቴ መታ ያድርጉ"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"መሣሪያውን ለመመልከት ሁለቴ መታ ያድርጉ"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"ለማስታወቂያዎች በጣት ይጥረጉ"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"ማስታወቂያዎችዎን ለማሳየት በማያው ግርጌ ላይ ወደ ታች ያንሸራትቱ"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"የአንድ እጅ ሁነታ"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"የአንድ እጅ ሁነታን ይጠቀሙ"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"መተግበሪያዎችን ሲቀይሩ ይውጡ"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"ጊዜው አልቋል"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 ሰከንዶች"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 ሰከንዶች"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 ሰከንዶች"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"ተደራሽነት"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"ጊዜን፣ ማሳወቂያዎችን እና ሌላ መረጃን ለማረጋገጥ የእርስዎን ማያ ገጽ ሁለት ጊዜ መታ ያድርጉት።"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"ስልኩን ለማረጋገጥ ያንሱ"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"ጡባዊውን ለማረጋገጥ ያንሱ"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"ጡባዊ ላይ ምልክት ያድርጉ"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"መሣሪያ ላይ ምልክት ያድርጉ"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"ጊዜን፣ ማሳወቂያዎችን እና ሌላ መረጃን ለማረጋገጥ የእርስዎን ማያ ገጽ መታ ያድርጉት።"</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"የቀውስ አዝራር"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"የኃይል አዝራሩን 5 ጊዜ በፍጥነት በመጫን የድንገተኛ አደጋ ኤስኦኤስ እርምጃዎችን ያስጀምሩ።"</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"የማስጠንቀቂያ ድምጽ"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"እርምጃዎቹን ከመጀመር በፊት ማንቂያ"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"የአደጋ ጊዜ እውቂያዎች"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"ማሳወቂያዎችን ለማግኘት የጣት አሻራን ያንሸራትቱ"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"የጣት አሻራን ያንሸራቱ"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"የእርስዎን ማሳወቂያዎች ለመመልከት በስልክዎ ጀርባ ላይ ባለው የጣት አሻራ ዳሳሽ ላይ ወደ ታች ጠረግ ያድርጉት"</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"ለሁሉም መተግበሪያዎች አንቃ"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"የግራፊክስ ነጂ ይምረጡ"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"ነባሪ"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"የጨዋታ ነጂ"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"የጨዋታ ነጂ"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"የገንቢ ነጂ"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"የሥርዓት ግራፊክስ ነጂ"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"አውታረ መረቦችን ማግኘት አልተቻለም። እንደገና ይሞክሩ።"</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(የተከለከለ)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"ምንም ሲም ካርድ የለም"</string>
+    <string name="sim_card" msgid="6381158752066377709">"ሲም"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"ምንም SIM የለም"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"ምንም"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"ለመገናኘት ሲም ያስፈልገዋል"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"ለመገናኘት የ<xliff:g id="WIRELESS_CARRIER">%s</xliff:g> ሲም ያስፈልገዋል"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"ተመራጭ የአውታረ መረብ፦ WCDMA ሁነታ ተመራጭ"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"ተመራጭ የአውታረ መረብ፦ GSM ብቻ"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"ተመራጭ የአውታረ መረብ፦ WCDMA ብቻ"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"የተንቀሳቃሽ ስልክ ውሂብ"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"የተንቀሳቃሽ ስልክ አውታረ መረብን በመጠቀም ውሂብን ይድረሱበት"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"በክልል ውስጥ በሚሆንበት ጊዜ ስልክ በራስ ሰር ወደዚህ የአገልግሎት አቅራቢ ይቀይራል"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"ምንም ሲም ካርድ አይገኝም"</string>
     <string name="calls_preference" msgid="2166481296066890129">"የጥሪዎች ምርጫ"</string>
     <string name="sms_preference" msgid="7742964962568219351">"የኤስኤምኤስ ምርጫ"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"ሁልጊዜ ጠይቅ"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"በቅንብሮች ላይ የማያ ገጽ ተደራቢዎችን ይፍቀዱ"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"የቅንብሮች ማያ ገጾችን ለመደራረብ በሌሎች መተግበሪያዎች ላይ የሚያሳዩ መተግበሪያዎችን ይፍቀዱ"</string>
     <string name="media_controls_title" msgid="403271085636252597">"ሚዲያ"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"የሚዲያ ክፍለ-ጊዜ ሲያልቅ ተጫዋችን ደብቅ"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"አጫዋቹ ከተዘረጋው የፈጣን ቅንብሮች ፓነል አንድ ክፍለ-ጊዜ ከቆመበት እንዲቀጥሉ ይፈቅድልዎታል።"</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"በፍጥነት ቅንብሮች ውስጥ Media Player"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"መልሶ ማጫወትን በቀላሉ ከቆመበት መቀጠል Media Playerን ለተጨማሪ ጊዜ ያሳዩ"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"ተጫዋች ደብቅ"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"ተጫዋች አሳይ"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"ምንም ተጫዋቾች አይገኙም"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"የተፈቀደላቸው መተግበሪያዎች"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"ሚዲያ"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"ብሉቱዝ ይበራል"</string>
 </resources>
diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
index 4218a24..93eb649 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"متوسطة"</item>
     <item msgid="6740026006576843477">"طويلة"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"قصيرة"</item>
+    <item msgid="7397961711906421599">"متوسطة"</item>
+    <item msgid="4079132024502041928">"طويلة"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"تلقائي"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"عام"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"‏TDSCDMA فقط"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"عام"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 5847a1e..ec0f60e 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -243,7 +243,7 @@
     <string name="settings_label" msgid="943294133671632976">"الإعدادات"</string>
     <string name="settings_label_launcher" msgid="820982375501978609">"الإعدادات"</string>
     <string name="settings_shortcut" msgid="8548239727871847171">"اختصار الإعدادات"</string>
-    <string name="airplane_mode" msgid="3196085857882526817">"وضع الطائرة"</string>
+    <string name="airplane_mode" msgid="3196085857882526817">"وضع الطيران"</string>
     <string name="wireless_networks_settings_title" msgid="8557542379234105369">"اللاسلكي والشبكات"</string>
     <string name="radio_controls_summary" msgid="9028430178697624501">"‏إدارة Wi-Fi والبلوتوث ووضع الطائرة وشبكات الجوّال والشبكات الافتراضية الخاصة (VPN)"</string>
     <string name="cellular_data_summary" msgid="6551434804367912367">"السماح باستخدام البيانات عبر شبكة الجوال"</string>
@@ -304,7 +304,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"إظهار معلومات الملف الشخصي في شاشة القفل"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"الحسابات"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"الموقع الجغرافي"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"استخدام الموقع الجغرافي"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"استخدام الموقع الجغرافي"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"خدمة الموقع الجغرافي غير مفعّلة."</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="zero">خدمة \"الموقع الجغرافي\" مفعَّلة - يمتلك <xliff:g id="COUNT_1">%1$d</xliff:g> تطبيق حق الوصول إلى بيانات الموقع الجغرافي.</item>
@@ -341,6 +341,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"استخدام وجهك للمصادقة"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"بدء"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"‏إذا تم إيقاف ميزة \"فتح القفل بالوجه\" السهلة الاستخدام، قد لا تعمل بعض خطوات الإعداد بشكل سليم باستخدام TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"رجوع"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"مواصلة الإعداد"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"استخدام إعدادات \"سهولة الاستخدام\""</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -651,7 +654,6 @@
       <item quantity="one">يجب ألا يزيد رقم التعريف الشخصي عن رقم واحد (<xliff:g id="NUMBER_0">%d</xliff:g>).</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"لا يسمح مشرف الجهاز باستخدام رقم تعريف شخصي تم استخدامه مؤخرًا"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"حظرَ مشرف تكنولوجيا المعلومات استخدام أرقام التعريف الشخصية الشائعة. جرِّب استخدام رقم تعريف شخصي مختلف."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"لا يجب أن تتضمن كلمة المرور حرفًا غير صالح."</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"يجب أن تحتوي كلمة المرور على حرف واحد على الأقل."</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"يجب أن تحتوي كلمة المرور على رقم واحد على الأقل."</string>
@@ -713,7 +715,6 @@
       <item quantity="one">يجب أن تحتوي كلمة المرور على حرف أبجدي واحد على الأقل.</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"لا يسمح مشرف الجهاز باستخدام كلمة مرور تم استخدامها مؤخرًا"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"حظرَ مشرف تكنولوجيا المعلومات استخدام كلمات المرور الشائعة. جرِّب استخدام كلمة مرور مختلفة."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"غير مسموح باستخدام الترتيب التصاعدي أو التنازلي أو المكرر للأرقام"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"تأكيد"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"إلغاء"</string>
@@ -863,7 +864,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"‏تفعيل شبكة Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"‏استخدام Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"‏استخدام Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"‏إعدادات Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"إعداد وإدارة نقاط الدخول اللاسلكية"</string>
@@ -872,7 +873,7 @@
     <string name="wifi_stopping" msgid="4471699665741299711">"‏إيقاف Wi-Fi…"</string>
     <string name="wifi_error" msgid="4903954145386086899">"خطأ"</string>
     <string name="wifi_sap_no_channel_error" msgid="2126487622024749402">"لا يتوفر التردد ٥ غيغاهرتز في هذا البلد"</string>
-    <string name="wifi_in_airplane_mode" msgid="1235412508135267981">"في وضع الطائرة"</string>
+    <string name="wifi_in_airplane_mode" msgid="1235412508135267981">"في وضع الطيران"</string>
     <string name="wifi_notify_open_networks" msgid="2610323626246818961">"إشعاري بالشبكات العامة"</string>
     <string name="wifi_notify_open_networks_summary" msgid="191058832201741013">"الإشعار عند توفر شبكة عامة عالية الجودة"</string>
     <string name="wifi_wakeup" msgid="3834327315861781611">"‏تفعيل اتّصال Wi‑Fi تلقائيًا"</string>
@@ -971,7 +972,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"توسيط رمز الاستجابة السريعة أدناه للربط بالمعرِّف \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"‏يمكنك الانضمام إلى شبكة Wi‑Fi عن طريق مسح رمز الاستجابة السريعة."</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"‏مشاركة اتصال Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"يمكنك مسح رمز الاستجابة السريعة هذا ضوئيًا للاتصال بشبكة \"<xliff:g id="SSID">%1$s</xliff:g>\" ومشاركة كلمة المرور."</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"يمكنك مسح رمز الاستجابة السريعة هذا ضوئيًا باستخدام جهاز آخر للانضمام إلى \"<xliff:g id="SSID">%1$s</xliff:g>\"."</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"يمكنك مسح رمز الاستجابة السريعة ضوئيًا للاتصال بشبكة \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"يُرجى إعادة المحاولة. وإذا استمرّت المشكلة، عليك الاتصال بالشركة المصنِّعة للجهاز."</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"حدث خطأ."</string>
@@ -997,8 +998,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"‏كلمة مرور Wi-Fi هي:  <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"كلمة مرور نقطة الاتصال: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"اتصال تلقائي"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"السماح للهاتف بالاتصال بالإنترنت تلقائيًا بالقرب من هذه الشبكة"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"السماح للجهاز اللوحي بالاتصال بالإنترنت تلقائيًا بالقرب من هذه الشبكة"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"السماح بالاتصال بهذه الشبكة عندما تكون في نطاقها"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"إضافة جهاز"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"استخدِم رمز استجابة سريعة لإضافة جهاز إلى هذه الشبكة."</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"تنسيق رمز الاستجابة السريعة غير صالح."</string>
@@ -1010,7 +1010,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"استخدام شهادات النظام"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"عدم التوفير"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"عدم التحقق"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"لم يتم تحديد أي شهادات. لن يكون اتصالك خاصًا."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"اسم الشبكة طويل جدًا."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"يجب تحديد نطاق."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"يجب تقديم شهادة."</string>
@@ -1037,6 +1036,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"اتصال"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"‏تم تفعيل Wi‑Fi."</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"متّصل بـ <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"جارٍ الربط بـ <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"جارٍ الاتصال…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"تعذّر التوصيل بالشبكة"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"الشبكة ليست في النطاق."</string>
@@ -1120,7 +1120,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"يشارك التطبيق المحتوى. لمشاركة اتصال الإنترنت، يجب إيقاف نقطة الاتصال، ثم تفعيلها."</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"لم يتم تعيين كلمة مرور"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"اسم نقطة الاتصال"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"جارٍ تفعيل <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"جارٍ تفعيل <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"يمكن توصيل الأجهزة الأخرى بشبكة <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"كلمة مرور نقطة الاتصال"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"نطاق نقطة الوصول"</string>
@@ -1270,7 +1270,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"العرض السلس"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"تعمل هذه الميزة على رفع معدل إعادة التحميل تلقائيًا من 60 إلى 90 هرتز لبعض أنواع المحتوى، ما يؤدي إلى زيادة استخدام البطارية."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"العرض السلس"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"فرض معدل إعادة تحميل بمقدار 90 هرتز"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"أعلى معدل إعادة تحميل لتحسين استجابة اللمس وجودة الصور المتحركة. يؤدي هذا إلى زيادة استخدام البطارية."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"استعراض الشاشة"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"تفعيل / لن يتم إيقاف الشاشة إذا كنت تنظر إليها."</string>
@@ -1413,7 +1413,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"‏إصدار Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"‏تحديث أمان نظام Android"</string>
     <string name="model_info" msgid="8997566254717810904">"الطراز"</string>
-    <string name="model_summary" msgid="2246651782442466213">"‏الطراز: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"الطراز والجهاز"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"إصدار الجهاز"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"معرّف الجهاز"</string>
@@ -1688,31 +1687,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"تمت إعادة ضبط إعدادات الشبكة"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"‏يتعذّر محو بيانات شرائح SIM"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"يتعذّر محو بيانات شرائح التي تم تنزيلها بسبب خطأ.\n\nيمكنك إعادة تشغيل الجهاز وإعادة المحاولة."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"محو جميع البيانات (إعادة الضبط على الإعدادات الأصلية)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"محو جميع البيانات (إعادة الضبط على الإعدادات الأصلية)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"‏سيؤدي هذا إلى محو جميع البيانات من "<b>"وحدة التخزين الداخلية"</b>" لجهازك اللوحي، بما في ذلك:\n\n"<li>"حسابك على Google"</li>\n<li>"بيانات وإعدادات النظام والتطبيقات"</li>\n<li>"التطبيقات التي تم تنزيلها"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"‏سيؤدي هذا إلى محو جميع البيانات من "<b>"وحدة التخزين الداخلية"</b>" لهاتفك، بما في ذلك:\n\n"<li>"حسابك على Google"</li>\n<li>"بيانات وإعدادات النظام والتطبيقات"</li>\n<li>"التطبيقات التي تم تنزيلها"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"الحسابات المسجَّل الدخول إليها حاليًا:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"هناك مستخدمون آخرون موجودون على هذا الجهاز.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"الموسيقى"</li>\n<li>"الصور"</li>\n<li>"بيانات المستخدم الأخرى"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727">"‏"<li>"شرائح eSIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"لن يؤدي هذا إلى إلغاء خطة خدمة الجوّال."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">"‏\n\nلمحو الموسيقى والصور وبيانات المستخدم الأخرى أيضًا، يجب محو "<b>"وحدة تخزين USB"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">"‏\n\nلمحو الموسيقى والصور وبيانات المستخدم الأخرى أيضًا، يجب محو "<b>"بطاقة SD"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"محو جميع البيانات (إعادة الضبط على الإعدادات الأصلية)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"محو جميع البيانات (إعادة الضبط على الإعدادات الأصلية)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"‏سيؤدي هذا إلى محو جميع البيانات من "<b>"وحدة التخزين الداخلية"</b>" لجهازك اللوحي، بما في ذلك:\n\n"<li>"حسابك على Google"</li>\n<li>"بيانات وإعدادات النظام والتطبيقات"</li>\n<li>"التطبيقات التي تم تنزيلها"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"‏سيؤدي هذا إلى محو جميع البيانات من "<b>"وحدة التخزين الداخلية"</b>" لهاتفك، بما في ذلك:\n\n"<li>"حسابك على Google"</li>\n<li>"بيانات وإعدادات النظام والتطبيقات"</li>\n<li>"التطبيقات التي تم تنزيلها"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"الحسابات المسجَّل الدخول إليها حاليًا:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"هناك مستخدمون آخرون موجودون على هذا الجهاز.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"الموسيقى"</li>\n<li>"الصور"</li>\n<li>"بيانات المستخدم الأخرى"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729">"‏"<li>"شرائح eSIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"لن يؤدي هذا إلى إلغاء خطة خدمة الجوّال."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">"‏\n\nلمحو الموسيقى والصور وبيانات المستخدم الأخرى أيضًا، يجب محو بيانات "<b>"وحدة تخزين USB"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">"‏\n\nلمحو الموسيقى والصور وبيانات المستخدم الأخرى أيضًا، يجب محو بيانات "<b>"بطاقة SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"‏محو وحدة تخزين USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"‏محو بطاقة SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"‏محو جميع البيانات على وحدة تخزين USB الداخلية، مثل الموسيقى أو الصور"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"‏محو جميع البيانات على بطاقة SD، مثل الموسيقى أو الصور"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"محو جميع البيانات"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"محو جميع البيانات"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"سيتم حذف جميع المعلومات الشخصية والتطبيقات التي تم تنزيلها. لا يمكنك التراجع عن هذا الإجراء."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"‏سيتم حذف جميع المعلومات الشخصية، بما في ذلك التطبيقات وشرائح SIM التي تم تنزيلها. لا يمكنك التراجع عن هذا الإجراء."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"مسح كل شيء"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"‏لم يتم تنفيذ إعادة التعيين نظرًا لعدم توفر خدمة System Clear."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"هل تريد محو جميع البيانات؟"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"لا تتوفر إمكانية إعادة الضبط على الإعدادات الأصلية لهذا المستخدم"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"جارٍ محو البيانات"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"يرجى الانتظار..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"محو جميع البيانات"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"محو جميع البيانات"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"سيتم حذف جميع المعلومات الشخصية والتطبيقات التي تم تنزيلها. لا يمكنك التراجع عن هذا الإجراء."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"‏سيتم حذف جميع المعلومات الشخصية، بما في ذلك التطبيقات وشرائح SIM التي تم تنزيلها. لا يمكنك التراجع عن هذا الإجراء."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"هل تريد محو جميع البيانات؟"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"لا تتوفر إمكانية إعادة الضبط على الإعدادات الأصلية لهذا المستخدم"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"جارٍ محو البيانات"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"يُرجى الانتظار…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"اعدادات المكالمات"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"إعداد البريد الصوتي، إعادة توجيه المكالمة، انتظار المكالمة، معرّف المتصل"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"‏التوصيل عبر USB"</string>
@@ -1760,7 +1757,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"لا يمكن ربط أكثر من <xliff:g id="MAXCONNECTION">%1$d</xliff:g> من الأجهزة."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"سيتم إلغاء ربط <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"التوصيل باستخدام إيثرنت"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"‏مشاركة اتصال الإنترنت الخاص بالهاتف عبر كابل USB يدعم إيثرنت"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"مشاركة اتصال الإنترنت الخاص بالهاتف عبر إيثرنت"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"يمكنك استخدام نقطة الاتصال والتوصيل لتوفير اتصال بالإنترنت للأجهزة الأخرى من خلال اتصال بيانات الجوّال، كما يمكن للتطبيقات إنشاء نقطة اتصال لمشاركة المحتوى مع الأجهزة المجاورة."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"‏يمكنك استخدام نقطة الاتصال والتوصيل لتوفير اتصال بالإنترنت للأجهزة الأخرى من خلال شبكة Wi‑Fi أو اتصال بيانات الجوّال، كما يمكن للتطبيقات إنشاء نقطة اتصال لمشاركة المحتوى مع الأجهزة المجاورة."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"مساعدة"</string>
@@ -1785,7 +1782,7 @@
     <string name="location_title" msgid="5819154746934945021">"موقعي"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"الموقع الجغرافي للملف الشخصي للعمل"</string>
     <string name="location_app_level_permissions" msgid="45436724900423656">"وصول تطبيقات إلى الموقع الجغرافي"</string>
-    <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"تم إيقاف خدمة الموقع الجغرافي."</string>
+    <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"خدمة الموقع الجغرافي غير مفعّلة"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="zero"> يمتلك <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> تطبيق من إجمالي <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> تطبيق حق الوصول إلى بيانات الموقع الجغرافي.</item>
       <item quantity="two"> يمتلك تطبيقان (<xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g>) من إجمالي <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> تطبيق حق الوصول إلى بيانات الموقع الجغرافي.</item>
@@ -2213,13 +2210,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"الإعدادات المفضّلة للشرح"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"\"تكبير حجم الشاشة\""</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"منطقة التكبير"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Magnification enable"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"اختَر مناطق التكبير التي تريد استخدامها عند تكبير الشاشة."</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"ملء الشاشة"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"جزء من الشاشة"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"ملء الشاشة أو جزء من الشاشة"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"تكبير الشاشة بالكامل"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"تكبير جزء من الشاشة"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"أتريد التبديل إلى استخدام زر أدوات تمكين الوصول؟"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"سيؤدي استخدام النقر ثلاث مرات من أجل تكبير جزء من الشاشة إلى تأخير الكتابة وإجراءات أخرى.\n\nهل تريد التبديل إلى استخدام زر أدوات تمكين الوصول للتكبير؟"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"التبديل إلى استخدام زر أدوات تمكين الوصول"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"استمرار استخدام النقر ثلاث مرات للتكبير"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"إعدادات التكبير"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"التكبير بالنقر ثلاث مرّات"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"التكبير باستخدام الاختصار"</string>
@@ -2249,7 +2249,7 @@
     <string name="accessibility_shortcut_edit_summary_software" msgid="6405629977940618205">"زر أدوات تمكين الوصول"</string>
     <string name="accessibility_shortcut_edit_dialog_title_software_gesture" msgid="8078659880723370597">"التمرير بسرعة إلى الأعلى بإصبعين"</string>
     <string name="accessibility_shortcut_edit_dialog_title_software_gesture_talkback" msgid="7422753388389160524">"التمرير بسرعة إلى الأعلى بثلاثة أصابع"</string>
-    <string name="accessibility_shortcut_edit_dialog_title_software" msgid="4796192466943479849">"انقر على زر أدوات تمكين الوصول"</string>
+    <string name="accessibility_shortcut_edit_dialog_title_software" msgid="4796192466943479849">"النقر على زر أدوات تمكين الوصول"</string>
     <string name="accessibility_shortcut_edit_dialog_summary_software" msgid="5606196352833449600">"انقر على زر أدوات تمكين الوصول <xliff:g id="ACCESSIBILITY_ICON">%s</xliff:g> في أسفل الشاشة.\n\nللتبديل بين الميزات، انقر مع الاستمرار على زر أدوات تمكين الوصول."</string>
     <string name="accessibility_shortcut_edit_dialog_summary_software_gesture" msgid="8292555254353761635">"مرِّر سريعًا من أسفل الشاشة للأعلى بإصبعين.\n\nللتبديل بين الميزات، مرِّر سريعًا للأعلى بإصبعين مع تثبيتهما."</string>
     <string name="accessibility_shortcut_edit_dialog_summary_software_gesture_talkback" msgid="84483464524360845">"مرِّر سريعًا من أسفل الشاشة للأعلى بثلاثة أصابع.\n\nللتبديل بين الميزات، مرِّر سريعًا للأعلى بثلاثة أصابع مع تثبيتها."</string>
@@ -2273,11 +2273,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"إنهاء الاتصال عبر زر التشغيل"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"مؤشر الماوس الكبير"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"إزالة الصور المتحركة"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"صوت أحادي"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"الجمع بين القنوات عند تشغيل الصوت"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"توازن الصوت"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"الأيمن"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"الأيسر"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"صوت أحادي"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"الجمع بين القنوات عند تشغيل الصوت"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"توازن الصوت"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"يسار"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"يمين"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"تلقائي"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 ثوانٍ"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 ثانية"</string>
@@ -2307,18 +2307,18 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"الاهتزاز عند تلقّي إشعارات"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"الاهتزاز عند الرنين"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"الاهتزاز عند لمس الشاشة"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"استخدام <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"فتح <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"استخدام تصحيح الألوان"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"عرض الشرح"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"للتطبيقات المتوافقة فقط"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"استخدام <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"فتح <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"استخدام ميزة \"تصحيح الألوان\""</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"عرض الشرح"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"للتطبيقات المتوافقة فقط"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"حجم الشرح ونمطه"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"حجم النص: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"خيارات أكثر"</string>
     <string name="accessibility_caption_preference_summary" msgid="1191356970836416954">"لا تتوفّر هذه الإعدادات المفضّلة للشرح في بعض التطبيقات."</string>
     <string name="accessibility_shortcut_type_software" msgid="2552732582767687515">"زر أدوات تمكين الوصول"</string>
     <string name="accessibility_shortcut_type_software_gesture" msgid="5608959693931019059">"التمرير سريعًا بإصبعين إلى أعلى الشاشة من أسفلها"</string>
-    <string name="accessibility_shortcut_type_hardware" msgid="4834144210432451916">"الضغط مع الاستمرار على مفاتيح التحكم في مستوى الصوت"</string>
+    <string name="accessibility_shortcut_type_hardware" msgid="4834144210432451916">"الضغط مع الاستمرار على مفتاحَي التحكّم بمستوى الصوت"</string>
     <string name="accessibility_shortcut_type_triple_tap" msgid="7717524216825494543">"النقر ثلاث مرات على الشاشة"</string>
     <string name="accessibility_hearingaid_instruction_continue_button" msgid="3367260988024430722">"متابعة"</string>
     <string name="accessibility_hearingaid_title" msgid="427173678199203191">"سماعات الأذن الطبية"</string>
@@ -2345,6 +2345,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"شذوذ إبصار الأخضر والأحمر"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"غطش الأحمر"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"غمش الأزرق"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"تدرّج الرمادي"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"الأحمر والأخضر"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"الأحمر والأخضر"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"الأزرق والأصفر"</string>
@@ -2498,7 +2499,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"حظر العمل في الخلفية"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"السماح بتشغيل التطبيق في الخلفية"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"غير مسموح بتشغيل التطبيق في الخلفية"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"يتعذر تقييد استخدام الخلفية."</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"يتعذّر تقييد استخدام الخلفية."</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"هل تريد وضع حد لنشاط التطبيق في الخلفية؟"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"قد يتأثر أداء أحد التطبيقات سلبًا في حالة وضع حد لنشاطه في الخلفية"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"نظرًا لعدم تعيين هذا التطبيق للعمل على تحسين البطارية، فلا يمكنك تقييده.\n\nلتقييد التطبيق، فعِّل ميزة تحسين البطارية أولاً."</string>
@@ -2690,7 +2691,7 @@
     <string name="battery_desc_standby" product="tablet" msgid="5818742458684767043">"البطارية المستخدمة عندما يكون الجهاز اللوحي خاملاً"</string>
     <string name="battery_desc_standby" product="default" msgid="2543075041964578103">"يتم استخدام البطارية عندما يكون الهاتف في وضع الخمول"</string>
     <string name="battery_desc_radio" msgid="454677140485133914">"البطارية مستخدمة بواسطة الراديو الخلوي"</string>
-    <string name="battery_sugg_radio" msgid="5476234634503535270">"تبديل إلى وضع الطائرة للحفاظ على الطاقة في المناطق التي لا توجد بها تغطية للشبكة"</string>
+    <string name="battery_sugg_radio" msgid="5476234634503535270">"تبديل إلى وضع الطيران للحفاظ على الطاقة في المناطق التي لا توجد بها تغطية للشبكة"</string>
     <string name="battery_desc_flashlight" msgid="6694895513133361404">"طاقة البطارية المستخدمة بواسطة ضوء الفلاش"</string>
     <string name="battery_desc_camera" msgid="6152712271731518018">"طاقة البطارية التي استهلكتها الكاميرا"</string>
     <string name="battery_desc_display" msgid="7175017688954602685">"طاقة البطارية المستخدمة بواسطة العرض والإضاءة الخلفية"</string>
@@ -2743,9 +2744,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"ضبط جدول زمني"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"إطالة عمر البطارية"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"إيقاف الميزة عندما يكون الجهاز مشحونًا"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"يتم إيقاف ميزة \"توفير شحن البطارية\" عند وصول مستوى بطارية الهاتف إلى <xliff:g id="PERCENT">%1$s</xliff:g>."</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"يتم إيقاف \"توفير شحن البطارية\" عند وصول مستوى بطارية الجهاز اللوحي إلى <xliff:g id="PERCENT">%1$s</xliff:g>."</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"يتم إيقاف \"توفير شحن البطارية\" عند وصول مستوى بطارية الجهاز إلى <xliff:g id="PERCENT">%1$s</xliff:g>."</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"يتم إيقاف ميزة \"توفير شحن البطارية\" عندما تتخطى نسبة شحن بطارية الهاتف <xliff:g id="PERCENT">%1$s</xliff:g>."</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"يتم إيقاف ميزة \"توفير شحن البطارية\" عندما تتخطى نسبة شحن بطارية الجهاز اللوحي <xliff:g id="PERCENT">%1$s</xliff:g>."</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"يتم إيقاف ميزة \"توفير شحن البطارية\" عندما تتخطى نسبة شحن بطارية الجهاز <xliff:g id="PERCENT">%1$s</xliff:g>."</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"تفعيل"</string>
@@ -2810,6 +2811,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"إعادة الضبط"</string>
     <string name="tts_play" msgid="2945513377250757221">"تشغيل"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"الشبكة الافتراضية الخاصة"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"التحكّم التلقائي بإمكانية الاتصال"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"إطالة عمر البطارية وتحسين أداء الجهاز عن طريق الإدارة التلقائية للاتصالات بالشبكات"</string>
     <string name="credentials_title" msgid="7535942196886123656">"تخزين بيانات الاعتماد"</string>
     <string name="credentials_install" msgid="3933218407598415827">"تثبيت شهادة"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"تثبيت الشهادات من وحدة تخزين"</string>
@@ -2821,9 +2824,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"بيانات اعتماد المستخدم"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"عرض بيانات الاعتماد المخزَّنة وتعديلها"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"إعدادات متقدمة"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"نوع وحدة التخزين"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"وحدة تخزين صلبة"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"وحدة تخزين برمجية فقط"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"لا تتوفر بيانات الاعتماد لهذا المستخدم"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"‏تم التثبيت للاستخدام بواسطة الشبكة الافتراضية الخاصة (VPN) والتطبيقات"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"‏تم التثبيت للاستخدام بواسطة Wi-Fi"</string>
@@ -3232,7 +3232,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"طريقة الدفع"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"بعد إعداد تطبيق للدفع، ما عليك سوى توجيه الجزء الخلفي من هاتفك إلى أي محطة دفع تتضمّن علامة \"بدون تلامس الأجهزة\"."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"حسنًا"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"المزيد..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"المزيد…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"ضبط التطبيق التلقائي للدفع"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"تعديل التطبيق التلقائي للدفع"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"عند إحدى محطات الدفع بدون تلامس الأجهزة، يمكنك الدفع باستخدام <xliff:g id="APP">%1$s</xliff:g>."</string>
@@ -3316,7 +3316,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"استخدام هذا للمكالمات دائمًا"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"‏اختيار شريحة SIM للبيانات"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"‏اختيار شريحة SIM للرسائل القصيرة SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"‏جارٍ تبديل شريحة SIM للبيانات؛ قد يستغرق هذا مدة تصل إلى دقيقة..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"‏جارٍ تبديل شريحة SIM للبيانات. قد يستغرق ذلك مدة تصل إلى دقيقة…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"الاتصال باستخدام"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"‏اختيار شريحة SIM"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"‏شريحة SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3463,6 +3463,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"سلسلة إجراءات، جدول زمني، توفير شحن البطارية، توفير الطاقة، بطارية، تلقائي، نسبة مئوية"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"‏خدمة volte، الاتصال المتقدم، اتصال 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"إضافة اللغة، إضافة لغة"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"حجم النص"</string>
     <string name="default_sound" msgid="6604374495015245195">"الصوت التلقائي"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"تم ضبط مستوى صوت الرنين والإشعار على <xliff:g id="PERCENTAGE">%1$s</xliff:g>."</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"مستوى الصوت والاهتزاز ووضع\"عدم الإزعاج\""</string>
@@ -3502,15 +3503,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"أصوات تشغيل الجهاز"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"النسخ النصي التلقائي"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"شرح تلقائي للوسائط"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"بدون أي قواعد"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="zero">تم ضبط <xliff:g id="ON_COUNT">%d</xliff:g> جدول زمني.</item>
-      <item quantity="two">تم ضبط جدولين زمنيين (<xliff:g id="ON_COUNT">%d</xliff:g>).</item>
-      <item quantity="few">تم ضبط <xliff:g id="ON_COUNT">%d</xliff:g> جداول زمنية.</item>
-      <item quantity="many">تم ضبط <xliff:g id="ON_COUNT">%d</xliff:g> جدولاً زمنيًا.</item>
-      <item quantity="other">تم ضبط <xliff:g id="ON_COUNT">%d</xliff:g> جدول زمني.</item>
-      <item quantity="one">تم ضبط جدول زمني واحد.</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{ما من جداول زمنية.}=1{تم ضبط جدول زمني واحد.}two{تم ضبط جدولين زمنيين.}few{تم ضبط # جداول زمنية.}many{تم ضبط # جدولاً زمنيًا.}other{تم ضبط # جدول زمني.}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"وضع \"عدم الإزعاج\""</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"عدم الحصول على إشعار إلا من الأشخاص المهمين والتطبيقات المهمة"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"الحد من المقاطعات"</string>
@@ -3578,32 +3571,16 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"الأولوية فقط"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"قيد التفعيل / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"غير مفعّل / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"غير مفعّل"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"قيد التفعيل"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"الطلب في كل مرة"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"إلى أن يتم إيقاف الوضع"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="zero"><xliff:g id="NUM_HOURS">%d</xliff:g> ساعة</item>
-      <item quantity="two">ساعتان (<xliff:g id="NUM_HOURS">%d</xliff:g>)</item>
-      <item quantity="few"><xliff:g id="NUM_HOURS">%d</xliff:g> ساعات</item>
-      <item quantity="many"><xliff:g id="NUM_HOURS">%d</xliff:g> ساعة</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> ساعة</item>
-      <item quantity="one">ساعة واحدة</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> دقيقة"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="zero">يمكن تفعيل <xliff:g id="ON_COUNT">%d</xliff:g> جدول زمني تلقائيًا.</item>
-      <item quantity="two">يمكن تفعيل جدولين زمنيين (<xliff:g id="ON_COUNT">%d</xliff:g>) تلقائيًا.</item>
-      <item quantity="few">يمكن تفعيل <xliff:g id="ON_COUNT">%d</xliff:g> جداول زمنية تلقائيًا.</item>
-      <item quantity="many">يمكن تفعيل <xliff:g id="ON_COUNT">%d</xliff:g> جدولاً زمنيًا تلقائيًا.</item>
-      <item quantity="other">يمكن تفعيل <xliff:g id="ON_COUNT">%d</xliff:g> جدول زمني تلقائيًا.</item>
-      <item quantity="one">يمكن تفعيل جدول زمني واحد تلقائيًا.</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{ساعة واحدة}zero{# ساعة}two{ساعتان}few{# ساعات}many{# ساعة}other{# ساعة}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{دقيقة واحدة}zero{# دقيقة}two{دقيقتان}few{# دقائق}many{# دقيقة}other{# دقيقة}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{الميزة غير مفعّلة}=1{الميزة غير مفعّلة / يمكن تفعيل جدول زمني واحد تلقائيًا.}two{الميزة غير مفعّلة / يمكن تفعيل جدولين زمنيين تلقائيًا.}few{الميزة غير مفعّلة / يمكن تفعيل # جداول زمنية تلقائيًا.}many{الميزة غير مفعّلة / يمكن تفعيل # جدولاً زمنيًا تلقائيًا.}other{الميزة غير مفعّلة / يمكن تفعيل # جدول زمني تلقائيًا.}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"ما الذي يمكنه مقاطعة ميزة \"عدم الإزعاج\"؟"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"الأشخاص"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"التطبيقات"</string>
-    <string name="zen_category_exceptions" msgid="1316097981052752811">"المنبهات والمقاطعات الأخرى"</string>
+    <string name="zen_category_exceptions" msgid="1316097981052752811">"المنبهات ومصادر الإزعاج الأخرى"</string>
     <string name="zen_category_schedule" msgid="2003707171924226212">"الجداول الزمنية"</string>
     <string name="zen_category_duration" msgid="7515850842082631460">"المدة للإعدادات السريعة"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"عند تفعيل الوضع \"عدم الإزعاج\"، سيتم كتم الصوت ومنع الاهتزاز عند تلقّي أي عناصر باستثناء تلك التي تسمح بها أعلاه."</string>
@@ -3645,6 +3622,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"ضبط إشعارات الأولوية المنخفضة تلقائيًا على \"التنبيهات الهادئة\""</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"ترتيب تكيُّفي للإشعارات"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"ترتيب الإشعارات تلقائيًا حسب مدى الصلة بالموضوع"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"تعليقات عن الإشعارات التكيُّفية"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"الإشارة إلى التعديلات التي تم إجراؤها على الإشعارات وإظهار خيار لتقديم تعليقات إلى النظام"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"الإجراءات والردود المقترَحة"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"عرض الإجراءات والردود المقترحة تلقائيًا"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"عرض الإشعارات الحديثة والمؤجلة"</string>
@@ -3861,7 +3840,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"الوصول إلى إعداد \"عدم الإزعاج\""</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"السماح بميزة \"عدم الإزعاج\""</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"لم تطلّب أي تطبيقات مثبّتة حق الوصول إلى إعداد \"عدم الإزعاج\""</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"جارٍ تحميل التطبيقات..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"جارٍ تحميل التطبيقات…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"‏بناءً على طلبك، يمنع Android ظهور إشعارات هذا التطبيق على هذا الجهاز."</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"‏بناءً على طلبك، يمنع Android ظهور هذه الفئة من الإشعارات على هذا الجهاز."</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"‏بناءً على طلبك، يمنع Android ظهور هذه المجموعة من الإشعارات على هذا الجهاز."</string>
@@ -3965,15 +3944,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"كل المحادثات"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"المحادثات ذات الأولوية"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"غير مسموح لأي محادثات"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="zero"><xliff:g id="CONVERSATIONS">%d</xliff:g> محادثة</item>
-      <item quantity="two">محادثتان (<xliff:g id="CONVERSATIONS">%d</xliff:g>)</item>
-      <item quantity="few"><xliff:g id="CONVERSATIONS">%d</xliff:g> محادثات</item>
-      <item quantity="many"><xliff:g id="CONVERSATIONS">%d</xliff:g> محادثة</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> محادثة</item>
-      <item quantity="one">محادثة واحدة</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"غير مسموح لأي محادثات"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{ما من محادثات}=1{محادثة واحدة}two{محادثتان}few{# محادثات}many{# محادثة}other{# محادثة}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"مَن يمكنه مقاطعة عمل الميزة"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"المكالمات"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"المكالمات"</string>
@@ -3982,15 +3953,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"للتأكّد من أنّ المكالمات المسموح بها تصدر تنبيهًا صوتيًا، تحقَّق من ضبط جهازك على الرنين."</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"بالنسبة إلى \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\"، يتمّ حظر المكالمات الواردة. ويمكنك ضبط الإعدادات للسماح لأصدقائك أو أفراد عائلتك أو جهات الاتصال الأخرى بالتواصل معك."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"جهات الاتصال المميّزة بنجمة"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="zero"><xliff:g id="NUM_PEOPLE">%d</xliff:g> شخص آخر</item>
-      <item quantity="two">شخصان (<xliff:g id="NUM_PEOPLE">%d</xliff:g>) آخران</item>
-      <item quantity="few"><xliff:g id="NUM_PEOPLE">%d</xliff:g> أشخاص آخرين</item>
-      <item quantity="many"><xliff:g id="NUM_PEOPLE">%d</xliff:g> شخصًا آخر</item>
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> شخص آخر</item>
-      <item quantity="one">شخص واحد آخر</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"لم يتم اختيار جهات اتصال مميّزة بنجمة"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{ما من جهات اتصال مميّزة بنجمة}=1{{contact_1}}=2{{contact_1} و{contact_2}}=3{{contact_1} و{contact_2} و{contact_3}}few{{contact_1} و{contact_2} و# جهات اتصال أخرى مميّزة بنجمة}many{{contact_1} و{contact_2} و# جهة اتصال أخرى مميّزة بنجمة}other{{contact_1} و{contact_2} و# جهة اتصال أخرى مميّزة بنجمة}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"الرسائل"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"الرسائل"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"الرسائل"</string>
@@ -3999,15 +3962,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"وفقًا للجدول الزمني \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\"، يتم حظر الرسائل الواردة. ويمكنك ضبط الإعدادات للسماح لأصدقائك أو أفراد عائلتك أو جهات الاتصال الأخرى بالتواصل معك."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"يمكن أن تصلك كل الرسائل."</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"يمكن أن تصلك كل المكالمات"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"لم يتم اختيار جهات اتصال"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="zero"><xliff:g id="NUM_CONTACTS">%d</xliff:g> جهة اتصال</item>
-      <item quantity="two">جهتا اتصال (<xliff:g id="NUM_CONTACTS">%d</xliff:g>)</item>
-      <item quantity="few"><xliff:g id="NUM_CONTACTS">%d</xliff:g> جهات اتصال</item>
-      <item quantity="many"><xliff:g id="NUM_CONTACTS">%d</xliff:g> جهة اتصال</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> جهة اتصال</item>
-      <item quantity="one">جهة اتصال واحدة</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{ما من جهات اتصال}=1{جهة اتصال واحدة}two{جهتا اتصال}few{# جهات اتصال}many{# جهة اتصال}other{# جهة اتصال}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"أي شخص"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"جهات الاتصال"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"جهات الاتصال المميّزة بنجمة"</string>
@@ -4045,30 +4000,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"جميع الإشعارات"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"بعض الإشعارات"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"لا يزال بإمكان الأشخاص المُختارين الوصول إليك حتى إذا لم تسمح للتطبيقات بمقاطعة عمل الميزة"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="zero">السماح لتطبيقات <xliff:g id="APP_NAMES">%s</xliff:g> بمقاطعة عمل الميزة</item>
-      <item quantity="two">السماح لتطبيقَي <xliff:g id="APP_NAMES">%s</xliff:g> بمقاطعة عمل الميزة</item>
-      <item quantity="few">السماح لتطبيقات <xliff:g id="APP_NAMES">%s</xliff:g> بمقاطعة عمل الميزة</item>
-      <item quantity="many">السماح لتطبيقات <xliff:g id="APP_NAMES">%s</xliff:g> بمقاطعة عمل الميزة</item>
-      <item quantity="other">السماح لتطبيقات <xliff:g id="APP_NAMES">%s</xliff:g> بمقاطعة عمل الميزة</item>
-      <item quantity="one">السماح لتطبيق <xliff:g id="APP_NAME_0">%s</xliff:g> بمقاطعة عمل الميزة</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> تطبيق آخر"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{عدم السماح لأي تطبيقات بمقاطعة عمل الميزة}=1{السماح لتطبيق {app_1} بمقاطعة عمل الميزة}=2{السماح لتطبيقَي {app_1} و{app_2} بمقاطعة عمل الميزة}=3{السماح لتطبيقات {app_1} و{app_2} و{app_3} بمقاطعة عمل الميزة}few{السماح لـ {app_1} و{app_2} و# تطبيقات أخرى بمقاطعة عمل الميزة}many{السماح لـ {app_1} و{app_2} و# تطبيقًا آخر بمقاطعة عمل الميزة}other{السماح لـ {app_1} و{app_2} و# تطبيق آخر بمقاطعة عمل الميزة}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"التطبيقات"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"جميع الإشعارات"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"بعض الإشعارات"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"الإشعارات التي يمكنها مقاطعة عمل الميزة"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"السماح لجميع الإشعارات"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="zero">السماح لأصوات <xliff:g id="SOUND_CATEGORIES">%s</xliff:g> بمقاطعة عمل الميزة</item>
-      <item quantity="two">السماح لصوتَي <xliff:g id="SOUND_CATEGORIES">%s</xliff:g> بمقاطعة عمل الميزة</item>
-      <item quantity="few">السماح لأصوات <xliff:g id="SOUND_CATEGORIES">%s</xliff:g> بمقاطعة عمل الميزة</item>
-      <item quantity="many">السماح لأصوات <xliff:g id="SOUND_CATEGORIES">%s</xliff:g> بمقاطعة عمل الميزة</item>
-      <item quantity="other">السماح لأصوات <xliff:g id="SOUND_CATEGORIES">%s</xliff:g> بمقاطعة عمل الميزة</item>
-      <item quantity="one">السماح لصوت <xliff:g id="SOUND_CATEGORY">%s</xliff:g> بمقاطعة عمل الميزة</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"عدم السماح لأي عنصر بمقاطعة عمل الميزة"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> صوت آخر"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{عدم السماح لأي فئة صوتية بمقاطعة عمل الميزة}=1{السماح لـ {sound_category_1} بمقاطعة عمل الميزة}=2{السماح لـ {sound_category_1} و{sound_category_2} بمقاطعة عمل الميزة}=3{السماح لـ {sound_category_1} و{sound_category_2} و{sound_category_3} بمقاطعة عمل الميزة}few{السماح لـ {sound_category_1} و{sound_category_2} و# فئات صوتية أخرى بمقاطعة عمل الميزة}many{السماح لـ {sound_category_1} و{sound_category_2} و# فئة صوتية أخرى بمقاطعة عمل الميزة}other{السماح لـ {sound_category_1} و{sound_category_2} و# فئة صوتية أخرى بمقاطعة عمل الميزة}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"عدم السماح لأي عنصر بمقاطعة عمل الميزة"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"عدم السماح لأي مستخدم بمقاطعة عمل الميزة"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"السماح لبعض الأشخاص بمقاطعة عمل الميزة"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"السماح لكل المستخدمين بمقاطعة عمل الميزة"</string>
@@ -4352,7 +4291,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"‏يتم التحكم في USB بواسطة"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"جهاز متّصل"</string>
     <string name="usb_control_device" msgid="527916783743021577">"هذا الجهاز"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"جارٍ التبديل..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"جارٍ التبديل…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"تعذّر التبديل"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"شحن هذا الجهاز"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"شحن الجهاز المتصل"</string>
@@ -4506,7 +4445,7 @@
     <string name="condition_expand_show" msgid="1501084007540953213">"إظهار"</string>
     <string name="condition_expand_hide" msgid="8347564076209121058">"إخفاء"</string>
     <string name="condition_hotspot_title" msgid="7903918338790641071">"نقطة الاتصال مفعّلة"</string>
-    <string name="condition_airplane_title" msgid="5847967403687381705">"وضع الطائرة قيد التفعيل"</string>
+    <string name="condition_airplane_title" msgid="5847967403687381705">"وضع الطيران قيد التفعيل"</string>
     <string name="condition_airplane_summary" msgid="1964500689287879888">"الشبكات غير متوفرة"</string>
     <string name="condition_zen_title" msgid="7674761111934567490">"تمّ تفعيل \"الرجاء عدم الإزعاج\""</string>
     <string name="condition_zen_summary_phone_muted" msgid="6516753722927681820">"تم كتم صوت الهاتف."</string>
@@ -4627,7 +4566,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"عرض التفاصيل"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"توفير البيانات"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"استخدام البيانات بدون قيود"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"تم إيقاف بيانات الخلفية."</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"تم إيقاف بيانات الخلفية."</string>
     <string name="data_saver_on" msgid="7848893946018448793">"قيد التفعيل"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"غير مفعّل"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"استخدام أداة توفير البيانات"</string>
@@ -4650,7 +4589,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"أثناء قفل الجهاز، منع كتابة ردود أو نصوص أخرى في الإشعارات"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"التدقيق الإملائي التلقائي"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"اختيار المدقق الإملائي"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"استخدام التدقيق الإملائي"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"استخدام ميزة \"المدقّق الإملائي\""</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"غير محدد"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(بدون)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4756,7 +4695,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"للمساعدة في تفريغ مساحة التخزين، يزيل مدير مساحة التخزين من جهاز الصور والفيديوهات التي تم الاحتفاظ بنسخة احتياطية منها."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"إزالة الصور والفيديوهات"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"مدير مساحة التخزين"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"استخدام مدير مساحة التخزين"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"استخدام \"أداة إدارة مساحة التخزين\""</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"تلقائي"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"يدوي"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"إخلاء بعض المساحة الآن"</string>
@@ -4794,6 +4733,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"النقر مرّتين للاطّلاع على الهاتف"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"انقر مرّتين للاطلاع على الجهاز اللوحي"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"انقر مرّتين للاطلاع على الجهاز"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"التمرير سريعًا للإشعارات"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"مرّر سريعًا للأسفل على الحافة السفلى من الشاشة لإظهار الإشعارات."</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"وضع \"التصفح بيد واحدة\""</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"استخدام وضع \"التصفح بيد واحدة\""</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"الخروج عند التبديل بين التطبيقات"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"المهلة"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 ثوانٍ"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 ثوانٍ"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 ثانية"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"قابلية الوصول"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"للاطّلاع على الوقت والإشعارات والمعلومات الأخرى، انقر مرّتين على شاشتك."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"حمل الهاتف للاطّلاع عليه"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"يمكنك حمل الجهاز اللوحي للاطلاع عليه"</string>
@@ -4806,6 +4755,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"النقر لفحص الجهاز اللوحي"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"النقر لفحص الجهاز"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"للاطّلاع على الوقت والإشعارات والمعلومات الأخرى، انقر على شاشتك."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"زر الطوارئ"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"يمكنك بدء إجراءات حالات الطوارئ عن طريق الضغط بسرعة على زر التشغيل 5 مرات."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"صوت تحذير"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"التنبيه قبل بدء الإجراءات"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"جهات الاتصال في حالات الطوارئ"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"تمرير بصمة الإصبع لعرض الإشعارات"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"تمرير بصمة الإصبع"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"للاطّلاع على الإشعارات، مرِّر إصبعك للأسفل على زر استشعار بصمات الإصبع في الجزء الخلفي لهاتفك."</string>
@@ -4988,7 +4942,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"التفعيل على جميع التطبيقات"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"اختيار برنامج تشغيل الرسومات"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"تلقائي"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Game Driver"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Game Driver"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"برنامج تشغيل رسوم للمطوّرين"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"برنامج تشغيل رسومات النظام"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -5057,6 +5011,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"تعذّر العثور على شبكات. حاوِل مرة أخرى."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(محظورة)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"‏ليست هناك شريحة SIM."</string>
+    <string name="sim_card" msgid="6381158752066377709">"‏شريحة SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"‏ليس هناك شريحة SIM"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"بدون شريحة"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"‏يجب توفّر شريحة SIM للاتصال بالشبكة"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"‏يجب توفّر شريحة SIM من <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> للاتصال بالشبكة"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"‏وضع الشبكة المُفضَّل: تمّ تفضيل WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"‏وضع الشبكة المُفضَّل: GSM فقط"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"‏وضع الشبكة المُفضَّل: WCDMA فقط"</string>
@@ -5110,6 +5069,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"بيانات الجوّال"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"الوصول إلى البيانات باستخدام شبكة الجوّال"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"سيتم تبديل الهاتف تلقائيًا إلى مشغّل شبكة الجوّال هذا عند وجوده داخل النطاق."</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"‏لا تتوفّر شريحة SIM."</string>
     <string name="calls_preference" msgid="2166481296066890129">"خيار المكالمات المفضَّل"</string>
     <string name="sms_preference" msgid="7742964962568219351">"‏خيار SMS المفضَّل"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"الطلب في كل مرة"</string>
@@ -5190,7 +5150,7 @@
     <string name="settings_panel_title" msgid="346363079938069215">"لوحة الإعدادات"</string>
     <string name="internet_connectivity_panel_title" msgid="2044237561024730108">"اتصال الإنترنت"</string>
     <string name="volume_connectivity_panel_title" msgid="8772438444782726321">"مستوى الصوت"</string>
-    <string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"غير متاح أثناء وضع الطائرة"</string>
+    <string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"غير متاح أثناء وضع الطيران"</string>
     <string name="force_desktop_mode" msgid="1336913605091334238">"فرض وضع سطح المكتب"</string>
     <string name="force_desktop_mode_summary" msgid="4587416867846930479">"فرض وضع سطح المكتب التجريبي على شاشات العرض الثانوية"</string>
     <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"تفعيل الشكل الحر للتطيبقات المتوافقة الحجم"</string>
@@ -5304,10 +5264,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"السماح بالظهور فوق المحتوى على الشاشة في \"الإعدادات\""</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"السماح للتطبيقات التي يمكن عرضها على التطبيقات الأخرى بالظهور فوق المحتوى على شاشات \"الإعدادات\"."</string>
     <string name="media_controls_title" msgid="403271085636252597">"الوسائط"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"إخفاء المشغِّل عندما تنتهي جلسة الوسائط"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"يسمح لك المشغِّل باستئناف جلسة من اللوحة الموسَّعة \"الإعدادات السريعة\"."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"مشغّل الوسائط في \"الإعدادات السريعة\""</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"عرض مشغّل الوسائط لمدة أطول لاستئناف التشغيل بسهولة"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"إخفاء المشغِّل"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"إظهار المشغِّل"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"ما مِن مشغِّلات متاحة"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"التطبيقات المسموح بها"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"الوسائط"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"سيتم تفعيل البلوتوث."</string>
 </resources>
diff --git a/res/values-as/arrays.xml b/res/values-as/arrays.xml
index ac224cb..ea064f4 100644
--- a/res/values-as/arrays.xml
+++ b/res/values-as/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"মধ্যমীয়া"</item>
     <item msgid="6740026006576843477">"দীঘল"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"চুটি"</item>
+    <item msgid="7397961711906421599">"মধ্যমীয়া"</item>
+    <item msgid="4079132024502041928">"দীঘলীয়া"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"ডিফ\'ল্ট"</item>
     <item msgid="4234707448428002595">"ছানছ-ছেৰিফ"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"গোলকীয়"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"কেৱল TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"সাৰ্বজনীন"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 56129d7..ac0c1b0 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"লক স্ক্ৰীণত প্ৰ\'ফাইল-বিষয়ক তথ্য দেখুৱাওক"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"একাউণ্টসমূহ"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"অৱস্থান"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"অৱস্থান ব্যৱহাৰ কৰক"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"অৱস্থান ব্যৱহাৰ কৰক"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"অফ আছে"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">অন আছে - <xliff:g id="COUNT_1">%1$d</xliff:g>টা এপে অৱস্থান এক্সেছ কৰিব পাৰে</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"প্ৰমাণীকৰণৰ বাবে নিজৰ চেহেৰা ব্যৱহাৰ কৰক"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"আৰম্ভণি"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"মুখাৱয়বৰদ্বাৰা আনলক কৰা সাধ্য সুবিধাটো অফ কৰা থাকিলে টকবেকত কিছুমান ছেটআপ পদক্ষেপে ভালদৰে কাম নকৰিবও পাৰে।"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"উভতি যাওক"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"ছেট আপ কৰাটো অব্যাহত ৰাখক"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"সাধ্য সুবিধা ছেট আপ ব্যৱহাৰ কৰক"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="other"><xliff:g id="NUMBER_1">%d</xliff:g>টা সংখ্যাতকৈ কম হ\'বই লাগিব</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"ডিভাইচ এডমিনে আপুনি ব্যৱহাৰ কৰা অন্তিমটো পিন আকৌ ব্যৱহাৰ কৰিবলৈ অনুমতি দিয়া নাই"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"আপোনাৰ আইটি প্ৰশাসকে বিশেষত্বহীন পিনবোৰ অৱৰোধ কৰি থৈছে৷ এটা পৃথক পিনেৰে চেষ্টা কৰক৷"</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"কেৱল বৈধ বৰ্ণহে দিয়ক"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"কমেও এটা বৰ্ণ থাকিব লাগিব"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"কমেও এটা অংক থাকিব লাগিব"</string>
@@ -653,7 +655,6 @@
       <item quantity="other">অতি কমেও <xliff:g id="COUNT">%d</xliff:g>টা এনেকুৱা বৰ্ণ থাকিবই লাগিব যিটো সংখ্যা নহয়</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"ডিভাইচৰ প্ৰশাসকে শেহতীয়া পাছৱৰ্ড ব্যৱহাৰ কৰিব নিদিয়ে"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"আইটি এডমিনে উমৈহতীয়া পাছৱৰ্ডসমূহ অৱৰোধ কৰি থৈছে। এটা পৃথক পাছৱৰ্ডেৰে চেষ্টা কৰক।"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"সংখ্যাবোৰৰ ঊৰ্দ্ধগামী, অধোগামী বা পুনৰাবৃত্তি ক্ৰম অনুমোদিত নহয়"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"নিশ্চিত কৰক"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"বাতিল কৰক"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"ৱাই-ফাই"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"বাই-ফাই অন কৰক"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"ৱাই-ফাই"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"ৱাই-ফাই ব্যৱহাৰ কৰক"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"ৱাই-ফাই ব্যৱহাৰ কৰক"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"ৱাই-ফাই ছেটিংসমূহ"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"ৱাই-ফাই"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"ৱায়াৰলেচ একচেছ পইণ্টসমূহ ছেটআপ আৰু পৰিচালনা কৰক"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"“<xliff:g id="SSID">%1$s</xliff:g>”ৰ সৈতে সংযোগ কৰিবলৈ তলৰ কিউআৰ ক’ডটো কেমেৰা ৱিণ্ড’ৰ মাজত ৰাখক"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"এটা কিউআৰ ক’ড স্কেন কৰি ৱাই-ফাইৰ লগত সংযোগ কৰক"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"ৱাই-ফাই শ্বেয়াৰ কৰক"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"“<xliff:g id="SSID">%1$s</xliff:g>”ৰ সৈতে সংযোগ কৰিবলৈ কিউআৰ ক’ডটো স্কেন কৰক আৰু পাছৱৰ্ড শ্বেয়াৰ কৰক"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"“<xliff:g id="SSID">%1$s</xliff:g>”ত যোগদান কৰিবলৈ অন্য এটা ডিভাইচেৰে এই কিউআৰ ক’ডটো স্কেন কৰক"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"“<xliff:g id="SSID">%1$s</xliff:g>”ৰ সৈতে সংযোগ কৰিবলৈ এই কিউআৰ ক’ডটো স্কেন কৰক"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"আকৌ চেষ্টা কৰক। যদি এই সমস্যাটো চলি থাকে তেন্তে ডিভাইচ নিৰ্মাতাৰ সৈতে যোগাযোগ কৰক"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"কিবা সমস্যা হৈছে"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"ৱাই-ফাইৰ পাছৱৰ্ড: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"হটস্পটৰ পাছৱৰ্ড: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"স্বয়ং-সংযোগ"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"ফ\'নটো এই নেটৱর্কটোৰ কাষত থাকিলে স্বয়ংক্ৰিয়ভাৱে সংযোগ হ\'বলৈ অনুমতি দিয়ক"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"টেবলেটটো এই নেটৱর্কটোৰ কাষত থাকিলে স্বয়ংক্ৰিয়ভাৱে সংযোগ হ\'বলৈ অনুমতি দিয়ক"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"পৰিসৰত থাকিলে এই নেটৱর্কলৈ সংযোগৰ অনুমতি দিয়ক"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"ডিভাইচ যোগ কৰক"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"এই নেটৱৰ্কটোত কোনো ডিভাইচ যোগ কৰিবলৈ এটা কিউআৰ ক’ড ব্যৱহাৰ কৰক"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"কিউআৰ ক\'ডটো মান্য ফৰ্মেট নহয়"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"ছিষ্টেমৰ প্ৰমাণপত্ৰ ব্যৱহাৰ কৰক"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"প্ৰদান নকৰিব"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"মান্য় নকৰিব"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"কোনো প্ৰমাণপত্ৰ নিৰ্দিষ্ট কৰা হোৱা নাই। আপোনাৰ সংযোগ ব্যক্তিগত ৰূপত নাথাকিব।"</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"নেটৱৰ্কৰ নাম অতি দীঘল হৈছে৷"</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"এটা ড\'মেইন নিৰ্দিষ্ট কৰিবই লাগিব"</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"প্ৰমাণপত্ৰৰ প্ৰয়োজন।"</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"সংযোগ কৰক"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"ৱাই-ফাই অন কৰা হ’ল"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>ৰ সৈতে সংযোগ কৰা হৈছে"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>ৰ সৈতে সংযোগ কৰি থকা হৈছে"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"সংযোগ কৰি থকা হৈছে…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"নেটৱৰ্কৰ সৈতে সংযোগ কৰিব পৰা নগ\'ল"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"নেটৱৰ্ক পৰিসৰত নাই"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"এপে সমল শ্বেয়াৰ কৰি আছে৷ ইণ্টাৰনেট সংযোগ শ্বেয়াৰ কৰিবলৈ, হটস্পট অফ কৰি পিছত আকৌ অন কৰক"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"কোনো পাছৱৰ্ড ছেট কৰা হোৱা নাই"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"হটস্পটৰ নাম"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> অন কৰি থকা হৈছে..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> অন কৰি থকা হৈছে…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>ৰ সৈতে অইন ডিভাইচে সংযোগ কৰিব পাৰে"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"হটস্পটৰ পাছৱৰ্ড"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"এপি বেণ্ড"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"মসৃণ ডিছপ্লে’"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"কিছুমান সমলৰ বাবে ৰিফ্ৰেশ্বৰ হাৰ স্বয়ংক্ৰিয়ভাৱে ৬০ৰ পৰা ৯০হাৰ্টজলৈ বঢ়ায়। বেটাৰীৰ ব্যৱহাৰ বৃদ্ধি কৰে।"</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"মসৃণ ডিছপ্লে’"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"৯০হাৰ্টজ ৰিফ্ৰেশ্বৰ হাৰ বলপূৰ্বকভাৱে প্ৰয়োগ কৰক"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"স্পৰ্শৰ উন্নত সংবেদনশীলতা আৰু এনিমেশ্বনৰ গুণগত মানৰ বাবে সৰ্বোচ্চ ৰিফ্ৰেশ্বৰ হাৰ। বেটাৰীৰ ব্যৱহাৰ বৃদ্ধি কৰে।"</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"স্ক্ৰীণৰ সতর্কতা"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"অন / আপুনি যদি চাই থাকে তেন্তে স্ক্ৰীণখন কেতিয়াও বন্ধ নহয়"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android সংস্কৰণ"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android সুৰক্ষা আপডে’ট"</string>
     <string name="model_info" msgid="8997566254717810904">"মডেল"</string>
-    <string name="model_summary" msgid="2246651782442466213">"মডেল: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"মডেল আৰু হাৰ্ডৱেৰ"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"হাৰ্ডৱেৰৰ সংস্কৰণ"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"সঁজুলিৰ ID"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"নেটৱৰ্ক ছেটিংসমূহ ৰিছেট কৰা হ’ল"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"ছিমবোৰ আঁতৰাব পৰা নগ’ল"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"ডাউনল’ড কৰা ছিমটো কোনো অজ্ঞাত আঁসোৱাহৰ বাবে মচিব পৰা নগ’ল।\n\nআপোনাৰ ডিভাইচটো ৰিষ্টাৰ্ট কৰি আকৌ চেষ্টা কৰক।"</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"সকলো ডেটা মচক (ফেক্টৰী ৰিছেট)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"সকলো ডেটা মচক (ফেক্টৰী ৰিছেট)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"ইয়ে \n\n"<li>"আপোনাৰ Google একাউণ্ট"</li>\n<li>"ছিষ্টেম আৰু এপ্ ডেটা আৰু ছেটিং"</li>\n<li>"ডাউনল’ড কৰা এপ্"</li>" আদিকে ধৰি আপোনাৰ টেবলেটটোৰ "<b>"আভ্যন্তৰিক সঞ্চয়াগাৰ"</b>"ত থকা সকলো ডেটা মচিব।"</string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"ইয়ে \n\n"<li>"আপোনাৰ Google একাউণ্ট"</li>\n<li>"ছিষ্টেম আৰু এপ্ ডেটা আৰু ছেটিং"</li>\n<li>"ডাউনল’ড কৰা এপ্"</li>" আদিকে ধৰি আপোনাৰ ফ’নটোৰ "<b>"আভ্যন্তৰিক সঞ্চয়াগাৰ"</b>"ত থকা সকলো ডেটা মচিব।"</string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"আপুনি বৰ্তমান এই একাউণ্টসমূহত ছাইন ইন হৈ আছে:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"এই ডিভাইচত আৰু ব্যৱহাৰকাৰী আছে।\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"সংগীত"</li>\n<li>"ফট\'"</li>\n<li>"অইন ব্যৱহাৰকাৰীৰ ডেটা"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"ই-ছিমবোৰ"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"এইটোৱে আপোনাৰ ম’বাইল সেৱাৰ আঁচনিক বাতিল নকৰে৷"</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"সংগীত, চিত্ৰ আৰু অন্যান্য ব্যৱহাৰকাৰীৰ ডেটা নাইকীয়া কৰিবলৈ, "<b>"USB সঞ্চয়াগাৰ"</b>" মচিব লাগিব।"</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"সংগীত, চিত্ৰ আৰু অন্যান্য ব্যৱহাৰকাৰীৰ ডেটা নাইকীয়া কৰিবলৈ, "<b>"এছডি কাৰ্ড"</b>" মচিব লাগিব৷"</string>
+    <string name="main_clear_title" msgid="277664302144837723">"সকলো ডেটা মচক (ফেক্টৰী ৰিছেট)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"সকলো ডেটা মচক (ফেক্টৰী ৰিছেট)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"এই কাৰ্যই \n\n"<li>"আপোনাৰ Google একাউণ্ট"</li>\n<li>"ছিষ্টেম আৰু এপ্‌ ডেটা আৰু ছেটিংসমূহ"</li>\n<li>"ডাউনল’ড কৰা এপ্‌"</li>" আদিকে ধৰি আপোনাৰ টেবলেটটোৰ "<b>"অভ্যন্তৰীণ ষ্ট’ৰেজ"</b>"ত থকা সকলো ডেটা মচিব"</string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"এই কাৰ্যই \n\n"<li>"আপোনাৰ Google একাউণ্ট"</li>\n<li>"ছিষ্টেম আৰু এপ্‌ ডেটা আৰু ছেটিংসমূহ"</li>\n<li>"ডাউনল’ড কৰা এপ্‌"</li>" আদিকে ধৰি আপোনাৰ ফ’নটোৰ "<b>"অভ্যন্তৰীণ ষ্ট’ৰেজ"</b>"ত থকা সকলো ডেটা মচিব"</string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"আপুনি বৰ্তমান এই একাউণ্টসমূহত ছাইন ইন হৈ আছে:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"এই ডিভাইচত আৰু ব্যৱহাৰকাৰী আছে।\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"সংগীত"</li>\n<li>"ফট’"</li>\n<li>"অন্য ব্যৱহাৰকাৰীৰ ডেটা"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"ই-ছিমসমূহh"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"এইটোৱে আপোনাৰ ম’বাইল সেৱাৰ আঁচনি বাতিল নকৰে।"</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"সংগীত, চিত্ৰ আৰু অন্য ব্যৱহাৰকাৰীৰ ডেটা মচিবলৈ, "<b>"USB ষ্ট’ৰেজ"</b>" মচিব লাগিব।"</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"সংগীত, চিত্ৰ আৰু অন্য ব্যৱহাৰকাৰীৰ ডেটা মচিবলৈ, "<b>"এছডি কাৰ্ডখন"</b>" মচিব লাগিব।"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"ইউএছবি সঞ্চয়াগাৰ মচক"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SD কাৰ্ড মচক"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"সংগীত, ফট\' আদিকে ধৰি আভ্যন্তৰিণ USB সঞ্চয়াগাৰত থকা সকলো ডেটা মচক"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"সংগীত বা ফট\' আদিকে ধৰি এছডি কাৰ্ডত থকা সকলো ডেটা মচক"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"সকলো ডেটা মচক"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"সকলো ডেটা মচক"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"আপোনাৰ সকলো ব্যক্তিগত তথ্য আৰু ডাউনল’ড কৰা এপ্ মচা হ’ব। আপুনি এই কাৰ্য আনডু কৰিব নোৱাৰিব।"</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"ডাউনল’ড কৰা এপ্ আৰু ছিমকে ধৰি আপোনাৰ সকলো ব্যক্তিগত তথ্য আৰু ডাউনল’ড কৰা এপ্ মচা হ’ব। আপুনি এই কাৰ্য আনডু কৰিব নোৱাৰিব।"</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"সকলোবোৰ মচক"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"ৰিছেট কৰা নহ\' ল কাৰণ, ছিষ্টেম পৰিষ্কাৰ সেৱা উপলব্ধ নহয়।"</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"সকলো ডেটা মচিবনে?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"এই ব্যৱহাৰকাৰীজনৰ বাবে ফেক্টৰী ৰিছেট উপলব্ধ নহয়"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"মচি থকা হৈছে"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"অনুগ্রহ কৰি অপেক্ষা কৰক..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"সকলো ডেটা মচক"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"সকলো ডেটা মচক"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"আপোনাৰ সকলো ব্যক্তিগত তথ্য আৰু ডাউনল’ড কৰা এপ্‌ মচা হ’ব। আপুনি এই কাৰ্য আনডু কৰিব নোৱাৰে।"</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"ডাউনল’ড কৰা এপ্‌সমূহ আৰু ছিমকে ধৰি আপোনাৰ সকলো ব্যক্তিগত তথ্য মচা হ’ব। আপুনি এই কাৰ্য আনডু কৰিব নোৱাৰে।"</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"সকলো ডেটা মচিবনে?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"এই ব্যৱহাৰকাৰীগৰাকীৰ বাবে ফেক্টৰী ৰিছেট সুবিধাটো উপলব্ধ নহয়"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"মচি থকা হৈছে"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"অনুগ্ৰহ কৰি অপেক্ষা কৰক…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"কল ছেটিংসমূহ"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"ভইচমেইল, কল ফৰৱাৰ্ডিং, কল অপেক্ষা, কল কৰোঁতাৰ আইডি ছেটআপ কৰক"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"ইউএছবি টেডাৰিং"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g>তকৈ অধিক ডিভাইচলৈ টেডাৰিং কৰিব নোৱাৰি।"</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>ক টেডাৰ কৰা নহ’ব।"</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"ইথাৰনেট টে\'ডাৰিং"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"ইউএছবি ইথাৰনেটৰ মাধ্যমেৰে ফ\'নটোৰ ইণ্টাৰনেট সংযোগ শ্বেয়াৰ কৰক"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"ইথাৰনেটৰ মাধ্যমেৰে ফ’নটোৰ ইণ্টাৰনেট সংযোগ শ্বেয়াৰ কৰক"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"আপোনাৰ ম\'বাইলৰ ডেটা ব্যৱহাৰ কৰি অন্য ডিভাইচবোৰক ইণ্টাৰনেট ব্যৱহাৰ কৰিব দিবলৈ হ\'টস্পট আৰু টেদৰিং সুবিধা ব্যৱহাৰ কৰক। নিকটবৰ্তী ডিভাইচসমূহৰ সৈতে সমল শ্ৱেয়াৰ কৰিবলৈ এপসমূহে হ\'টস্পট ও সৃষ্টি কৰিব পাৰে।"</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"আপোনাৰ ৱাই-ফাই অথবা ম’বাইল ডেটাৰ জৰিয়তে অন্য ডিভাইচসমূহক ইণ্টাৰনেট প্ৰদান কৰিবলৈ হটস্পট আৰু টে\'ডাৰিং ব্যৱহাৰ কৰক। নিকটৱৰ্তী ডিভাইচসমূহৰ সৈতে সমল শ্বেয়াৰ কৰিবলৈ এপ্‌সমূহেও এটা হটস্পট সৃষ্টি কৰিব পাৰে।"</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"সহায়"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"কেপশ্বনৰ অগ্ৰাধিকাৰসমূহ"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"বিবৰ্ধন"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"বিবৰ্ধন কৰা অংশ"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"বিবৰ্ধন সক্ষম"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"স্ক্ৰীনখন বিবৰ্ধন কৰোঁতে আপুনি ব্যৱহাৰ কৰিব খোজা বিবৰ্ধন কৰা অংশ(সমূহ) বাছনি কৰক"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"পূৰ্ণ স্ক্ৰীন"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"স্ক্ৰীনৰ কিছু অংশ"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"পূৰ্ণ স্ক্ৰীন আৰু স্ক্ৰীনৰ অংশ"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"গোটেই স্ক্ৰীনখন বিবৰ্ধন কৰক"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"স্ক্ৰীনৰ কিছু অংশ বিবৰ্ধন কৰক"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"সাধ্য-সুবিধাৰ বুটামলৈ সলনি কৰিবনে?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"স্ক্ৰীনৰ কোনো অংশ বিবৰ্ধন কৰিবলৈ তিনিবাৰ টিপাৰ সুবিধাটো ব্যৱহাৰ কৰিলে টাইপ কৰা আৰু অন্য কাৰ্যসমূহত বিলম্ব হয়।\n\nবিবৰ্ধন কৰিবলৈ আপুনি সাধ্য-সুবিধাৰ বুটাম ব্যৱহাৰ কৰিব বিচাৰেনে?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"সাধ্য-সুবিধাৰ বুটামলৈ সলনি কৰক"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"বিবৰ্ধন কৰিবলৈ তিনিবাৰ টিপাৰ সুবিধাটো ৰাখক"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"বিবৰ্ধন কৰাৰ ছেটিংসমূহ"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"তিনিবাৰ টুকুৰিয়াই বিবৰ্ধন কৰক"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"শ্বৰ্টকাটৰ দ্বাৰা বিৱৰ্ধিত কৰক"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"পাৱাৰ বুটাম টিপিলে কল সমাপ্ত হ\'ব"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"মাউছৰ পইণ্টাৰ ডাঙৰ"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"এনিমেশ্বন আঁতৰাওক"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"ম\'ন\' ধ্বনি"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"অডিঅ\' প্লে কৰাৰ সময়ত চেনেলসমূহ একত্ৰ কৰক"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"অডিঅ\' বেলেঞ্চ"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"বাওঁফাল"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"সোঁফাল"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"ম’ন’ অডিঅ’"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"অডিঅ’ প্লে’ কৰাৰ সময়ত চেনেলসমূহ একত্ৰিত কৰক"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"অডিঅ’ বেলেঞ্চ"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"বাওঁ"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"সোঁ"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"ডিফ’ল্ট"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"১০ ছেকেণ্ড"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"৩০ ছেকেণ্ড"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"জাননীৰ কম্পন"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"ৰিং কম্পন"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"স্পৰ্শৰ প্ৰতিক্ৰিয়া"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ব্যৱহাৰ কৰক"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> খোলক"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"ৰং শুধৰণি ব্যৱহাৰ কৰক"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"কেপশ্বনসমূহ দেখুৱাওক"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"কেৱল সমৰ্থিত এপৰ বাবে"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ব্যৱহাৰ কৰক"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> খোলক"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"ৰং শুধৰণী ব্যৱহাৰ কৰক"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"কেপশ্বনসমূহ দেখুৱাওক"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"কেৱল সমৰ্থিত এপৰ বাবে"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"কেপশ্বনৰ আকাৰ আৰু শৈলী"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> আকাৰৰ পাঠ"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"অধিক বিকল্প"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"ডিউটাৰএন’মেলী"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"প্ৰ’টান’মেলী"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"ট্ৰাইটান’মেলী"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"গ্ৰে’স্কে’ল"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"ৰঙা-সেউজীয়া"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"ৰঙা-সেউজীয়া"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"নীলা-হালধীয়া"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"নেপথ্য়ৰ সীমিতকৰণ"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"এই এপটো নেপথ্যত চলিবলৈ অনুমতি দিয়ক"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"নেপথ্যত চলাবৰ বাবে এপক অনুমতি দিয়া হোৱা নাই"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"নেপথ্য়ত হোৱা ব্য়ৱহাৰ সীমিত কৰিব নোৱাৰি"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"পটভূমিত হোৱা ব্যৱহাৰ সীমিত কৰিব নোৱাৰি"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"নেপথ্যৰ কাৰ্যকলাপ সীমিত কৰিবনে?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"আপুনি এটা এপৰ নেপথ্য কাৰ্যকলাপ সীমিত কৰিলে ই অস্বাভাৱিক আচৰণ কৰিব পাৰে"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"যিহেতু এই এপটো বেটাৰি অপ্টিমাইজ কৰিবলৈ ছেট কৰি থোৱা হোৱা নাই, সেয়ে ইয়াক আপুনি সীমিত কৰিব নোৱাৰে।\n\nএপটো সীমিত কৰিবলৈ প্ৰথমে বেটাৰি অপ্টিমাইজেশ্বন অন কৰক।"</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"সময়সূচী ছেট কৰক"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"বেটাৰিৰ জীৱনকাল বৃদ্ধি কৰক"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"চাৰ্জ সম্পূৰ্ণ হ’লে বন্ধ কৰক"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"আপোনাৰ ফ’ন <xliff:g id="PERCENT">%1$s</xliff:g> হ’লে বেটাৰি সঞ্চয়কাৰী অফ হয়"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"আপোনাৰ টেবলেটৰ বেটাৰি <xliff:g id="PERCENT">%1$s</xliff:g>ত থাকিলে বেটাৰি সঞ্চয়কাৰী অফ হয়।"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"আপোনাৰ ডিভাইচ <xliff:g id="PERCENT">%1$s</xliff:g> হ’লে বেটাৰি সঞ্চয়কাৰী অফ হয়"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"আপোনাৰ ফ’নটো <xliff:g id="PERCENT">%1$s</xliff:g>তকৈ অধিক চাৰ্জ হ’লে বেটাৰী সঞ্চয়কাৰী অফ হয়"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"আপোনাৰ টেবলেটটো <xliff:g id="PERCENT">%1$s</xliff:g>তকৈ অধিক চাৰ্জ হ’লে বেটাৰী সঞ্চয়কাৰী অফ হয়"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"আপোনাৰ ডিভাইচটো <xliff:g id="PERCENT">%1$s</xliff:g>তকৈ অধিক চাৰ্জ হ’লে বেটাৰী সঞ্চয়কাৰী অফ হয়"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"অন কৰক"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"ৰিছেট কৰক"</string>
     <string name="tts_play" msgid="2945513377250757221">"চলাওক"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"ভিপিএন"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"অভিযোজিত সংযোগ"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"আপোনাৰ নেটৱৰ্কৰ সংযোগসমূহ স্বয়ংক্ৰিয়ভাৱে পৰিচালনা কৰি বেটাৰীৰ জীৱনকাল বৃদ্ধি কৰে আৰু ডিভাইচৰ কাৰ্যক্ষমতা উন্নত কৰে"</string>
     <string name="credentials_title" msgid="7535942196886123656">"ক্ৰেডেনশ্বিয়েল সঞ্চয়াগাৰ"</string>
     <string name="credentials_install" msgid="3933218407598415827">"এখন প্ৰমাণপত্ৰ ইনষ্টল কৰক"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"সঞ্চয়াগাৰৰ পৰা প্ৰমাণপত্ৰ ইনষ্টল কৰক"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"ব্যৱহাৰকাৰীৰ ক্ৰেডেনশ্বিয়েল"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"সঞ্চয় কৰা প্ৰমাণপত্ৰসমূহ চাওক আৰু সংশোধন কৰক"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"উচ্চখাপৰ ছেটিংসমূহ"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"সঞ্চয়াগাৰৰ প্ৰকাৰ"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"হাৰ্ডৱেৰ-সমৰ্থিত"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"কেৱল ছফ্‌টৱেৰ"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"এই ব্যৱহাৰকাৰীৰ বাবে ক্ৰেডেনশ্বিয়েলসমূহ উপলব্ধ নহয়"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"ভিপিএন আৰু এপ্‌সমূহৰ বাবে ইনষ্টল কৰা হৈছে"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"ৱাই-ফাইৰ বাবে ইনষ্টল কৰা হৈছে"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"টাৰ্মিনেলত ধন পৰিশোধ কৰা"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"ধন পৰিশোধ কৰিবলৈ এটা এপ্ ছেট আপ কৰক। তাৰ পিছত পইচা পৰিশোধ কৰিবলৈ যিকোনো স্পৰ্শহীন প্ৰতীক অঁকা থকা টাৰ্মিনেলত ফ\'নটোৰ পিছফালটো ওচৰ চপাই ধৰক।"</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"বুজি পালোঁ"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"অধিক…"</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"অধিক…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"ডিফ’ল্ট পৰিশোধ এপ্‌ ছেট কৰক"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"ডিফ’ল্ট পৰিশোধ এপ্‌ আপডে’ট কৰক"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"এটা স্পৰ্শবিহীন টাৰ্মিনেলত <xliff:g id="APP">%1$s</xliff:g>ৰ জৰিয়তে পৰিশোধ কৰক"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"কল কৰিবলৈ সদায় ইয়াক ব্যৱহাৰ কৰক"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"ডেটাৰ বাবে এখন ছিম বাছনি কৰক"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"এছএমএছৰ বাবে এখন ছিম বাছনি কৰক"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"ডেটা ছিম সলনি কৰি থকা হৈছে, এই কাম সম্পূৰ্ণ হ\'বলৈ একমিনিটলৈকে সময় লাগিব পাৰে..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"ডেটা ছিম সলনি কৰি থকা হৈছে, ইয়াৰ বাবে এক মিনিট পৰ্যন্ত সময় লাগিব পাৰে…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"এই ছিমৰ সহায়ত কল কৰক"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"এখন ছিম কাৰ্ড বাছনি কৰক"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"ছিম <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"ৰুটিন, সময়সূচী, বেটাৰী সঞ্চয়কাৰী, পাৱাৰ ছেভাৰ, বেটাৰী, স্বয়ংক্ৰিয়, শতাংশ"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, উচ্চখাপৰ কলিং, 4g কলিং"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"ভাষা যোগ কৰক, এটা ভাষা যোগ কৰক"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"ফণ্টৰ আকাৰ"</string>
     <string name="default_sound" msgid="6604374495015245195">"ডিফ\'ল্ট ধ্বনি"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"ৰিং আৰু জাননীৰ ভলিউম <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"ভলিউম, কম্পন, অসুবিধা নিদিব"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"পাৱাৰ অনৰ ধ্বনিসমূহ"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"লাইভ কেপশ্বন"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"স্বয়ংক্ৰিয় কেপশ্বন মিডিয়া"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"একো নাই"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> খন সময়সূচী ছেট কৰা হৈছে</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> খন সময়সূচী ছেট কৰা হৈছে</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{এটাও নাই}=1{1 খন সময়সূচী ছেট কৰা হৈছে}one{# খন সময়সূচী ছেট কৰা হৈছে}other{# খন সময়সূচী ছেট কৰা হৈছে}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"অসুবিধা নিদিব"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"কেৱল গুৰুত্বপূর্ণ লোক আৰু এপ্‌সমূহৰ পৰা জাননী পাওক"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"বাধাবোৰ সীমিত কৰক"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"কেৱল গুৰুত্বপূৰ্ণ"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"অন / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"অফ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"অফ হৈ আছে"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"অন হৈ আছে"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"প্ৰতিবাৰতে সোধক"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"আপুনি অফ নকৰা পর্যন্ত"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> ঘণ্টা</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> ঘণ্টা</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> মিনিট"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g>টা সময়সূচী স্বয়ংক্ৰিয়ভাৱে অন হ’ব পাৰে</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g>টা সময়সূচী স্বয়ংক্ৰিয়ভাৱে অন হ’ব পাৰে</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{১ ঘণ্টা}one{# ঘণ্টা}other{# ঘণ্টা}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{১ মিনিট}one{# মিনিট}other{# মিনিট}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{অফ আছে}=1{অফ আছে / ১ খন সময়সূচী স্বয়ংক্ৰিয়ভাৱে অন হ’ব পাৰে}one{অফ আছে / # খন সময়সূচী স্বয়ংক্ৰিয়ভাৱে অন হ’ব পাৰে}other{অফ আছে / # খন সময়সূচী স্বয়ংক্ৰিয়ভাৱে অন হ’ব পাৰে}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"অসুবিধা নিদিব ম’ডটোক কিহে ব্যাঘাত জন্মাব পাৰে"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"লোক"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"এপ্‌সমূহ"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"কম অগ্ৰাধিকাৰপ্ৰপ্ত জাননীসমূহ স্বয়ংক্ৰিয়ভাৱে সাধাৰণলৈ ছেট কৰক"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"অভিযোজিত জাননীৰ ক্ৰম"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"প্ৰাসংগিকতা অনুযায়ী জাননীসমূহ স্বয়ংক্ৰিয়ভাৱে ক্ৰমত সজাওক"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"অভিযোজিত জাননীৰ মতামত"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"জাননীসমূহত ঘটোৱা সালসলনিসমূহ দৰ্শায় আৰু ছিষ্টেমটোক মতামত জনাবলৈ বিকল্পসমূহ দেখুৱায়"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"পৰামর্শ হিচাপে পোৱা কার্য আৰু প্ৰত্যুত্তৰসমূহ"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"পৰামর্শ হিচাপে পোৱা কার্য &amp; প্ৰত্যুত্তৰসমূহ স্বয়ংক্ৰিয়ভাৱে দেখুৱাওক"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"শেহতীয়া আৰু স্নুজ কৰা জাননীসমূহ দেখুৱাওক"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"অসুবিধা নিদিবত অনুমতি"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"অসুবিধা নিদিব ম’ডক অনুমতি দিয়ক"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"ইনষ্টল কৰি থোৱা কোনো এপে অসুবিধা নিদিবত প্ৰৱেশৰ অনুমতি বিচৰা নাই"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"এপ্‌সমূহ ল’ড কৰি থকা হৈছে..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"এপসমূহ ল’ড কৰি থকা হৈছে…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"আপোনাৰ অনুৰোধত, Android-এ এই ডিভাইচটোত এই এপৰ জাননীসমূহ দেখাবলৈ বাধা দি আছে"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"আপোনাৰ অনুৰোধমৰ্মে, Androidএ জাননীসমূহৰ এই শ্ৰেণীটোক এই ডিভাইচটোত দৃশ্যমান হ\'বলৈ দিয়া নাই"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"আপোনাৰ অনুৰোধমৰ্মে, Androidএ জাননীসমূহৰ এই গোটটোক এই ডিভাইচটোত দৃশ্যমান হ\'বলৈ দিয়া নাই"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"সকলো বাৰ্তালাপ"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"অগ্ৰাধিকাৰপ্ৰাপ্ত বার্তালাপসমূহ"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"একো নাই"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> টা বাৰ্তালাপ</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> টা বাৰ্তালাপ</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"একো নাই"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{এটাও নাই}=1{১ টা বাৰ্তালাপ}one{# টা বাৰ্তালাপ}other{# টা বাৰ্তালাপ}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"ব্যাঘাত জন্মাব পৰা সকল"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"কল"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"কলসমূহ"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"অনুমতি দিয়া কলসমূহ আহিলে যাতে ধ্বনি বজোৱা হয় তাক নিশ্চিত কৰিবলৈ ডিভাইচটো ৰিং কৰিবলৈ ছেট কৰা আছেনে পৰীক্ষা কৰক"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ৰ বাবে অন্তৰ্গামী কল অৱৰোধ কৰা হৈছে। আপুনি আপোনাৰ বন্ধু, পৰিয়ালৰ লোক বা অইন সম্পৰ্ক ব্যক্তিয়ে আপোনাৰ সৈতে যোগাযোগ কৰিব পৰাকৈ ছেটিং মিলাব পাৰে।"</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"তৰাযুক্ত সম্পৰ্কসমূহ"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one"><xliff:g id="NUM_PEOPLE">%d</xliff:g> অন্য</item>
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> অন্য</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"একো নাই"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{এটাও নাই}=1{{contact_1}}=2{{contact_1} আৰু {contact_2}}=3{{contact_1}, {contact_2} আৰু {contact_3}}one{{contact_1}, {contact_2} আৰু অন্য # টা}other{{contact_1}, {contact_2} আৰু অন্য # টা}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Messages"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"বাৰ্তাসমূহ"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Messages"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ৰ ক্ষেত্ৰত অন্তৰ্গামী বাৰ্তাসমূহ অৱৰোধ কৰা হয়। আপুনি আপোনাৰ বন্ধুবৰ্গ, পৰিয়ালৰ লোক বা অইন সম্পৰ্কসমূহে আপোনাৰ সৈতে যোগাযোগ কৰিব পৰাকৈ ছেটিংসমূহ মিলাব পাৰে।"</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"সকলো বাৰ্তাই আপোনাৰ সৈতে সম্পৰ্ক স্থাপন কৰিব পাৰে"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"সকলো কলে আপোনাৰ সৈতে সম্পৰ্ক স্থাপন কৰিব পাৰে"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"একো নাই"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> টা সম্পৰ্ক</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> টা সম্পৰ্ক</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{এটাও নাই}=1{১ টা সম্পৰ্ক}one{# টা সম্পর্ক}other{# টা সম্পর্ক}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"যিকোনো লোক"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"সম্পর্কসমূহ"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"তৰাযুক্ত সম্পৰ্কসমূহ"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"সকলো জাননী"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"কিছুমান জাননী"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"আপুনি এপ্‌সমূহক ব্যাঘাত জন্মাবলৈ নিদিলেও বাছনি কৰা লোকসকলে তথাপি আপোনাৰ সৈতে যোগাযোগ কৰিব পাৰে"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one"><xliff:g id="APP_NAMES">%s</xliff:g>এ ব্যাঘাত জন্মাব পাৰে</item>
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g>এ ব্যাঘাত জন্মাব পাৰে</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> টা অধিক"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{কোনো এপে ব্যাঘাত জন্মাব নোৱাৰে}=1{{app_1}এ ব্যাঘাত জন্মাব পাৰে}=2{{app_1} আৰু {app_2}এ ব্যাঘাত জন্মাব পাৰে}=3{{app_1}, {app_2} আৰু {app_3} এ ব্যাঘাত জন্মাব পাৰে}one{{app_1}, {app_2} আৰু # টাই ব্যাঘাত জন্মাব পাৰে}other{{app_1}, {app_2} আৰু # টাই ব্যাঘাত জন্মাব পাৰে}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"এপ্‌সমূহ"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"সকলো জাননী"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"কিছুমান জাননী"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"ব্যাঘাত জন্মাব পৰা জাননীসমূহ"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"সকলো জাননীক অনুমতি দিয়ক"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g>এ ব্যাঘাত জন্মাব পাৰে</item>
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g>এ ব্যাঘাত জন্মাব পাৰে</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"একোৱেই ব্যাঘাত জন্মাব নোৱাৰে"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> টা অধিক"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{একোৱেই ব্যাঘাত জন্মাব নোৱাৰে}=1{{sound_category_1}এ ব্যাঘাত জন্মাব পাৰে}=2{{sound_category_1} আৰু {sound_category_2}এ ব্যাঘাত জন্মাব পাৰে}=3{{sound_category_1}, {sound_category_2} আৰু {sound_category_3}এ ব্যাঘাত জন্মাব পাৰে}one{{sound_category_1}, {sound_category_2} আৰু # টাই ব্যাঘাত জন্মাব পাৰে}other{{sound_category_1}, {sound_category_2} আৰু # টাই ব্যাঘাত জন্মাব পাৰে}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"একোৱেই ব্যাঘাত জন্মাব নোৱাৰে"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"কোনো মানুহেই ব্যাঘাত জন্মাব নোৱাৰে"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"কিছুমান মানুহে ব্যাঘাত জন্মাব পাৰে"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"সকলো মানুহে ব্যাঘাত জন্মাব পাৰে"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"নিম্ন বস্তুয়ে ইউএছবিক নিয়ন্ত্ৰিত কৰে"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"সংযোগ হৈ থকা ডিভাইচ"</string>
     <string name="usb_control_device" msgid="527916783743021577">"এইটো ডিভাইচ"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"সলনি কৰি থকা হৈছে..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"সলনি কৰি থকা হৈছে…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"সলনি কৰিব পৰা নগ\'ল"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"ডিভাইচটো চ্চাৰ্জ কৰা হৈছে"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"সংযুক্ত ডিভাইচ চ্চাৰ্জ কৰিৰ বাবে"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"সবিশেষ চাওক"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"ডেটা সঞ্চয়কাৰী"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"অপৰিমিত ডেটা"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"নেপথ্যৰ ডেটা অফ কৰা হৈছে"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"পটভুমিৰ ডেটা অফ কৰা হৈছে"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"অন হৈ আছে"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"অফ"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"ডেটা সঞ্চয়কাৰী ব্যৱহাৰ কৰক"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"ডিভাইচটো লক হৈ থাকোতে, টাইপিং উত্তৰ বা অইন পাঠ জাননীসমূহ নেদেখুৱাব"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"ডিফ\'ল্ট বানান পৰীক্ষক"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"বানান পৰীক্ষক বাছনি কৰক"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"বানান পৰীক্ষক ব্য়ৱহাৰ কৰক"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"বানান পৰীক্ষক ব্যৱহাৰ কৰক"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"বাছনি কৰা হোৱা নাই"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"পোৱা নগ\'ল"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"সঞ্চয়াগাৰত ঠাই খালী কৰিবৰ কাৰণে সহায় কৰিবলৈ সঞ্চয়াগাৰ মেনেজাৰে আপোনাৰ ডিভাইচৰ পৰা বেকআপ কৰা ফট\' আৰু ভিডিঅ\'বোৰ আঁতৰাই দিয়ে।"</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"ফট\' আৰু ভিডিঅ\'সমূহ আঁতৰাওক"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"সঞ্চয়াগাৰ পৰিচালক"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"সঞ্চয়াগাৰ পৰিচালক ব্যৱহাৰ কৰক"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"ষ্ট’ৰেজ পৰিচালক ব্যৱহাৰ কৰক"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"স্বয়ংক্ৰিয়"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"হস্তকৃত"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"এতিয়া খালী স্থান উলিয়াওক"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"ফ\'ন চাবলৈ দুবাৰ টুকুৰিয়াওক"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"টেবলেটো চাবলৈ দুবাৰ টুকুৰিয়াওক"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"ডিভাইচ চাবলৈ দুবাৰ টুকুৰিয়াওক"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"জাননীবোৰৰ বাবে ছোৱাইপ কৰক"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"আপোনাৰ জাননীসমূহ দেখুৱাবলৈ স্ক্ৰীনখনৰ তলৰ কাষটোত তললৈ ছোৱাইপ কৰক"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"এখন হাতেৰে ব্যৱহাৰ কৰা ম’ড"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"এখন হাতেৰে ব্যৱহাৰ কৰা ম’ড ব্যৱহাৰ কৰক"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"এটা এপৰ পৰা অন্য এটা এপলৈ যাওঁতে বাহিৰ হওক"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"সময় উকলিছে"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"৪ ছেকেণ্ড"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"৮ ছেকেণ্ড"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"১২ ছেকেণ্ড"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"ঢুকি পাব পৰা অৱস্থা"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"সময়, জাননী আৰু অন্য তথ্য চাবলৈ আপোনাৰ স্ক্ৰীণত দুবাৰ টিপক।"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"ফ’ন চাবলৈ তোলক"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"টে\'বলেট চাবলৈ ওপৰলৈ উঠাওক"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"টেবলেটটো পৰীক্ষা কৰিবলৈ টিপক"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"ডিভাইচটো পৰীক্ষা কৰিবলৈ টিপক"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"সময়, জাননী আৰু অন্য তথ্য চাবলৈ আপোনাৰ স্ক্ৰীণত টিপক।"</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"বিপদকালত সহায় বিচাৰিবলৈ ব্যৱহাৰ কৰা বুটাম"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"পাৱাৰ বুটামটো ক্ষিপ্ৰতাৰে ৫ বাৰ টিপি জৰুৰীকালীন SOS কাৰ্যবিলাক আৰম্ভ কৰক।"</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"সকীয়নিৰ ধ্বনি"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"কাৰ্যবিলাক আৰম্ভ কৰাৰ পূৰ্বে সতৰ্ক কৰি দিয়ক"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"জৰুৰীকালীন সম্পৰ্কসমূহ"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"জাননীৰ বাবে ফিংগাৰপ্ৰিণ্ট ছোৱাইপ কৰক"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"ফিংগাৰপ্ৰিণ্ট ছোৱাইপ কৰক"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"জাননীবিলাক চাবলৈ আপোনাৰ ফ\'নটোৰ পিছফালে থকা ফিংগাৰপ্ৰিণ্ট ছেন্সৰত ওপৰৰ পৰা তললৈ আঙুলি বুলাওক।"</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"সকলো এপৰ বাবে সক্ষম কৰক"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"গ্ৰাফিক্স ড্ৰাইভাৰ বাছনি কৰক"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"ডিফ’ল্ট"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"গে’ম ড্ৰাইভাৰ"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"গে’ম ড্ৰাইভাৰ"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"বিকাশকৰ্তাৰ ড্ৰাইভাৰ"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"ছিষ্টেম গ্ৰাফিক্স ড্ৰাইভাৰ"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"নেটৱৰ্ক বিচাৰি পোৱা নগ\'ল। আকৌ চেষ্টা কৰক।"</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(নিষিদ্ধ)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"কোনো ছিম কাৰ্ড নাই"</string>
+    <string name="sim_card" msgid="6381158752066377709">"ছিম"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"ছিম নাই"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"ছিমৰ একো তথ্য নাই"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"সংযোগ কৰিবলৈ ছিমৰ প্ৰয়োজন"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"সংযোগ কৰিবলৈ <xliff:g id="WIRELESS_CARRIER">%s</xliff:g>ৰ ছিমৰ প্ৰয়োজন"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"অগ্ৰাধিকাৰ দিয়া নেটৱৰ্কৰ ম\'ড: WCDMA অগ্ৰাধিকাৰপ্ৰাপ্ত"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"অগ্ৰাধিকাৰ দিয়া নেটৱৰ্কৰ ম\'ড: GSM মাত্ৰ"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"অগ্ৰাধিকাৰ দিয়া নেটৱৰ্কৰ ম\'ড: WCDMA মাত্ৰ"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"ম’বাইল ডেটা"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"ম’বাইল নেটৱৰ্ক ব্যৱহাৰ কৰি ডেটা এক্সেছ কৰক"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"ফ’নটো পৰিসৰলৈ আহিলে স্বয়ংক্ৰিয়ভাৱে এইটো বাহকৰ সৈতে সংযোগ হ’ব"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"কোনো ছিম কাৰ্ড উপলব্ধ নহয়"</string>
     <string name="calls_preference" msgid="2166481296066890129">"কল সম্পৰ্কীয় অগ্ৰাধিকাৰ"</string>
     <string name="sms_preference" msgid="7742964962568219351">"এছএমএছ সম্পৰ্কীয় অগ্ৰাধিকাৰ"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"প্ৰতিবাৰতে সোধক"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"ছেটিংসমূহত স্ক্ৰীন অ’ভাৰলে’ৰ অনুমতি দিয়ে"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"এনে এপ্‌সমূহক অনুমতি দিয়ে যি ছেটিংসমূহৰ স্ক্ৰীনসমূহ অ’ভাৰলে’ কৰিবলৈ অন্য এপ্‌সমূহৰ ওপৰত প্ৰদৰ্শিত হ’ব পাৰে"</string>
     <string name="media_controls_title" msgid="403271085636252597">"মিডিয়া"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"মিডিয়া ছেশ্বনটো সমাপ্ত হ’লে প্লে’য়াৰটো লুকুৱাওক"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"প্লে’য়াৰটোৱে আপোনাক বিস্তাৰ কৰা ক্ষিপ্ৰ ছেটিংসমূহৰ পেনেলটোৰ পৰা কোনো ছেশ্বন পুনৰ আৰম্ভ কৰিবলৈ দিয়ে।"</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"ক্ষিপ্ৰ ছেটিংসমূহত মিডিয়া প্লে’য়াৰ"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"প্লে’বেক সহজে পুনৰ আৰম্ভ কৰিবলৈ মিডিয়া প্লে’য়াৰ এক দীঘলীয়া সময়ৰ বাবে দেখুৱাওক"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"প্লে’য়াৰটো লুকুৱাওক"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"প্লে’য়াৰটো দেখুৱাওক"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"কোনো প্লে’য়াৰ উপলব্ধ নহয়"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"অনুমোদিত এপ্‌সমূহ"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"মিডিয়া"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"ব্লুটুথ অন কৰা হ’ব"</string>
 </resources>
diff --git a/res/values-az/arrays.xml b/res/values-az/arrays.xml
index 1a73dd6..a9b0da0 100644
--- a/res/values-az/arrays.xml
+++ b/res/values-az/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Orta"</item>
     <item msgid="6740026006576843477">"Uzun"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Qısa"</item>
+    <item msgid="7397961711906421599">"Orta"</item>
+    <item msgid="4079132024502041928">"Uzun"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Defolt"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Qlobal"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"Yalnız TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Qlobal"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 5557114..6f4d3d5 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Kilid ekranında profil haqqında infonu göstər"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Hesablar"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Yer"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Məkan istifadə edin"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Məkan işlədin"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Deaktiv"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">Aktiv - <xliff:g id="COUNT_1">%1$d</xliff:g> tətbiqin məkana giriş icazəsi var</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Doğrulamaq üçün üzünüzdən istifadə edin"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Başladın"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Əlçatımlılıq üz ilə kiliddən çıxarması funksiyası deaktiv olarsa, bəzi ayarlama mərhələləri TalkBack ilə düzgün işləməyə bilər."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Qayıdın"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Ayarlamağa davam edin"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Əlçatımlıq quraşdırması istifadə edin"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="one"><xliff:g id="NUMBER_0">%d</xliff:g> rəqəmdən az olmalıdır</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Cihaz admini son vaxtlardakı PIN kodu istifadə etməyə icazə vermir"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Ümumi PIN-lər IT admini tərəfindən blok edilib. Fərqli PIN-i sınayın."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Yalnış simvol daxil edə bilməzsiniz"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Ən azı bir hərf olmalıdır"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Ən azı bir rəqəm olmalıdır"</string>
@@ -653,7 +655,6 @@
       <item quantity="one">Ən azı rəqəm olmayan 1 simvol olmalıdır</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Cihaz admini son vaxtlardakı parolu istifadə etməyə icazə vermir"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Ümumi parollar IT admini tərəfindən blok edilib. Fərqli parolu sınayın."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Artan, azalan və ya təkrarlanan rəqəm ardıcıllığı qadağandır"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Təsdiq edin"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Ləğv et"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Wi-Fi yandırın"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Wi-Fi istifadə edin"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Wi-Fi istifadə edin"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wi-Fi ayarları"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Simzis giriş nöqtələrini quraşdırın və idarə edin"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"\"<xliff:g id="SSID">%1$s</xliff:g>\" şəbəkəsinə qoşulmaq üçün aşağıdakı QR kodunu kameranın mərkəzinə tutun"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"QR kodunu skan etməklə Wi‑Fi şəbəkəsinə qoşulun"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Wi‑Fi şəbəkəsini paylaşın"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"\"<xliff:g id="SSID">%1$s</xliff:g>\" şəbəkəsinə qoşulmaq və parolu paylaşmaq üçün bu QR kodunu skan edin"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"\"<xliff:g id="SSID">%1$s</xliff:g>\" şəbəkəsinə qoşulmaq üçün bu QR kodunu başqa cihazla skan edin"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"\"<xliff:g id="SSID">%1$s</xliff:g>\" şəbəkəsinə qoşulmaq üçün bu QR kodunu skan edin"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Yenidən cəhd edin. Problem davam edərsə, cihaz istehsalçısı ilə əlaqə saxlayın"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Xəta baş verdi"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi-Fi parolu: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Hotspot parolu: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Avto bağlantı"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Bu şəbəkənin yaxınlığında telefonun avtomatik qoşulmasına icazə verin"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Bu şəbəkənin yaxınlığında planşetin avtomatik qoşulmasına icazə verin"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Əhatə dairəsində olduqda bu şəbəkəyə bağlanmağa icazə verin"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Cihaz əlavə edin"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Bu şəbəkəyə cihaz əlavə etmək üçün QR kodundan istifadə edin"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR kodu doğru formatda deyil"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Sistem sertifikatlarını istifadə edin"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Təmin etməyin"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Düzgünlüyü yoxlamayın"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Sertifikat təyin olunmayıb. Bağlantınız şəxsi olmayacaq."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Şəbəkə adı çox uzundur."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Domen göstərilməlidir."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Sertifikat tələb edilir."</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Qoşul"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wifi aktivdir"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> şəbəkəsinə qoşulub"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> şəbəkəsinə qoşulur"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Qoşulur…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Şəbəkəyə qoşulmaq alınmadı"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Şəbəkə aralıqda deyil"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Tətbiq kontenti paylaşır. İnternet bağlantısını paylaşmaq üçün hotspotu deaktiv, sonra aktiv edin"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Parol ayarlanmayıb"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Hotspot adı"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> aktiv edilir..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> aktiv edilir…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Digər cihazlar <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> şəbəkəsinə qoşula bilər"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Hotspot parolu"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP Diapazonu"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Rahat Displey"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Bəzi məzmun üçün yeniləmə dərəcəsini 60 Hs-dən 90 Hs-ə avtomatik yüksəldir. Batareya istifadəsini artırır."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Rahat Displey"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"90 Hs yeniləmə dərəcəsini məcbur tətbiq edin"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Təkmilləşdirilmiş toxunuş həssaslığı və animasiya keyfiyyəti üçün yüksək yeniləmə dərəcəsi. Batareya istifadəsini artırır."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Ekran həssaslığı"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Aktiv/ Ekrana baxırsınızsa, sönməyəcək"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android versiyası"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android güvənlik güncəlləməsi"</string>
     <string name="model_info" msgid="8997566254717810904">"Model"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Model: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Model və avadanlıq"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Avadanlıq versiyası"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Avadanlıq ID"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Şəbəkə ayarları sıfırlandı"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"SIM-ləri silmək mümkün deyil"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Endirilmiş SIM-ləri xəta səbəbindən silmək mümkün deyil.\n\nCihazı yenidən başladıb təkrar cəhd edin."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Bütün datanı silin (fabrika sıfırlaması)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Bütün datanı silin (fabrika sıfırlaması)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Bu, planşetin "<b>"daxili yaddaşındakı"</b>" bütün datanı siləcək, bura daxildir:\n\n"<li>"Google Hesabı"</li>\n<li>"Sistem və tətbiq datası və ayarları"</li>\n<li>"Endirilmiş tətbiqlər"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Bu, telefonun "<b>"daxili yaddaşındakı"</b>" bütün datanı siləcək, bura daxildir:\n\n"<li>"Google Hesabı"</li>\n<li>"Sistem və tətbiq datası və ayarları"</li>\n<li>"Endirilmiş tətbiqlər"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Hazırda bu hesablara daxil olmusunuz:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Bu cihazda başqa istifadəçilər iştirak edir.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Musiqi"</li>\n<li>"Fotolar"</li>\n<li>"Digər istifadəçi datası"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM-lər"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Bununla mobil xidmət planı ləğv edilməyəcək."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Həmçinin musiqi, şəkil və digər istifadəçi datası təmizləmək üçün "<b>"USB yaddaşı"</b>" silinməlidir."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Musiqi, şəkil, və digər istifadəçi datasını silmək üçün "<b>"SD kartı"</b>" təmizləmək lazımdır."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Bütün datanı silin (zavod sıfırlaması)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Bütün datanı silin (zavod sıfırlaması)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Bu, planşetin "<b>"daxili yaddaşındakı"</b>" bütün datanı siləcək, bura daxildir:\n\n"<li>"Google Hesabı"</li>\n<li>"Sistem və tətbiq datası və ayarları"</li>\n<li>"Endirilmiş tətbiqlər"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Bu, telefonun "<b>"daxili yaddaşındakı"</b>" bütün datanı siləcək, bura daxildir:\n\n"<li>"Google Hesabı"</li>\n<li>"Sistem və tətbiq datası və ayarları"</li>\n<li>"Endirilmiş tətbiqlər"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Hazırda bu hesablara daxil olmusunuz:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Bu cihazda başqa istifadəçilər mövcuddur.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Musiqi"</li>\n<li>"Fotolar"</li>\n<li>"Digər istifadəçi datası"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM-lər"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Bununla mobil xidmət planı ləğv edilməyəcək."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Həmçinin musiqi, şəkil və digər istifadəçi datası təmizləmək üçün "<b>"USB yaddaşı"</b>" silinməlidir."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Musiqi, şəkil, və digər istifadəçi datasını silmək üçün "<b>"SD kartı"</b>" təmizləmək lazımdır."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USB yaddaşı sil"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SD kartı sil"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Daxili USB yaddaşında mahnı və ya şəkil kimi bütün datanı sil"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"SD kartda musiqi və foto kimi bütün məlumatları silin."</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Bütün datanı silin"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Bütün datanı silin"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Şəxsi məlumat və endirilən tətbiqlərin hamısı silinəcək. Bu əməliyyatı geri qaytara bilməzsiniz."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Endirilən tətbiqlər və SIM-lər daxil olmaqla şəxsi məlumatın hamısı silinəcək. Bu əməliyyatı geri qaytara bilməzsiniz."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Hər şeyi silin"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Sistem Təmizləmə xidməti aktiv olmadığına görə heç bir sıfırlama həyata keçirilmədi."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Bütün data silinsin?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Fabrik sıfırlaması bu istifadəçi üçün əlçatan deyil"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Silinir"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Lütfən, gözləyin..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Bütün datanı silin"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Bütün datanı silin"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Şəxsi məlumat və endirilən tətbiqlərin hamısı silinəcək. Bu əməliyyatı geri qaytara bilməzsiniz."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Endirilən tətbiqlər və SIM-lər daxil olmaqla şəxsi məlumatın hamısı silinəcək. Bu əməliyyatı geri qaytara bilməzsiniz."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Bütün data silinsin?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Zavod sıfırlaması bu istifadəçi üçün əlçatan deyil"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Silinir"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Gözləyin…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Zəng ayarları"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Səsli poçt, çağrı yönləndirməsi, çağrı gözləmə, çağrı kimliyi quraşdırın"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB Birləşmə"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> cihazdan çoxu ilə birləşə bilməz."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> idarəolunmaz olacaq."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ethernet bağlantısı"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"USB Ethernet vasitəsilə telefonun internet bağlantısını paylaşın"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Ethernet vasitəsilə telefonun internet bağlantısını paylaşın"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Mobil data bağlantısı vasitəsilə digər cihazları internetlə təmin etmək üçün hotspot və birləşmədən istifadə edin. Tətbiqlər yaxınlıqdakı cihazlarla kontenti paylaşmaq üçün də hotspot yarada bilər."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Wi‑Fi və ya mobil məlumat bağlantısı vasitəsilə digər cihazları internetlə təmin etmək üçün hotspot və birləşmədən istifadə edin. Tətbiqlər yaxınlıqdakı cihazlarla məzmun paylaşmaq üçün də hotspot yarada bilər."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Yardım"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Subtitr tərcihləri"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Böyütmə"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Böyütmə sahəsi"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Böyütmənin aktivləşdirilməsi"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Ekranı böyüdərkən istifadə etmək istədiyiniz böyütmə sahələrini seçin"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Tam ekran"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Ekranın bir hissəsi"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Tam ekran &amp; ekranın bir hissəsi"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Bütün ekranı böyüdün"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Ekranın bir hissəsini böyüdün"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Əlçatımlılıq düyməsinə keçsin?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Ekranın bir hissəsini böyütmək üçün üç dəfə toxunmadan istifadə etmək yazma və digər əməliyyatların gecikməsinə səbəb olacaq.\n\nBöyütmək üçün əlçatımlılıq düyməsindən istifadəyə keçmək istəyirsiniz?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Əlçatımlılıq düyməsinə keçin"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Böyütmək üçün üç dəfə toxunmadan istifadə edin"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Böyütmə ayarları"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Üç dəfə klikləməklə böyüdün"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Qısayol ilə böyüdün"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Yanıdırıb-söndürmə düyməsi zəngi sonlandırır"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Böyük maus kursoru"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Animasiyaları silin"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Mono audio"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Audio oxudulan zaman kanalları birləşdirin"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Audio balans"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Sol"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Sağ"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Mono audio"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Audio oxudulan zaman kanalları birləşdirin"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Audio balansı"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Sol"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Sağ"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Defolt"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 saniyə"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 saniyə"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Bildiriş vibrasiyası"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Zəng vibrasiyası"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Toxunuş rəyi"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> istifadə edin"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> tətbiqini açın"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Rəng düzəlişini işlədin"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Başlıqları göstərin"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Yalnız dəstəklənən tətbiq üçün"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> istifadə edin"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> tətbiqini açın"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Rəng korreksiyasından istifadə edin"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Subtitrləri göstərin"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Yalnız dəstəklənən tətbiq üçün"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Altyazı ölçü və üslubu"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> mətn ölçüsü"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Daha çox seçim"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deyteranomaliya"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomaliya"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomaliya"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Ağ-qara"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Qırmızı-yaşıl"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Qırmızı-yaşıl"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Mavi-sarı"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Arxa fonun məhdudlaşdırılması"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Tətbiqin arxa fonda işləməsinə icazə verin"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Tətbiqin arxa fonda işləmək üçün icazəsi yoxdur"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Arxa fon istifadəsi məhdudlaşdırıla bilər"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Arxa fon istifadəsi məhdudlaşdırıla bilməz"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Arxa fon fəaliyyəti məhdudlaşdırılsın?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Tətbiqin arxa fon fəaliyyətini məhdudlaşdırsanız, o səhv işləyə bilər"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Bu tətbiqdə batareyanın optimallaşdırılması ayarlanmadığına görə onu məhdudlaşdıra bilməzsiniz.\n\nTətbiqi məhdudlaşdırmaq üçün əvvəlcə batareya optimallaşdırmasını aktiv edin."</string>
@@ -2497,7 +2498,7 @@
     <string name="dialog_location_message" product="device" msgid="4606829479989940464">"Cihaz batareya istifadəsini normal idarə edə bilmir, çünki tətbiqdən istifadə etmədiyiniz zaman <xliff:g id="APP">%1$s</xliff:g> məkanı təklif etməyə davam edir.\n\n Bu problemi həll etmək üçün tətbiq məkanını deaktiv edə bilərsiniz."</string>
     <string name="dialog_location_ok" msgid="6338680851382069716">"Deaktiv edin"</string>
     <string name="power_screen" msgid="4596900105850963806">"Ekran"</string>
-    <string name="power_flashlight" msgid="8993388636332573202">"İşartı"</string>
+    <string name="power_flashlight" msgid="8993388636332573202">"Fənər"</string>
     <string name="power_camera" msgid="4778315081581293923">"Kamera"</string>
     <string name="power_wifi" msgid="4614007837288250325">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="5085900180846238196">"Bluetooth"</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Plan ayarlayın"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Batareya istifadəsinin müddətini artırın"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Şarj olduqda deaktiv edin"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Telefonun batareyası <xliff:g id="PERCENT">%1$s</xliff:g> olduqda Enerjiyə qənaət deaktiv edilir"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Planşetin batareyası <xliff:g id="PERCENT">%1$s</xliff:g> olduqda Enerjiyə Qənaət deaktiv edilir"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Cihazın batareyası <xliff:g id="PERCENT">%1$s</xliff:g> olduqda Enerjiyə Qənaət deaktiv edilir"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Telefonunuz <xliff:g id="PERCENT">%1$s</xliff:g>-dən çox şarj olduqda Enerjiyə Qənaət deaktiv edilir"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Planşetiniz <xliff:g id="PERCENT">%1$s</xliff:g>-dən çox şarj olduqda Enerjiyə Qənaət deaktiv edilir"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Cihazınız <xliff:g id="PERCENT">%1$s</xliff:g>-dən çox şarj olduqda Enerjiyə Qənaət deaktiv edilir"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Aktiv edin"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Sıfırlayın"</string>
     <string name="tts_play" msgid="2945513377250757221">"Oxutma"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN (Virtual Şəxsi Şəbəkələr)"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Uyğunlaşan bağlantı"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"şəbəkə bağlantılarınızı avtomatik idarə edərək batareyanın ömrünü artırır və cihazın performansını yaxşılaşdırır"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Etimadnamə yaddaşı"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Sertifikat quraşdırın"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Sertifikatları yaddaşdan quraşdırın"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"İstifadəçi məlumatı"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Saxlanılan məlumatlara baxın və dəyişin"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Qabaqcıl ayarlar"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Saxlama növü"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Avadanlıq təminatı"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Yalnız proqram"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Kredensiallar bu istifadəçi üçün əlçatan deyil"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN və tətbiq üçün quraşdırılıb"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi üçün quraşdırılıb"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Terminalda ödəniş"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Ödəniş tətbiqini ayarlayın. Sonra telefonunuzun arxa tərəfini kontaktsız simvolu olan hər hansı terminala tərəf tutun."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Anladım"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Digər..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Daha çox…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Defolt ödəniş tətbiqini ayarlayın"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Defolt ödəniş tətbiqini güncəlləyin"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Kontaktsız terminalda <xliff:g id="APP">%1$s</xliff:g> ilə ödəyin:"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Həmişə bu zənglər üçün istifadə edin"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Data üçün SIM seçin"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"SMS üçün SIM seçin"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Data SİM-i dəyişdirilir, bu bir neçə dəqiqə çəkə bilər..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Data SİM-i dəyişdirilir, bu bir neçə dəqiqə çəkə bilər…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Çağrı üçün SIM:"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"SIM kart seçin"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"rejim, cədvəl, enerjiyə qənaət, batareyaya qənaət, batareya, avtomatik, faiz"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volt, qabaqcıl zəng, 4g zəng"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"dil əlavə edin, bir dil əlavə edin"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"mətn ölçüsü"</string>
     <string name="default_sound" msgid="6604374495015245195">"Defolt səs"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Zəng &amp; bildiriş səsi səviyyəsi <xliff:g id="PERCENTAGE">%1$s</xliff:g> faizdir"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Səs, vibrasiya, \"Narahat etməyin\" rejimi"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Səsləri aktiv edin"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Canlı Subtitrlər"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Avtomatik başlıq mediası"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Heç biri"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> cədvəl ayarlanıb</item>
-      <item quantity="one">1 cədvəl ayarlanıb</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Heç biri}=1{1 cədvəl ayarlanıb}other{# cədvəl ayarlanıb}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Narahat Etməyin"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Yalnız vacib şəxs və tətbiqlərdən bildiriş alın."</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Kəsintiləri məhdudlaşdırın"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Yalnız prioritet"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Aktiv / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Deaktiv / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Deaktiv"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Aktiv"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Həmişə soruşun"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Deaktiv edənə qədər"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> saat</item>
-      <item quantity="one">1 saat</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> dəqiqə"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> nəzarət avtomatik aktiv edilə bilər</item>
-      <item quantity="one">1 nəzarət avtomatik aktiv edilə bilər</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 saat}other{# saat}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 dəqiqə}other{# dəqiqə}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Deaktiv}=1{Deaktiv / 1 cədvəl avtomatik aktiv edilə bilər}other{Deaktiv / # cədvəl avtomatik aktiv edilə bilər}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Narahat Etməyin rejimini nə durdura bilər"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Şəxslər"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Tətbiqlər"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Mühüm olmayan bildirişləri avtomatik olaraq \"Daha az əhəmiyyətli\" seçiminə ayarlayın"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Adaptiv bildiriş sıralaması"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Bildirişləri avtomatik olaraq aktuallığına görə sıralayın"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Adaptiv bildiriş rəyi"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Bildirişlərə edilən tənzimləmələri göstərin və sistemə rəy bildirmək üçün seçimi göstərin"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Təklif edilən əməliyyat və cavablar"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Təklif edilən əməliyyat və cavabları avtomatik göstərin"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Son və mürgü rejiminə keçirilmiş bildirişləri göstərin"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"\"Narahat etməyin\" girişi"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"\"Narahat etməyin\" rejiminə icazə verin"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Heç bir tətbiq \"Narahat etməyin\" girişi sorğusu göndərməyib"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Tətbiqlər endirilir..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Tətbiqlər yüklənir…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Təklifinizə əsasən Android tətbiq bildirişinin bu cihazda görünməsini blok edir"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Təklifinizə əsasən Android bu kateqoriyalı bildirişin cihazda görünməsini blok edir"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Təklifinizə əsasən Android bu qrupdan olan bildirişin cihazda görünməsini blok edir"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Bütün söhbətlər"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Prioritet söhbətlər"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Heç biri"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> söhbət</item>
-      <item quantity="one">1 söhbət</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Heç biri"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Heç biri}=1{1 söhbət}other{# söhbət}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Kim bölə bilər"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Zənglər"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Çağrılar"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"İcazə verilən zənglərin səs çıxardığından əmin olmaq üçün cihazın zəng çalmağa ayarlandığını yoxlayın"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"\"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" üçün daxil olan zənglər blok edilir. Dostlar, ailə və ya digər kontakların əlaqə saxlaması üçün ayarları tənzimləyə bilərsiniz."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Ulduzlanmış kontaktlar"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> digər</item>
-      <item quantity="one">1 digər</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Heç biri"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Heç biri}=1{{contact_1}}=2{{contact_1} və {contact_2}}=3{{contact_1}, {contact_2} və {contact_3}}other{{contact_1}, {contact_2} və daha # kontakt}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Mesajlar"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"mesajlar"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Mesajlar"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"\"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" üçün gələn mesajlar blok edilir. Dostlar, ailə və ya digər kontakların Sizinlə əlaqə saxlaması üçün ayarları tənzimləyə bilərsiniz."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Bütün mesajlar sizə çata bilər"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Bütün zənglər sizə çata bilər"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Heç biri"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontakt</item>
-      <item quantity="one">1 kontakt</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Heç biri}=1{1 kontakt}other{# kontakt}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"İstənilən şəxs"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Kontaktlar"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Ulduzlanmış kontaktlar"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Bütün bildirişlər"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Bəzi bildirişlər"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Tətbiqlərə bölmək icazəsi verməsəniz belə, seçilmiş şəxslər hələ də sizinlə əlaqə saxlaya bilər"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> bölə bilər</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> bölə bilər</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"daha <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Heç bir tətbiq bölə bilməz}=1{{app_1} bölə bilər}=2{{app_1} və {app_2} bölə bilər}=3{{app_1}, {app_2} və {app_3} bölə bilər}other{{app_1}, {app_2} və daha # tətbiq bölə bilər}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Tətbiqlər"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Bütün bildirişlər"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Bəzi bildirişlər"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Bölə bilən bildirişlər"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Bütün bildirişlərə icazə verin"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> bölə bilər</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> bölə bilər</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Heç nə bölə bilməz"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"daha <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Heç nə bölə bilməz}=1{{sound_category_1} bölə bilər}=2{{sound_category_1} və {sound_category_2} bölə bilər}=3{{sound_category_1}, {sound_category_2} və {sound_category_3} bölə bilər}other{{sound_category_1}, {sound_category_2} və daha # tətbiq bölə bilər}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Heç nə bölə bilməz"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Heç kim bölə bilməz"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Bəzi şəxslər bölə bilər"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Bütün şəxslər bölə bilər"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB nəzarətçisi"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Qoşulmuş cihaz"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Bu cihaz"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Dəyişdirilir..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Dəyişdirilir…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Dəyişdirmək alınmadı"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Enerji dodlurulması"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Qoşulmuş cihaza enerji doldurulur"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Detallara baxın"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Data Qənaəti"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Məhdudlaşdırılmamış data"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Arxa fon datası deaktiv edilib"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Arxa fon datası deaktiv edilib"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Aktiv"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Deaktiv"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Data Qənaətindən istifadə edin"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Cihaz kilidlidirsə, bildirişlərdə cavab və ya digər mətnlərin yazılmasının qarşısını alın."</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Defolt orfoqrafik yoxlama"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Orfoqrafik yoxlama seçin"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Orfoqrafik yoxlama işlədin"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Orfoqrafik yoxlamadan istifadə edin"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Seçilməyib"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(heç biri)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Yaddaşda boş yer yaratmaq üçün, yaddaş meneceri yedəklənmiş foto və videoları cihazınızdan silir."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Foto və videoları silin"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Yaddaş Meneceri"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Yaddaş menecerindən istifadə edin"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Yaddaş menecerindən istifadə edin"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Avtomatik"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Təlimat"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"İndi yer boşaldın"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Telefonu yoxlamaq üçün iki dəfə tıklayın"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Planşeti yoxlamaq üçün iki dəfə tıklayın"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Cihazı yoxlamaq üçün iki dəfə tıklayın"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Bildirişlər üçün sürüşdürün"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Bildirişləri göstərmək üçün ekranın aşağı kənarından aşağıya doğru sürüşdürün"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Bir əlli rejim"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Bir əlli rejimdən istifadə edin"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Tətbiqləri dəyişərkən çıxış edin"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Taymaut"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 saniyə"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 saniyə"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 saniyə"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"əlçatanlıq"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Vaxt, bildiriş və digər məlumatı yoxlamaq üçün iki dəfə ekrana klikləyin."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Telefonu yoxlamaq üçün qaldırın"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Planşeti yoxlamaq üçün qaldırın"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Planşeti yoxlamaq üçün klikləyin"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Cihazı yoxlamaq üçün klikləyin"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Vaxt, bildiriş və digər məlumatı yoxlamaq üçün ekrana klikləyin."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Həyəcan düyməsi"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Enerji düyməsini 5 dəfə cəld basdıqda fövqəladə SOS əməliyyatları başladılsın."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Xəbərdarlıq səsi"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Əməliyyatlara başlamazdan əvvəl bildirilsin"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Fövqəladə hal kontaktları"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Bildirişlər üçün barmaq izinizi sürüşdürün"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Barmaq izini sürüşdürün"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Bildirişləri yoxlamaq üçün, barmaq izi sensorunda aşağı sürüşdürün."</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Bütün tətbiqlər üçün aktivləşdirin"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Qrafik Disk seçin"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Defolt"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Oyun Diski"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Oyun Drayveri"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Tərtibatçı Sürücüsü"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Qrafik Sistem Diski"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Şəbəkə tapılmadı. Yenidən cəhd edin."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(qadağandır)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"SIM kart yoxdur"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"SIM yoxdur"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Heç biri"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Qoşulmaq üçün SIM tələb olunur"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Qoşulmaq üçün <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> SIM tələb olunur"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Tərcih edilmiş şəbəkə rejimi: WCDMA tərcih edilir"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Tərcih edilmiş şəbəkə rejimi: Yalnız GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Tərcih edilmiş şəbəkə rejimi: yalnız WCDMA"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobil data"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Mobil şəbəkədən istifadə edərək dataya daxil olun"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Aralıqda olduqda telefon avtomatik bu operatora keçəcək"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"SIM kart əlçatan deyil"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Zəng seçimi"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS seçimi"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Həmişə soruşun"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Ayarlarda ekranların üst-üstə yerləşdirilməsinə icazə verin"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Digər tətbiqlər üzərində görüntülənə biləcək tətbiqlərə Ayarlar ekranlarını üst-üstə yerləşdirməyə icazə verin"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Media"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Media sessiyası bitdikdə oyunçunu gizlədin"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Oyunçu genişləndirilmiş Sürətli Ayarlar panelindən sessiyaya davam etməyə icazə verir."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Sürətli Ayarlarda media pleyer"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Oxutmanı asanlıqla davam etdirmək üçün media pleyeri daha uzun müddət göstərin"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Oyunçunu gizlədin"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Oyunçunu göstərin"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Əlçatan oyunçu yoxdur"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"İcazəli tətbiqlər"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"media"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth aktivləşəcək"</string>
 </resources>
diff --git a/res/values-b+sr+Latn/arrays.xml b/res/values-b+sr+Latn/arrays.xml
index 65beb05..26bbd96 100644
--- a/res/values-b+sr+Latn/arrays.xml
+++ b/res/values-b+sr+Latn/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Srednje"</item>
     <item msgid="6740026006576843477">"Dugačko"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Kratko"</item>
+    <item msgid="7397961711906421599">"Srednje"</item>
+    <item msgid="4079132024502041928">"Dugo"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Podrazumevano"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Globalna"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Samo TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Globalno"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index d3e9dde..cb2ca6d 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -298,7 +298,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Prikaži podatke o profilu na zaključanom ekranu"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Nalozi"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Lokacija"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Koristi lokaciju"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Koristite lokaciju"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Isključena"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">Uključeno – <xliff:g id="COUNT_1">%1$d</xliff:g> aplikacija ima pristup lokaciji</item>
@@ -332,6 +332,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Potvrdite identitet licem"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Započnite"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Ako je otključavanje licem sa funkcijom pristupačnosti isključeno, neki koraci za podešavanje možda neće ispravno raditi sa TalkBack-om."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Nazad"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Nastavite podešavanje"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Koristite podeš. za pristupačn."</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -627,7 +630,6 @@
       <item quantity="other">Mora da sadrži manje od <xliff:g id="NUMBER_1">%d</xliff:g> cifara</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Administrator uređaja ne dozvoljava upotrebu nedavno korišćenog PIN-a"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"IT administrator blokira česte PIN-ove. Izaberite drugi PIN."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Ne sme da obuhvata nevažeći znak"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Mora da sadrži najmanje jedno slovo"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Mora da sadrži najmanje jednu cifru"</string>
@@ -668,7 +670,6 @@
       <item quantity="other">Mora da sadrži najmanje <xliff:g id="COUNT">%d</xliff:g> znakova koji nisu brojevi</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Administrator uređaja ne dozvoljava upotrebu nedavno korišćene lozinke"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"IT administrator blokira česte lozinke. Izaberite drugu lozinku."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Rastući, opadajući ili ponovljeni niz cifara nije dozvoljen"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Potvrdi"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Otkaži"</string>
@@ -812,7 +813,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Uključivanje Wi-Fi-ja"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Koristi Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Koristi Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wi-Fi podešavanja"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Podešavanje i upravljanje bežičnim pristupnim tačkama"</string>
@@ -920,7 +921,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Postavite QR kôd u nastavku da biste dodali uređaj na mrežu „<xliff:g id="SSID">%1$s</xliff:g>“"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Povežite se na Wi‑Fi mrežu tako što ćete skenirati QR kôd"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Deli Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Skenirajte ovaj QR kôd da biste se povezali sa „<xliff:g id="SSID">%1$s</xliff:g>“ i delili lozinku"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Skenirajte ovaj QR kôd pomoću drugog uređaja da biste se pridružili mreži <xliff:g id="SSID">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Skenirajte ovaj QR kôd da biste se pridružili mreži „<xliff:g id="SSID">%1$s</xliff:g>“"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Probajte ponovo. Ako se problem nastavi, kontaktirajte proizvođača uređaja"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Došlo je do greške"</string>
@@ -946,8 +947,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Lozinka za Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Lozinka hotspota: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Automatsko povezivanje"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Dozvolite telefonu da se automatski povezuje u blizini ove mreže"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Dozvolite tabletu da se automatski povezuje u blizini ove mreže"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Dozvolite povezivanje sa ovom mrežom kada je uređaj u dometu"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Dodaj uređaj"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Koristite QR kôd da biste dodali uređaj na ovu mrežu"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR kôd nije u važećem formatu"</string>
@@ -959,7 +959,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Koristi sertifikate sistema"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Ne pružaj"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Ne proveravaj"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Nije naveden nikakav sertifikat. Veza neće biti privatna."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Naziv mreže je predugačak."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Morate da navedete domen."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Sertifikat je obavezan."</string>
@@ -986,6 +985,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Poveži"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi je uključen"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Povezano je na mrežu <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Povezujete se na <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Povezuje se…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Povezivanje sa mrežom nije uspelo"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Mreža nije u dometu"</string>
@@ -1060,7 +1060,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Aplikacija deli sadržaj. Da biste delili internet vezu, isključite, pa uključite hotspot"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Niste podesili lozinku"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Naziv hotspota"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> se uključuje..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Uključuje se Wi-Fi hotspot <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Drugi uređaji mogu da se povežu sa hotspotom <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Lozinka hotspota"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Opseg pristupne tačke"</string>
@@ -1210,7 +1210,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Tečni prikaz"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Automatski podiže učestalost osvežavanja sa 60 na 90 Hz za određeni sadržaj. Povećava potrošnju baterije."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Tečni prikaz"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Nametni učestalost osvežavanja od 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Najveća učestalost osvežavanja za poboljšan odziv na dodir i kvalitet animacije. Povećava potrošnju baterije."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Pažnja ekrana"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Uključeno/ekran se neće isključiti ako gledate u njega"</string>
@@ -1350,7 +1350,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android verzija"</string>
     <string name="security_patch" msgid="4071756145347865382">"Bezbednosno ažuriranje za Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Model"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Model: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Model i hardver"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Verzija hardvera"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ID opreme"</string>
@@ -1625,31 +1624,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Podešavanja mreže su resetovana"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Brisanje SIM kartica nije uspelo"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Preuzete SIM kartice ne mogu da se obrišu zbog greške.\n\nRestartujte uređaj i probajte ponovo."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Izbriši sve podatke (vrati na fabrička podešavanja)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Izbriši sve podatke (vrati na fabrička podešavanja)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Ovim brišete sve podatke iz "<b>"interne memorije"</b>" tableta, uključujući:\n\n"<li>"Google nalog"</li>\n<li>"podatke i podešavanja sistema i aplikacija"</li>\n<li>"preuzete aplikacije"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Ovim brišete sve podatke iz "<b>"interne memorije"</b>" telefona, uključujući:\n\n"<li>"Google nalog"</li>\n<li>"Podaci i podešavanja sistema i aplikacija"</li>\n<li>"Preuzete aplikacije"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Trenutno ste prijavljeni na sledeće naloge:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Na ovom uređaju su prisutni i drugi korisnici.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Muzika"</li>\n<li>"Fotografije"</li>\n<li>"Drugi korisnički podaci"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM-ovi"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Na taj način nećete otkazati mobilni tarifni paket."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Da biste obrisali muziku, slike i druge korisničke podatke, treba da izbrišete "<b>"USB memoriju"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Da biste obrisali muziku, slike i druge korisničke podatke, treba da izbrišete sadržaj "<b>"SD kartice"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Obriši sve podatke (resetovanje na Fabrička podešavanja)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Obriši sve podatke (resetovanje na Fabrička podešavanja)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Ovim brišete sve podatke iz "<b>"interne memorije"</b>" tableta, uključujući:\n\n"<li>"Google nalog"</li>\n<li>"podatke i podešavanja sistema i aplikacija"</li>\n<li>"preuzete aplikacije"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Ovim brišete sve podatke iz "<b>"interne memorije"</b>" telefona, uključujući:\n\n"<li>"Google nalog"</li>\n<li>"podatke i podešavanja sistema i aplikacija"</li>\n<li>"preuzete aplikacije"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Trenutno ste prijavljeni na sledeće naloge:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Na ovom uređaju su prisutni i drugi korisnici.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Muzika"</li>\n<li>"Slike"</li>\n<li>"Drugi podaci korisnika"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM-ovi"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Na taj način nećete otkazati mobilni tarifni paket."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Da biste obrisali muziku, slike i druge podatke korisnika, treba da obrišete "<b>"USB memoriju"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Da biste obrisali muziku, slike i druge podatke korisnika, treba da obrišete sadržaj "<b>"SD kartice"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Izbriši USB memoriju"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Izbriši SD karticu"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Obriši sve podatke iz interne USB memorije, kao što su muzika i fotografije."</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Izbriši sve podatke sa SD kartice, kao što su muzika ili fotografije"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Izbriši sve podatke"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Izbriši sve podatke"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Izbrisaćete sve lične informacije i preuzete aplikacije. Ova radnja ne može da se opozove."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Sve lične informacije, uključujući preuzete aplikacije i SIM kartice, biće izbrisane. Ova radnja ne može da se opozove."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Izbriši sve"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Nije obavljeno vraćanje na početne vrednosti zato što usluga brisanja sistema nije dostupna."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Izbrisati sve podatke?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Resetovanje na fabrička podešavanja nije dostupno za ovog korisnika"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Brisanje"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Sačekajte..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Obriši sve podatke"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Obriši sve podatke"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Izbrisaćete sve lične podatke i preuzete aplikacije. Ova radnja ne može da se opozove."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Svi lični podaci, uključujući preuzete aplikacije i SIM kartice, biće izbrisani. Ova radnja ne može da se opozove."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Želite da obrišete sve podatke?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Resetovanje na fabrička podešavanja nije dostupno za ovog korisnika"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Briše se"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Sačekajte…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Podešavanja poziva"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Podešavanje glasovne pošte, preusmeravanja poziva, stavljanja poziva na čekanje, ID-a pozivaoca"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB privezivanje"</string>
@@ -1697,7 +1694,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Privezivanje na više od <xliff:g id="MAXCONNECTION">%1$d</xliff:g> uređaja nije moguće."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Internet veza sa uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g> će biti prekinuta."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Privezivanje eterneta"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Delite internet vezu telefona preko USB eterneta"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Delite internet vezu telefona preko eterneta"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Koristite hotspot i privezivanje da biste obezbedili internet drugim uređajima pomoću veze za mobilne podatke. Aplikacije mogu da prave hotspotove i za deljenje sadržaja sa uređajima u blizini."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Koristite hotspot i privezivanje da biste omogućili internet na drugim uređajima pomoću Wi‑Fi veze ili veze za prenos podataka preko mobilnog operatera. Aplikacije mogu i da prave hotspotove za deljenje sadržaja sa uređajima u blizini."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Pomoć"</string>
@@ -2141,13 +2138,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Podešavanja titla"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Uvećanje"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Oblast za uvećanje"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Omogućite uvećanje"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Odaberite oblasti za uvećanje koje želite da koristite kada uvećavate ekran"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Ceo ekran"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Deo ekrana"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Ceo ekran i deo ekrana"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Uvećajte ceo ekran"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Uvećajte deo ekrana"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Želite li da pređete na dugme Pristupačnost?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Ako uvećate deo ekrana pomoću trostrukog dodira, unos teksta i druge radnje se odlažu.\n\nŽelite li da pređete na uveličavanje pomoću dugmeta Pristupačnost?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Pređi na dugme Pristupačnost"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Zadrži uveličavanje pomoću trostrukog dodira"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Podešavanja uvećanja"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Uvećanje pomoću trostrukog dodira"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Uvećavajte pomoću prečice"</string>
@@ -2201,11 +2201,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Dugme uključi/isključi prekida poziv"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Veliki pokazivač miša"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Ukloni animacije"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Mono zvuk"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Kombinuj kanale pri puštanju audio sadržaja"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Balans zvuka"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Levo"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Desno"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Mono zvuk"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Kombinujte kanale pri puštanju audio sadržaja"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Balans zvuka"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Levo"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Desno"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Podrazumevano"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 sekundi"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 sekundi"</string>
@@ -2235,11 +2235,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Vibriranje obaveštenja"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Vibriranje zvona"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Dodirne povratne informacije"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Koristite aplikaciju <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Otvorite aplikaciju <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Koristi korekciju boja"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Prikaži titl"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Samo za podržane aplikacije"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Koristite aplikaciju <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Otvorite aplikaciju <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Koristite korekciju boja"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Prikažite titl"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Samo za podržane aplikacije"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Veličina i stil titla"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Veličina teksta: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Još opcija"</string>
@@ -2270,6 +2270,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomalija"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomalija"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomalija"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Sivilo"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Crveno-zeleno"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Crveno-zeleno"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Plavo-žuto"</string>
@@ -2405,7 +2406,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Ograničenje aplikacija u pozadini"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Dozvolite aplikaciji da se pokreće u pozadini"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Aplikacije kojima nije dozvoljeno pokretanje u pozadini"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Aplikacije u pozadini ne možete da ograničite"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Korišćenje u pozadini ne možete da ograničite"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Želite li da ograničite aktivnosti u pozadini?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Ako ograničite aktivnosti aplikacije u pozadini, možda će se ponašati neočekivano."</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Apl. nije podešena za optimizaciju baterije, pa ne možete da je ograničite. \n\nZa ogr. apl. uključite optimizaciju baterije."</string>
@@ -2629,9 +2630,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Podesite raspored"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Produžite trajanje baterije"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Isključi kada se napuni"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Ušteda baterije se isključuje kada je telefon na <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Ušteda baterije se isključuje kada je tablet na <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Ušteda baterije se isključuje kada je uređaj na <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Ušteda energije se isključuje kada je telefon napunjen više od <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Ušteda energije se isključuje kada je tablet napunjen više od <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Ušteda energije se isključuje kada je uređaj napunjen više od <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Uključi"</string>
@@ -2696,6 +2697,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Resetuj"</string>
     <string name="tts_play" msgid="2945513377250757221">"Pusti"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Prilagodljivo povezivanje"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Produžuje trajanje baterije i poboljšava učinak uređaja tako što automatski upravlja mrežnim vezama"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Skladište akreditiva"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Instaliraj sertifikat"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Instaliraj sertifikate iz memorije"</string>
@@ -2707,9 +2710,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Korisnički akreditivi"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Pregledajte i menjajte sačuvane akreditive"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Napredna"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Tip memorijskog prostora"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Podržan hardverom"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Samo softverski"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Akreditivi nisu dostupni za ovog korisnika"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Instalirano za VPN i aplikacije"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Instalirano za Wi-Fi"</string>
@@ -3103,7 +3103,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Plaćanje na terminalu"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Podesite aplikaciju za plaćanje. Zatim samo zadržite zadnji deo telefona pored bilo kog terminala sa simbolom za povezivanje bez kontakta."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Važi"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Još..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Još…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Podesite podrazumevanu aplikaciju za plaćanje"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Ažurirajte podrazumevanu aplikaciju za plaćanje"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Na terminalu za beskontaktno plaćanje koristiće se <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3187,7 +3187,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Uvek koristi ovo za pozive"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Izaberite SIM karticu za podatke"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Izaberite SIM za SMS-ove"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Prebacuje se SIM za podatke. To može da potraje do jedan minut..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Prebacuje se SIM za podatke. To može da potraje do jedan minut…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Pozovi pomoću"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Izbor SIM kartice"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM kartica <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3331,6 +3331,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"rutina, raspored, ušteda baterije, ušteda energije, baterija, automatsko, procenat"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, napredno pozivanje, 4g pozivanje"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"dodaj jezik, dodajte jezik"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"veličina teksta"</string>
     <string name="default_sound" msgid="6604374495015245195">"Podrazumevani zvuk"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Jačina zvuka za zvono i obaveštenja je na <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Jačina zvuka, vibracija, Ne uznemiravaj"</string>
@@ -3370,12 +3371,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Zvukovi pri uključivanju"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Titl uživo"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Automatski titl za medije"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Ništa"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> raspored je podešen</item>
-      <item quantity="few"><xliff:g id="ON_COUNT">%d</xliff:g> rasporeda su podešena</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> rasporeda je podešeno</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Nijedan}=1{1 raspored je podešen}one{# raspored je podešen}few{# rasporeda su podešena}other{# rasporeda je podešeno}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Ne uznemiravaj"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Dobijajte obaveštenja samo od važnih osoba i aplikacija"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Ograničite prekide"</string>
@@ -3443,22 +3439,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Samo prioritetni prekidi"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Uključeno / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Isključeno / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Isključeno"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Uključeno"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Pitaj svaki put"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Dok ne isključite"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> sat</item>
-      <item quantity="few"><xliff:g id="NUM_HOURS">%d</xliff:g> sata</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> sati</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> min"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> raspored može da se uključuje automatski</item>
-      <item quantity="few"><xliff:g id="ON_COUNT">%d</xliff:g> rasporeda mogu da se uključuju automatski</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> rasporeda može da se uključuje automatski</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 sat}one{# sat}few{# sata}other{# sati}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minut}one{# minut}few{# minuta}other{# minuta}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Isključeno}=1{Isključeno/1 raspored može da se uključuje automatski}one{Isključeno/# raspored može da se uključuje automatski}few{Isključeno/# rasporeda mogu da se uključuju automatski}other{Isključeno/# rasporeda može da se uključuje automatski}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Šta može da prekine režim Ne uznemiravaj"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Ljudi"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Aplikacije"</string>
@@ -3504,6 +3490,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Automatski podešava obaveštenja nižeg prioriteta na Diskretno"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Prilagodljivo rangiranje obaveštenja"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Automatski rangira obaveštenja prema relevantnosti"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Povratne informacije o prilagodljivim obaveštenjima"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Označite podešavanja obaveštenja i prikažite opciju za slanje povratnih informacija sistemu"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Predložene radnje i odgovori"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Automatski prikazuje predložene radnje i odgovore"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Pogledajte nedavna i odložena obaveštenja"</string>
@@ -3705,7 +3693,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Pristup opciji Ne uznemiravaj"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Dozvoli režim Ne uznemiravaj"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Nijedna instalirana aplikacija nije zahtevala pristup opciji Ne uznemiravaj"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Učitavaju se aplikacije..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Aplikacije se učitavaju…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Na vaš zahtev, Android blokira prikazivanje obaveštenja ove aplikacije na ovom uređaju"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Na vaš zahtev, Android blokira prikazivanje ove kategorije obaveštenja na ovom uređaju"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Na vaš zahtev, Android blokira prikazivanje ove grupe obaveštenja na ovom uređaju"</string>
@@ -3800,12 +3788,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Sve konverzacije"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Prioritetne konverzacije"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Ništa"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> konverzacija</item>
-      <item quantity="few"><xliff:g id="CONVERSATIONS">%d</xliff:g> konverzacije</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> konverzacija</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Ništa"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Nijedna}=1{1 konverzacija}one{# konverzacija}few{# konverzacije}other{# konverzacija}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Ko može da prekida"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Pozivi"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Pozivi"</string>
@@ -3814,12 +3797,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Da biste bili sigurni da će se dozvoljeni pozivi čuti, proverite da li je uređaj podešen da zvoni"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Dolazni pozivi su blokirani za „<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>“. Možete da prilagodite podešavanja i dozvolite prijateljima, članovima porodice ili drugim kontaktima da dopru do vas."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Kontakti sa zvezdicom"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one">Još <xliff:g id="NUM_PEOPLE">%d</xliff:g> osoba</item>
-      <item quantity="few">Još <xliff:g id="NUM_PEOPLE">%d</xliff:g> osobe</item>
-      <item quantity="other">Još <xliff:g id="NUM_PEOPLE">%d</xliff:g> osoba</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Ništa"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Nijedan}=1{{contact_1}}=2{{contact_1} i {contact_2}}=3{{contact_1}, {contact_2} i {contact_3}}one{{contact_1}, {contact_2} i još #}few{{contact_1}, {contact_2} i još #}other{{contact_1}, {contact_2} i još #}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Poruke"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"poruke"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Poruke"</string>
@@ -3828,12 +3806,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Dolazne poruke su blokirane za „<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>“. Možete da prilagodite podešavanja i dozvolite prijateljima, članovima porodice ili drugim kontaktima da dopru do vas."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Dostupni ste za sve poruke"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Dostupni ste za sve pozive"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Ništa"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontakt</item>
-      <item quantity="few"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontakta</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontakata</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Nijedan}=1{1 kontakt}one{# kontakt}few{# kontakta}other{# kontakata}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Svi"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Kontakti"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Kontakti sa zvezdicom"</string>
@@ -3871,24 +3844,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Sva obaveštenja"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Neka obaveštenja"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Izabrani ljudi i dalje dopiru do vas čak i ako ne omogućite aplikacijama da vas prekidaju"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one"><xliff:g id="APP_NAMES">%s</xliff:g> mogu da prekinu</item>
-      <item quantity="few"><xliff:g id="APP_NAMES">%s</xliff:g> mogu da prekinu</item>
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> mogu da prekinu</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"Još <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Nijedna aplikacija ne može da prekine}=1{{app_1} može da prekine}=2{{app_1} i {app_2} mogu da prekinu}=3{{app_1}, {app_2} i {app_3} mogu da prekinu}one{Aplikacije {app_1}, {app_2} i još # mogu da prekinu}few{Aplikacije {app_1}, {app_2} i još # mogu da prekinu}other{Aplikacije {app_1}, {app_2} i još # mogu da prekinu}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Aplikacije"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Sva obaveštenja"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Neka obaveštenja"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Obaveštenja koja mogu da prekidaju"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Omogući sva obaveštenja"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> mogu da prekinu</item>
-      <item quantity="few"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> mogu da prekinu</item>
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> mogu da prekinu</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Ništa ne može da prekine"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"Još <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Ništa ne može da prekine}=1{{sound_category_1} može da prekine}=2{{sound_category_1} i {sound_category_2} mogu da prekinu}=3{{sound_category_1}, {sound_category_2} i {sound_category_3} mogu da prekinu}one{Zvukovi {sound_category_1}, {sound_category_2} i još # mogu da prekinu}few{Zvukovi {sound_category_1}, {sound_category_2} i još # mogu da prekinu}other{Zvukovi {sound_category_1}, {sound_category_2} i još # mogu da prekinu}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Ništa ne može da prekine"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Niko ne može da prekine"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Neki ljudi mogu da prekinu"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Svi ljudi mogu da prekinu"</string>
@@ -4142,7 +4105,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB kontroliše:"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Povezani uređaj"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Ovaj uređaj"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Menja se..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Menja se…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Promena nije uspela"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Punjenje uređaja"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Punjenje povezanog uređaja"</string>
@@ -4396,7 +4359,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Prikaži detalje"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Ušteda podataka"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Neograničen pristup podacima"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Prenos podataka u pozadini je isključen"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Pozadinski podaci su isključeni"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Uključeno"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Isključeno"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Koristi Uštedu podataka"</string>
@@ -4419,7 +4382,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Ako je uređaj zaključan, spreči unos odgovora ili drugog teksta u obaveštenja"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Podrazumevana provera pravopisa"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Izaberite proveru pravopisa"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Koristi proveru pravopisa"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Koristite proveru pravopisa"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Nije izabrano"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(nijedno)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4513,7 +4476,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Da bi oslobodio memorijski prostor, menadžer memorijskog prostora uklanja rezervne kopije slika i video snimaka sa uređaja."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Uklonite slike i video"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Menadžer memorijskog prostora"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Koristi Menadžer memorijskog prostora"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Koristite menadžer memorijskog prostora"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automatska"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Ručna"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Oslobodi prostor"</string>
@@ -4551,6 +4514,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Dvaput dodirnite telefon da biste ga proverili"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Dvaput dodirnite tablet da biste ga proverili"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Dvaput dodirnite uređaj da biste ga proverili"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Prevucite za obaveštenja"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Prevucite nadole na donjoj ivici ekrana radi prikazivanja obaveštenja"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Režim jednom rukom"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Koristi režim jednom rukom"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Izađi pri prelasku sa jedne aplikacije na drugu"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Vremensko ograničenje"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 sekunde"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 sekundi"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 sekundi"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"dostupnost"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Da biste proverili vreme, obaveštenja i druge informacije, dvaput dodirnite ekran."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Podignite telefon da biste ga proverili"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Podignite tablet da biste ga proverili"</string>
@@ -4563,6 +4536,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Dodirnite da biste proverili tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Dodirnite da biste proverili uređaj"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Da biste proverili vreme, obaveštenja i druge informacije, dodirnite ekran."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Dugme alarma za paniku"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Da biste pokrenuli radnje za hitne slučajeve, brzo dodirnite dugme za uključivanje 5 puta."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Zvuk upozorenja"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Upozorenje pre početka radnji"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Kontakti za hitne slučajeve"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Prevucite prstom za obaveštenja"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Prevucite prstom"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Da biste proverili obaveštenja, prevucite prstom nadole po senzoru za otisak prsta na zadnjoj strani telefona."</string>
@@ -4724,7 +4702,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Omogući za sve aplikacije"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Izaberite upravljački program za grafiku"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Podrazumevano"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Upravljački program za igre"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Upravljački program za igre"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Upravljački program za programere"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Sistemski upravljački program za grafiku"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4793,6 +4771,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Nismo uspeli da pronađemo mreže. Probajte ponovo."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(zabranjeno)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Nema SIM kartice"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Nema SIM kartice"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Nema"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Neophodan je SIM radi povezivanja"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Neophodan je <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> SIM radi povezivanja"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Željeni režim mreže: WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Željeni režim mreže: samo GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Željeni režim mreže: samo WCDMA"</string>
@@ -4846,6 +4829,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobilni podaci"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Koristi podatke preko mobilne mreže"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Telefon će automatski preći na ovog operatera kada bude u dometu"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"SIM kartica nije dostupna"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Podešavanje poziva"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Željena podešavanja za SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Pitaj svaki put"</string>
@@ -5031,10 +5015,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Dozvoli prekrivanje sadržaja ekrana Podešavanja"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Dozolite aplikacijama koje mogu da se prikazuju preko drugih aplikacija da prekrivaju sadržaj ekrana Podešavanja"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Mediji"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Sakrijte plejer kada se sesija medija završi"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Plejer vam dozvoljava da nastavite sesiju iz proširenog okna za brza podešavanja."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Medija plejer u Brzim podešavanjima"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Prikazuje medija plejer u dužem periodu da bi se lako nastavila reprodukcija"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Sakrij plejer"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Prikaži plejer"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Nije dostupan nijedan plejer"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Dozvoljene aplikacije"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"mediji"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth će se uključiti"</string>
 </resources>
diff --git a/res/values-be/arrays.xml b/res/values-be/arrays.xml
index 0e22b48..d103f51 100644
--- a/res/values-be/arrays.xml
+++ b/res/values-be/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Сярэдняя"</item>
     <item msgid="6740026006576843477">"Доўгая"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Кароткая затрымка"</item>
+    <item msgid="7397961711906421599">"Сярэдняя затрымка"</item>
+    <item msgid="4079132024502041928">"Доўгая затрымка"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Стандартная"</item>
     <item msgid="4234707448428002595">"Без засечак"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Глабальная"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Толькі TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Увесь свет"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 7423d90..c50c930 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -300,7 +300,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Паказваць звесткi профiлю на экране блакiроўкі"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Уліковыя запісы"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Месцазнаходжанне"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Выкарыстаць месцазнаходжанне"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Выкарыстоўваць геалакацыю"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Выкл."</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">Укл. – <xliff:g id="COUNT_1">%1$d</xliff:g> праграма мае доступ да даных месцазнаходжання</item>
@@ -335,6 +335,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Выкарыстоўвайце твар для аўтэнтыфікацыі"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Пачаць"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Калі спецыяльныя магчымасці функцыі распазнавання твару выключаны, некаторыя крокі наладкі могуць не працаваць з TalkBack належным чынам."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Назад"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Працягнуць наладку"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Наладка спецыяльных магчымасцей"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -635,7 +638,6 @@
       <item quantity="other">PIN-код павінен змяшчаць менш за <xliff:g id="NUMBER_1">%d</xliff:g> лічбы</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Адміністратар прылады не дазваляе выкарыстоўваць апошні PIN-код"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"IT адміністратар блакіруе папулярныя PIN-коды. Паспрабуйце іншы PIN-код."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Не можа змяшчаць недапушчальны сімвал"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Павінен змяшчаць не менш за адну літару"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Павінен змяшчаць не менш за адну лічбу"</string>
@@ -683,7 +685,6 @@
       <item quantity="other">Павінен змяшчаць не менш за <xliff:g id="COUNT">%d</xliff:g> сімвала, якія не з\'яўляюцца лічбамі</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Адміністратар прылады не дазваляе выкарыстоўваць апошні пароль"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"IT адміністратар блакіруе папулярныя паролі. Паспрабуйце іншы пароль."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Забаронена ўводзіць узрастаючую, убываючую або паўторную паслядоўнасць лічбаў"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Пацвердзіць"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Скасаваць"</string>
@@ -829,7 +830,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Уключыць Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Выкарыстоўваць Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Выкарыстоўваць Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Налады Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Усталяванне бесправадных кропак доступу і кіраванне iмi"</string>
@@ -937,7 +938,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Каб падключыцца да сеткі \"<xliff:g id="SSID">%1$s</xliff:g>\", навядзіце камеру на QR-код, паказаны. ніжэй"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Далучыцеся да сеткі Wi‑Fi, прасканіраваўшы QR-код"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Абагуліць Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Прасканіруйце QR-код, каб падключыцца да сеткі \"<xliff:g id="SSID">%1$s</xliff:g>\" і абагуліць пароль"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Прасканіруйце QR-код з дапамогай іншай прылады, каб далучыцца да сеткі \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Каб падключыцца да \"<xliff:g id="SSID">%1$s</xliff:g>\", прасканіруйце гэты QR-код"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Паўтарыце спробу. Калі памылка застанецца, звярніцеся да вытворцы прылады"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Нешта пайшло не так"</string>
@@ -963,8 +964,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Пароль Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Пароль хот-спота: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Аўтаматычнае падключэнне"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Дазволіць тэлефону аўтаматычна падключацца да гэтай сеткі, калі ён знаходзіцца паблізу ад яе"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Дазвольце планшэту аўтаматычна падключацца да гэтай сеткі, калі ён знаходзіцца паблізу ад яе"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Дазвольце падключэнне да гэтай сеткі, калі сігнал будзе ў межах дасягальнасці"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Дадаць прыладу"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Каб дадаць прыладу ў гэту сетку, скарыстайце QR-код"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR-код мае несапраўдны фармат"</string>
@@ -976,7 +976,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Выкарыстоўваць сістэмныя сертыфікаты"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Не даваць"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Не правяраць"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Сертыфікат не пазначаны. Ваша падлучэнне не будзе прыватным."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Імя сеткі занадта доўгае."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Неабходна ўказаць дамен."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Патрэбны сертыфікат."</string>
@@ -1003,6 +1002,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Падключыцца"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi уключаны"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Падключана да сеткi <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Ідзе падключэнне да сеткі \"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>\""</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Ідзе падключэнне…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Не атрымалася падключыцца да сеткі"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Сетка не ў зоне дасягальнасці"</string>
@@ -1080,7 +1080,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Праграма абагульвае змесціва. Каб абагульваць падключэнне да інтэрнэту, адключыце, а потым зноў уключыце хот-спот"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Пароль не ўстаноўлены"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Назва хот-спота"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Ідзе ўключэнне <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Уключаецца <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Іншыя прылады могуць падключацца да <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Пароль хот-спота"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Дыяпазон частот Wi-Fi"</string>
@@ -1230,7 +1230,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Плаўнае адлюстраванне"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Аўтаматычна павялічвае частату абнаўлення пэўнага змесціва з 60 да 90 Гц. Павышае выкарыстанне зараду акумулятара."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Плаўнае адлюстраванне"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Прымусовая частата абнаўлення: 90 Гц"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Найвышэйшая частата абнаўлення для лепшага рэагавання на дотыкі і вышэйшай якасці анімацыі. Павышае выкарыстанне зараду акумулятара."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Адаптыўны рэжым"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Укл. / Калі глядзець на экран, ён не будзе выключацца"</string>
@@ -1371,7 +1371,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Версія Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Абнаўленне сістэмы бяспекі Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Мадэль"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Мадэль: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Мадэль і апаратнае забеспячэнне"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Версія апаратнага забеспячэння"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Iдэнтыфiкатар абсталявання"</string>
@@ -1646,31 +1645,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Налады сеткі былі скінутыя"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Не ўдалося сцерці даныя SIM"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Памылка сцірання спампаваных SIM.\n\nПеразапусціце прыладу і паўтарыце спробу."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Сцерці ўсе даныя (cкід да заводскіх налад)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Сцерці ўсе даныя (скід да заводскіх налад)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Гэта дазволіць сцерці ўсе даныя з "<b>"унутранага сховішча"</b>" вашага планшэта, у тым ліку:\n\n"<li>"Ваш Уліковы запiс Google"</li>\n<li>"Сістэмныя даныя і налады, а таксама даныя і налады праграм"</li>\n<li>"Спампаваныя праграмы"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Гэта дазволіць сцерці ўсе даныя з "<b>"унутранага сховішча"</b>" вашага тэлефона, у тым ліку:\n\n"<li>"Ваш Уліковы запіс Google"</li>\n<li>"Сістэмныя даныя і налады, а таксама даныя і налады праграм"</li>\n<li>"Спампаваныя праграмы"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"У дадзены момант вы зайшлі ў наступныя ўліковыя запісы:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"На гэтай прыладзе ёсць іншыя карыстальнікі.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Музыка"</li>\n<li>"Фатаграфіі"</li>\n<li>"Іншыя дадзеныя карыстальніка"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM-карты"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Гэта не прывядзе да скасавання вашага тарыфнага плана."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Каб выдаліць музыку, фатаграфіі і іншыя даныя карыстальніка, трэба ачысціць "<b>"USB-назапашвальнік"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Каб выдаліць музыку, фатаграфіі і іншыя даныя карыстальніка, трэба выдаліць інфармацыю з "<b>"SD-карты"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Сцерці ўсе даныя (скід да заводскіх налад)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Сцерці ўсе даныя (скід да заводскіх налад)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Гэта дзеянне дазволіць сцерці ўсе даныя з "<b>"унутранага сховішча"</b>" вашага планшэта, у тым ліку:\n\n"<li>"ваш Уліковы запіс Google;"</li>\n<li>"сістэмныя даныя і налады, а таксама даныя і налады праграм;"</li>\n<li>"спампаваныя праграмы"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Гэта дзеянне дазволіць сцерці ўсе даныя з "<b>"унутранага сховішча"</b>" вашага тэлефона, у тым ліку:\n\n"<li>"ваш Уліковы запіс Google;"</li>\n<li>"сістэмныя даныя і налады, а таксама даныя і налады праграм;"</li>\n<li>"спампаваныя праграмы"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"У дадзены момант вы зайшлі ў наступныя ўліковыя запісы:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"На гэтай прыладзе ёсць іншыя карыстальнікі.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Музыка"</li>\n<li>"Фота"</li>\n<li>"Іншая інфармацыя карыстальніка"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM-карты"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Гэта дзеянне не прывядзе да скасавання вашага тарыфнага плана."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Каб выдаліць музыку, фатаграфіі і іншую інфармацыю карыстальніка, трэба сцерці даныя з "<b>"USB-сховішча"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Каб выдаліць музыку, фатаграфіі і іншую інфармацыю карыстальніка, трэба сцерці даныя з "<b>"SD-карты"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Ачысціць USB-назапашвальнiк"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Сцерці SD-карту"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Выдаліць з унутранага USB-назапашвальнiка ўсе дадзеныя, напрыклад музыку i фатаграфіі"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Выдаліць з SD-карты ўсе дадзеныя, напрыклад музыку i фатаграфіі."</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Сцерці ўсе даныя"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Сцерці ўсе даныя"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Усе вашы асабістыя даныя і спампаваныя праграмы будуць выдалены. Гэта дзеянне нельга адрабіць."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Уся асабістая інфармацыя, у тым ліку спампаваныя праграмы і SIM, будзе выдалена. Гэта дзеянне нельга адрабіць."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Выдаліць усе"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Скід не выкананы, таму што недаступна паслуга Ачысткі сістэмы."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Сцерці ўсе даныя?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Аднаўленне завадскіх параметраў недаступна для гэтага карыстальніка"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Выдаленне"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Калі ласка, пачакайце..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Сцерці ўсе даныя"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Сцерці ўсе даныя"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Уся асабістая інфармацыя і спампаваныя праграмы будуць выдалены. Гэта дзеянне нельга адрабіць."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Уся асабістая інфармацыя, у тым ліку спампаваныя праграмы і SIM-карты, будзе выдалена. Гэта дзеянне нельга адрабіць."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Сцерці ўсе даныя?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Скід да заводскіх налад недаступны для гэтага карыстальніка"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Даныя сціраюцца"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Пачакайце…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Налады выклікаў"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Выбраць галасавую пошту, перанакіраванне выклікаў, чаканне выклікаў, аўтаматычны вызначальнiк нумару"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB-мадэм"</string>
@@ -1718,7 +1715,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Немагчыма падлучыць больш прылад, чым <xliff:g id="MAXCONNECTION">%1$d</xliff:g>."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Адбудзецца адключэнне прылады <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Мадэм Ethernet"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Абагуліць інтэрнэт-падключэнне гэтага тэлефона праз USB Ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Абагуліць інтэрнэт-падключэнне гэтага тэлефона праз Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Выкарыстоўвайце хот-спот і рэжым мадэма для падключэння да інтэрнэту іншых прылад праз мабільную перадачу даных. Праграмы таксама могуць ствараць хот-спот для абагульвання змесціва з прыладамі паблізу."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Для падключэння да інтэрнэту іншых прылад праз Wi-Fi ці мабільную перадачу даных выкарыстоўвайце хот-спот і рэжым мадэма. Для абагульвання змесціва з прыладамі паблізу праграмы таксама могуць ствараць хот-спот."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Даведка"</string>
@@ -2165,13 +2162,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Налады субцітраў"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Павелічэнне"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Вобласць павелічэння"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Уключэнне павелічэння"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Выберыце вобласць павелічэння, якую хочаце выкарыстоўваць падчас павелічэння экрана"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Поўнаэкранны рэжым"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Частка экрана"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Поўнаэкранны рэжым і рэжым паказу часткі экрана"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Павялічыць увесь экран"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Павялічыць частку экрана"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Пераключыцца на кнопку спецыяльных магчымасцей?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Калі для павелічэння часткі экрана выкарыстаць трайное націсканне, будуць прыпынены ўвод тэксту і іншыя дзеянні.\n\nХочаце замест гэтага выкарыстоўваць для павелічэння кнопку спецыяльных магчымасцей?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Перайсці на кнопку спецыяльных магчымасцей"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Захаваць для павелічэння трайное націсканне"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Налады павелічэння"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Павялічваць трайным дотыкам"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Павялічваць спалучэннем клавіш"</string>
@@ -2225,11 +2225,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Завяршыць выклік кнопкай сілкавання"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Вялікі ўказальнік мышы"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Адключыць анімацыю"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Манафанічны гук"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Аб\'ядноўваць каналы пры прайграванні аўдыя"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Баланс гуку"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Злева"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Справа"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Монафанія"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Аб\'ядноўваць каналы пры прайграванні аўдыя"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Баланс аўдыя"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Улева"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Управа"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Стандартны"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 секунд"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 секунд"</string>
@@ -2259,11 +2259,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Вібрацыя пры апавяшчэнні"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Вібрацыя пры выкліку"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Вібрацыя тактыльнага водгуку"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Выкарыстоўваць праграму \"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>\""</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Адкрыць праграму \"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>\""</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Карыстанне карэкцыяй колераў"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Паказваць субцітры"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Толькі для праграмы, якая падтрымліваецца"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Выкарыстоўваць праграму \"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>\""</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Адкрыць праграму \"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>\""</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Выкарыстоўваць карэкцыю колераў"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Паказваць субцітры"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Толькі для праграмы, якая падтрымліваецца"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Памер і стыль субцітраў"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Памер шрыфту: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Дадатковыя параметры"</string>
@@ -2295,6 +2295,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Дэйтэранамалія"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Пратанамалія"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Трытанамалія"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Адценні шэрага"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Чырвоны і зялёны"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Чырвоны і зялёны"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Сіні і жоўты"</string>
@@ -2328,7 +2329,7 @@
     <string name="accessibility_vibration_summary_medium" msgid="2348889320548746469">"Уключана умераная вібрацыя пры выкліках і атрыманні апавяшчэнняў"</string>
     <string name="accessibility_vibration_summary_high" msgid="1764693979030913712">"Уключана моцная вібрацыя пры выкліках і атрыманні апавяшчэнняў"</string>
     <string name="accessibility_vibration_intensity_off" msgid="972159695404061944">"Выключана"</string>
-    <string name="accessibility_vibration_intensity_low" msgid="6311161118835287335">"Слабы"</string>
+    <string name="accessibility_vibration_intensity_low" msgid="6311161118835287335">"Слабая"</string>
     <string name="accessibility_vibration_intensity_medium" msgid="1734058611879392797">"Умераная"</string>
     <string name="accessibility_vibration_intensity_high" msgid="5982896399775212514">"Моцная"</string>
     <string name="accessibility_menu_item_settings" msgid="2652637954865389271">"Налады"</string>
@@ -2436,7 +2437,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Абмежаванне работы ў фонавым рэжыме"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Дазволіць праграме працаваць у фонавым рэжыме"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"У праграмы няма дазволу на працу ў фонавым рэжыме"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Не ўдалося абмежаваць работу ў фонавым рэжыме"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Не ўдалося абмежаваць работу ў фонавым рэжыме"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Абмежаваць фонавую дзейнасць?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Абмежаванне фонавай дзейнасці праграмы можа прывесці да збояў"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Паколькі ў гэтай праграме не наладжана аптымізацыя выкарыстання зараду акумулятара, вы не можаце абмежаваць яе працу. \n\n Для гэтага спачатку  ўключыце аптымізацыю акумулятара."</string>
@@ -2667,9 +2668,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Задаць расклад"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Павялічыць тэрмін службы акумулятара"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Выключаць, калі прылада поўнасцю зарадзіцца"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Рэжым эканоміі зараду выключаецца, калі зарад тэлефона дасягае <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Рэжым эканоміі зараду выключаецца, калі зарад планшэта дасягае <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Рэжым эканоміі зараду выключаецца, калі зарад прылады дасягае <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Рэжым эканоміі зараду выключаецца, калі зарад тэлефона перавышае <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Рэжым эканоміі зараду выключаецца, калі зарад планшэта перавышае <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Рэжым эканоміі зараду выключаецца, калі зарад прылады перавышае <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Уключыць"</string>
@@ -2734,6 +2735,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Скінуць"</string>
     <string name="tts_play" msgid="2945513377250757221">"Прайграць"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Адаптыўная магчымасць падключэння"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Павялічвае тэрмін службы акумулятара і павышае прадукцыйнасць прылады праз аўтаматычнае кіраванне падключэннямі да сеткі"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Сховішча ўліковых даных"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Усталяваць сертыфікат"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Усталяваць сертыфікаты са сховішча"</string>
@@ -2745,9 +2748,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Уліковыя даныя карыстальніка"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Прагляд і рэдагаванне захаваных уліковых даных"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Пашыраныя налады"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Тып сховішча"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Апаратнае"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Толькі праграмнае забеспячэнне"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Сертыфікаты недаступныя для гэтага карыстальніка"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Усталявана для VPN і праграм"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Усталявана для Wi-Fi"</string>
@@ -3146,7 +3146,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Аплата ў тэрмінале"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Наладзьце плацежную праграму. Затым проста прыкладзіце тэлефон задняй часткай да любога тэрмінала з сімвалам бескантактнай аплаты."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Зразумела"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Больш..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Яшчэ…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Задаць стандартную плацежную праграму"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Абнавіць стандартную плацежную праграму"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Пры бескантактнай аплаце плаціць з дапамогай праграмы \"<xliff:g id="APP">%1$s</xliff:g>\""</string>
@@ -3230,7 +3230,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Заўсёды выкарыстоўваць гэта для выклікаў"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Выберыце SIM-карту для даных"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Выберыце SIM для SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Пераключэнне SIM-карты для даных, гэта можа заняць да 1 хвіліны..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Пераключаецца SIM-карта для даных. Гэта можа заняць да 1 хвіліны…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Выклікаць праз"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Выбар SIM-карты"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3375,6 +3375,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"працэдура, расклад, эканомія зараду, эканомія энергіі, акумулятар, аўтаматычна, працэнт"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, пашыраныя магчымасці выкліку, выклік у 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"дадаць мову, дадаць мову"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"памер тэксту"</string>
     <string name="default_sound" msgid="6604374495015245195">"Гук па змаўчанні"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Гучнасць званкоў і апавяшчэнняў: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Гучнасць, вібрацыя, рэжым \"Не турбаваць\""</string>
@@ -3414,13 +3415,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Гукі пры ўключэнні"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Імгненныя субцітры"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Аўтаматычна дадаваць субцітры"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Няма"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one">Зададзены <xliff:g id="ON_COUNT">%d</xliff:g> расклад</item>
-      <item quantity="few">Зададзена <xliff:g id="ON_COUNT">%d</xliff:g> расклады</item>
-      <item quantity="many">Зададзена <xliff:g id="ON_COUNT">%d</xliff:g> раскладаў</item>
-      <item quantity="other">Зададзена <xliff:g id="ON_COUNT">%d</xliff:g> раскладу</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Ніводнага}=1{Зададзены 1 расклад}one{Зададзены # расклад}few{Зададзена # расклады}many{Зададзена # раскладаў}other{Зададзена # раскладу}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Не турбаваць"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Атрымліваць апавяшчэнні толькі ад важных людзей і праграм"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Абмежаванне колькасці непатрэбных апавяшчэнняў"</string>
@@ -3488,24 +3483,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Толькі прыярытэтныя"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Уключана / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Выключана / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Выключана"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Уключана"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Заўсёды пытацца"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Пакуль не выключыце"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> гадзіна</item>
-      <item quantity="few"><xliff:g id="NUM_HOURS">%d</xliff:g> гадзіны</item>
-      <item quantity="many"><xliff:g id="NUM_HOURS">%d</xliff:g> гадзін</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> гадзіны</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> хв"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> расклад можа ўключацца аўтаматычна</item>
-      <item quantity="few"><xliff:g id="ON_COUNT">%d</xliff:g> расклады могуць уключацца аўтаматычна</item>
-      <item quantity="many"><xliff:g id="ON_COUNT">%d</xliff:g> раскладаў могуць уключацца аўтаматычна</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> раскладу могуць уключацца аўтаматычна</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 гадзіна}one{# гадзіна}few{# гадзіны}many{# гадзін}other{# гадзіны}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 хвіліна}one{# хвіліна}few{# хвіліны}many{# хвілін}other{# хвіліны}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Выключана}=1{Выключана / 1 расклад можа ўключацца аўтаматычна}one{Выключана / # расклад можа ўключацца аўтаматычна}few{Выключана / # расклады могуць уключацца аўтаматычна}many{Выключана / # раскладаў могуць уключацца аўтаматычна}other{Выключана / # раскладу могуць уключацца аўтаматычна}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"На што не распаўсюджваецца рэжым \"Не турбаваць\""</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Людзі"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Праграмы"</string>
@@ -3551,6 +3534,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Аўтаматычна пераводзіць апавяшчэнні з нізкім прыярытэтам у ціхі рэжым"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Адаптыўнае ранжыраванне апавяшчэнняў"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Аўтаматычна ранжыраваць апавяшчэнні паводле адпаведнасці"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Водгук пра адаптыўнае апавяшчэнне"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Указваць карэкціроўкі, зробленыя ў апавяшчэннях, і паказваць варыянт дадавання водгуку ў сістэму"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Прапанаваныя дзеянні і адказы"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Аўтаматычна паказваць прапанаваныя дзеянні і адказы"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Паказаць апошнія і адкладзеныя апавяшчэнні"</string>
@@ -3757,7 +3742,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Доступ да рэжыму \"Не турбаваць\""</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Дазволіць рэжым \"Не турбаваць\""</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Запытаў доступу да рэжыму «Не турбаваць» ад усталяваных дадаткаў не паступала"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Загрузка дадаткаў..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Праграмы загружаюцца…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Па вашым запыце Android блакіруе апавяшчэнні ад дадзенай праграмы на гэтай прыладзе"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Па вашым запыце Android блакіруе дадзеную катэгорыю апавяшчэнняў на гэтай прыладзе"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Па вашым запыце Android блакіруе дадзеную групу апавяшчэнняў на гэтай прыладзе"</string>
@@ -3855,13 +3840,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Усе размовы"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Прыярытэтныя размовы"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Ніякія"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> размова</item>
-      <item quantity="few"><xliff:g id="CONVERSATIONS">%d</xliff:g> размовы</item>
-      <item quantity="many"><xliff:g id="CONVERSATIONS">%d</xliff:g> размоў</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> размовы</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Няма"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Ніводнай}=1{1 размова}one{# размова}few{# размовы}many{# размоў}other{# размовы}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"На што гэты рэжым не распаўсюджваецца"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Выклікі"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Выклікі"</string>
@@ -3870,13 +3849,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Каб прылада апавяшчала пра дазволеныя выклікі гукавым сігналам, праверце адпаведную наладу"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Для раскладу \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" прыём выклікаў заблакіраваны. Вы можаце змяніць налады, каб дазволіць сябрам, членам сям\'і і іншым кантактам звязвацца з вамі."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Пазначаныя кантакты"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one">яшчэ <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="few">яшчэ <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="many">яшчэ <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="other">яшчэ <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Няма"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Ніводнага}=1{{contact_1}}=2{{contact_1} і {contact_2}}=3{{contact_1}, {contact_2} і {contact_3}}one{{contact_1}, {contact_2} і яшчэ #}few{{contact_1}, {contact_2} і яшчэ #}many{{contact_1}, {contact_2} і яшчэ #}other{{contact_1}, {contact_2} і яшчэ #}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Паведамленні"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"паведамленні"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Паведамленні"</string>
@@ -3885,13 +3858,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Для раскладу \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" прыём уваходных паведамленняў заблакіраваны. Вы можаце змяніць налады, каб дазволіць сябрам, членам сям\'і і іншым кантактам звязвацца з вамі."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Вы будзеце чуць усе паведамленні"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Вы будзеце чуць усе выклікі"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Няма"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> кантакт</item>
-      <item quantity="few"><xliff:g id="NUM_CONTACTS">%d</xliff:g> кантакты</item>
-      <item quantity="many"><xliff:g id="NUM_CONTACTS">%d</xliff:g> кантактаў</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> кантакту</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Ніводнага}=1{1 кантакт}one{# кантакт}few{# кантакты}many{# кантактаў}other{# кантакту}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Любыя"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Кантакты"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Пазначаныя кантакты"</string>
@@ -3929,26 +3896,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Усе апавяшчэнні"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Некаторыя апавяшчэнні"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Выбраныя людзі змогуць звязацца з вамі, нават калі вы распаўсюдзіце рэжым \"Не турбаваць\" на ўсе праграмы"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one">Гэты рэжым не распаўсюджваецца на праграмы \"<xliff:g id="APP_NAMES">%s</xliff:g>\"</item>
-      <item quantity="few">Гэты рэжым не распаўсюджваецца на праграмы \"<xliff:g id="APP_NAMES">%s</xliff:g>\"</item>
-      <item quantity="many">Гэты рэжым не распаўсюджваецца на праграмы \"<xliff:g id="APP_NAMES">%s</xliff:g>\"</item>
-      <item quantity="other">Гэты рэжым не распаўсюджваецца на праграмы \"<xliff:g id="APP_NAMES">%s</xliff:g>\"</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"і яшчэ <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Рэжым \"Не турбаваць\" распаўсюджваецца на ўсе праграмы}=1{Рэжым \"Не турбаваць\" не распаўсюджваецца на праграму \"{app_1}\"}=2{Рэжым \"Не турбаваць\" не распаўсюджваецца на праграмы \"{app_1}\" і \"{app_2}\"}=3{Рэжым \"Не турбаваць\" не распаўсюджваецца на праграмы \"{app_1}\", \"{app_2}\" і \"{app_3}\"}one{Рэжым \"Не турбаваць\" не распаўсюджваецца на праграмы \"{app_1}\", \"{app_2}\" і яшчэ #}few{Рэжым \"Не турбаваць\" не распаўсюджваецца на праграмы \"{app_1}\", \"{app_2}\" і яшчэ #}many{Рэжым \"Не турбаваць\" не распаўсюджваецца на праграмы \"{app_1}\", \"{app_2}\" і яшчэ #}other{Рэжым \"Не турбаваць\" не распаўсюджваецца на праграмы \"{app_1}\", \"{app_2}\" і яшчэ #}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Праграмы"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Усе апавяшчэнні"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Некаторыя апавяшчэнні"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Апавяшчэнні, на якія рэжым \"Не турбаваць\" не распаўсюджваецца"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Дазволіць усе апавяшчэнні"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one">Гэты рэжым не распаўсюджваецца на гукі \"<xliff:g id="SOUND_CATEGORIES">%s</xliff:g>\"</item>
-      <item quantity="few">Гэты рэжым не распаўсюджваецца на гукі \"<xliff:g id="SOUND_CATEGORIES">%s</xliff:g>\"</item>
-      <item quantity="many">Гэты рэжым не распаўсюджваецца на гукі \"<xliff:g id="SOUND_CATEGORIES">%s</xliff:g>\"</item>
-      <item quantity="other">Гэты рэжым не распаўсюджваецца на гукі \"<xliff:g id="SOUND_CATEGORIES">%s</xliff:g>\"</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Гэты рэжым распаўсюджваецца на ўсё без выключэння"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"і яшчэ <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Рэжым \"Не турбаваць\" распаўсюджваецца на ўсё без выключэння}=1{Рэжым \"Не турбаваць\" не распаўсюджваецца на гук \"{sound_category_1}\"}=2{Рэжым \"Не турбаваць\" не распаўсюджваецца на гукі \"{sound_category_1}\" і \"{sound_category_2}\"}=3{Рэжым \"Не турбаваць\" не распаўсюджваецца на гукі \"{sound_category_1}\", \"{sound_category_2}\" і \"{sound_category_3}\"}one{Рэжым \"Не турбаваць\" не распаўсюджваецца на гукі \"{sound_category_1}\", \"{sound_category_2}\" і яшчэ #}few{Рэжым \"Не турбаваць\" не распаўсюджваецца на гукі \"{sound_category_1}\", \"{sound_category_2}\" і яшчэ #}many{Рэжым \"Не турбаваць\" не распаўсюджваецца на гукі \"{sound_category_1}\", \"{sound_category_2}\" і яшчэ #}other{Рэжым \"Не турбаваць\" не распаўсюджваецца на гукі \"{sound_category_1}\", \"{sound_category_2}\" і яшчэ #}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Рэжым \"Не турбаваць\" распаўсюджваецца на ўсё без выключэння"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Гэты рэжым распаўсюджваецца на ўсіх людзей"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Гэты рэжым не распаўсюджваецца на некаторыя кантакты"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Гэты рэжым не распаўсюджваецца на людзей"</string>
@@ -4212,7 +4167,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"Рэжым працы USB"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Падключаная прылада"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Гэта прылада"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Пераключэнне…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Выконваецца пераключэнне…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Адбылася памылка"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Зарадка гэтай прылады"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Зарадка падключанай прылады"</string>
@@ -4473,7 +4428,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Праглядзець звесткі"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Эканомія трафіка"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Неабмежаваныя даныя"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Фонавая перадача даных выключана"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Фонавая перадача даных выключана"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Уключана"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Выключана"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Уключыць эканомію трафіка"</string>
@@ -4496,7 +4451,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Калі прылада заблакіравана, не дазваляць набіраць адказы або іншы тэкст у апавяшчэннях"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Стандартная праверка правапісу"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Праверка правапісу"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Уключыць праверку правапісу"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Выкарыстоўваць праверку правапісу"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Не выбрана"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(няма)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4594,7 +4549,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Каб вызваліць месца ў сховішчы, Менеджар сховішча выдаляе фота і відэа, для якіх створаны рэзервовыя копіі, з вашай прылады."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Выдаліць фота і відэа"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Менеджар сховішча"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Карыстанне менеджарам сховішча"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Выкарыстоўваць менеджар сховішча"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Аўтаматычна"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Уручную"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Вызваліць месца"</string>
@@ -4632,6 +4587,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Двойчы дакрануцца, каб праверыць апавяшчэнні"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Двойчы дакраніцеся, каб праверыць планшэт"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Двойчы дакраніцеся, каб праверыць прыладу"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Прагартаць (апавяшчэнні)"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Каб праглядзець апавяшчэнні, правядзіце пальцам па ніжняй частцы экрана ўніз"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Рэжым кіравання адной рукой"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Выкарыстоўваць рэжым кіравання адной рукой"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Выходзіць з праграмы пры пераключэнні на іншую праграму"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Час чакання"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 секунды"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 секунд"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 секунд"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"дасягальнасць"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Каб праверыць час, апавяшчэнні і іншую інфармацыю, двойчы дакраніцеся да экрана."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Падняць тэлефон, каб праверыць апавяшчэнні"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Падніміце планшэт, каб праверыць яго"</string>
@@ -4644,6 +4609,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Націсніце, каб праверыць планшэт"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Націсніце, каб праверыць прыладу"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Каб праверыць час, апавяшчэнні і іншую інфармацыю, дакраніцеся да экрана."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Трывожная кнопка"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Запусціце экстранны выклік SOS, хутка націснуўшы кнопку сілкавання 5 разоў."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Гук заўвагі"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Адпраўляць абвестку да запуску дзеянняў"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Кантакты для экстранных сітуацый"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Правядзіце пальцам, каб убачыць апавяшчэнні"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Сканер адбіткаў"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Каб праверыць апавяшчэнні, правядзіце пальцам уніз па сканеры адбіткаў пальцаў на заднім боку тэлефона."</string>
@@ -4812,7 +4782,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Уключыць для ўсіх праграм"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Выбраць драйвер графічнай сістэмы"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Стандартна"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Драйвер гульні"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Драйвер гульні"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Драйвер распрацоўшчыка"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Драйвер графічнай сістэмы"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4881,6 +4851,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Не ўдалося знайсці сеткі. Паўтарыце спробу."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(забаронена)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Няма SIM-карты"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Няма SIM-карты"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Няма"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Для падключэння неабходная SIM-карта"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Для падключэння неабходная SIM-карта аператара \"<xliff:g id="WIRELESS_CARRIER">%s</xliff:g>\""</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Прыярытэтны рэжым сеткі: пераважна WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Прыярытэтны рэжым сеткі: толькі GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Прыярытэтны рэжым сеткі: толькі WCDMA"</string>
@@ -4934,6 +4909,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Мабільная перадача даных"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Доступ да даных па мабільнай сетцы"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Калі сігнал гэтага аператара будзе ў межах дасягальнасці, тэлефон аўтаматычна пераключыцца на яго"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"SIM-карты недаступныя"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Параметры выклікаў"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Параметры SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Заўсёды пытацца"</string>
@@ -5122,10 +5098,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Дазволіць экранныя накладкі на Налады"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Дазвольце праграмам, якія могуць паказвацца паверх іншых, накладацца на экраны Налад"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Мультымедыя"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Схаваць прайгравальнік пасля завяршэння сеанса"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Прайгравальнік дазваляе вам узнавіць сеанс з разгорнутай панэлі \"Хуткія налады\"."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Медыяпрайгравальнік у Хуткіх наладах"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Паказваць медыяпрайгравальнік працяглы час для лёгкага ўзнаўлення прайгравання"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Схаваць прайгравальнік"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Паказаць прайгравальнік"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Няма даступных прайгравальнікаў"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Дазволеныя праграмы"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"мультымедыя"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Будзе ўключаны Bluetooth"</string>
 </resources>
diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
index 6960746..dfb8c46 100644
--- a/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Средно"</item>
     <item msgid="6740026006576843477">"Продължително"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Кратко"</item>
+    <item msgid="7397961711906421599">"Средно"</item>
+    <item msgid="4079132024502041928">"Продължително"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Стандартни"</item>
     <item msgid="4234707448428002595">"Безсерифни"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Глобална мрежа"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Само TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Глобални"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index ead2276..cefdf39 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Показв. на инф. за потр. профил върху закл. екран"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Профили"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Местоположение"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Използване на местоположението"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Използване на местоположението"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Изкл."</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">Включено – <xliff:g id="COUNT_1">%1$d</xliff:g> приложения имат достъп до местоположението</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Ползване на лицето ви за удостоверяване"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Стартиране"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Ако функцията за отключване с лице е изключена, някои стъпки за настройване може да не работят правилно с TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Назад"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Продължаване за настройване"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Настр. на ф-ята за достъпност: Ползване"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="one">Трябва да съдържа по-малко от <xliff:g id="NUMBER_0">%d</xliff:g> цифра</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Администраторът на у-вото не разрешава ползването на скорошен ПИН"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Често срещаните ПИН кодове се блокират от системния ви администратор. Опитайте с друг ПИН код."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Не може да включва невалиден знак"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Трябва да съдържа поне една буква"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Трябва да съдържа поне една цифра"</string>
@@ -653,7 +655,6 @@
       <item quantity="one">Трябва да съдържа поне 1 нецифрен знак</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Администраторът на у-вото не разрешава ползването на скорошна парола"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Често срещаните пароли се блокират от системния ви администратор. Опитайте с друга парола."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Възходящите, низходящите и повтарящите се поредици от цифри не са разрешени"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Потвърждаване"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Отказ"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Включване на Wi‑Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Използване на Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Използване на Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Настройки за Wi‑Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Задаване и управление на безжични точки за достъп"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"За да се свържете с „<xliff:g id="SSID">%1$s</xliff:g>“, центрирайте по-долу кода за бърза реакция"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Присъединете се към  Wi‑Fi мрежата, като сканирате код за бърза реакция"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Споделяне на Wi‑Fi мрежата"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Сканирайте този код за бърза реакция, за да се свържете към „<xliff:g id="SSID">%1$s</xliff:g>“ и да споделите паролата"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Сканирайте този код за бърза реакция с друго устройство, за да се присъедините към <xliff:g id="SSID">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Сканирайте този код за бърза реакция, за да се свържете към „<xliff:g id="SSID">%1$s</xliff:g>“"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Опитайте отново. Ако проблемът не се отстрани, свържете се с производителя на устройството."</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Нещо се обърка"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Парола за Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Парола за точката за достъп: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Автоматично свързване"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Разрешаване телефонът автоматично да се свързва в района на тази мрежа"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Разрешаване таблетът автоматично да се свързва в района на тази мрежа"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Разрешете свързване с тази мрежа, когато е в обхват"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Добавяне на устройство"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Използвайте код за бърза реакция, за да добавите устройство към тази мрежа"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"Невалиден формат на кода за бърза реакция"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Използване на системни сертификати"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Без предоставяне"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Без удостоверяване"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Не е посочен сертификат. Връзката ви няма да бъде частна."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Името на мрежата е твърде дълго."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Трябва да посочите домейн."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Изисква се сертификат."</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Свързване"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Функцията за Wi-Fi е включена"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Установена е връзка с(ъс) <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Свързване към <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Свързва се…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Свързването с мрежата не бе успешно"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Мрежата не е в обхват"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Приложението споделя съдържание. За да споделите връзката с интернет, изключете точката за достъп и я включете отново"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Няма зададена парола"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Име на точката за достъп"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"„<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>“ се включва..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> се включва…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Други устройства могат да се свързват към „<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>“"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Парола за точката за достъп"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Честота на точката за достъп"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Плавно показване"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Автоматично увеличава честотата на опресняване от 60 на 90 Hz за част от съдържанието. По-интензивно използване на батерията."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Плавно показване"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Принудителна честота на опресняване при 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Най-висока честота на опресняване за по-добро реагиране при докосване и качество на анимациите. По-интензивно използване на батерията."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Внимание към екрана"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Вкл. – Екранът няма да се изключи, ако гледате в него"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Версия на Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Актуализация за сигурността на Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Модел"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Модел: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Модел и хардуер"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Версия на хардуера"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Идент. № на оборудването"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Мрежовите настройки са нулирани"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"SIM картите не могат да се изтрият"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Изтеглените SIM карти не могат да бъдат изтрити поради грешка.\n\nРестартирайте устройството си и опитайте отново."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Изтриване на всички данни (възстановяване на фабричните настройки)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Изтрив. на данните (възст. на фабр. настр.)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Това ще изтрие всички данни от "<b>"вътрешното хранилище"</b>" на таблета ви, включително:\n\n"<li>"профила ви в Google;"</li>\n<li>"данни и настройки от системата и приложенията;"</li>\n<li>"изтеглени приложения."</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Това ще изтрие всички данни от "<b>"вътрешното хранилище"</b>" на телефона ви, включително:\n\n"<li>"профила ви в Google"</li>\n<li>"данни и настройки от системата и приложенията"</li>\n<li>"изтеглени приложения"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Понастоящем сте влезли в следните профили:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"На това устройство има други потребители.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Музика"</li>\n<li>"Снимки"</li>\n<li>"други потребителски данни"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"електронни SIM карти"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Планът ви за мобилна услуга няма да бъде анулиран."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"За да изчистите музиката, снимките и другите потребителски данни, трябва да се изтрие "<b>"USB хранилището"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"За да изчистите музиката, снимките и другите потребителски данни, трябва да се изтрие "<b>"SD картата"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Изтриване на всички данни (възстановяване на фабричните настройки)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Изтрив. на данните (възст. на фабр. настр.)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Това ще изтрие всички данни от "<b>"вътрешното хранилище"</b>" на таблета ви, включително:\n\n"<li>"профила ви в Google;"</li>\n<li>"данните и настройките от системата и приложенията;"</li>\n<li>"изтеглените приложения."</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Това ще изтрие всички данни от "<b>"вътрешното хранилище"</b>" на телефона ви, включително:\n\n"<li>"профила ви в Google;"</li>\n<li>"данните и настройките от системата и приложенията;"</li>\n<li>"изтеглените приложения."</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Понастоящем сте влезли в следните профили:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"На това устройство има други потребители.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"музика"</li>\n<li>"снимки"</li>\n<li>"други потребителски данни"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"електронни SIM карти"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Планът ви за мобилна услуга няма да бъде анулиран."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"За да изчистите музиката, снимките и другите потребителски данни, трябва да се изтрие "<b>"USB хранилището"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"За да изчистите музиката, снимките и другите потребителски данни, трябва да се изтрие "<b>"SD картата"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Изтриване на USB хранилището"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Изтриване на SD картата"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Изтриване на всички данни във вътрешното USB хранилище, като музика или снимки"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Да се изтриват всички данни в SD картата, като музика или снимки"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Изтриване на всички данни"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Изтриване на всички данни"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Цялата ви лична информация и всички изтеглени приложения ще бъдат изтрити. Не можете да отмените това действие."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Цялата ви лична информация, включително изтеглените приложения и SIM карти, ще бъде изтрита. Не можете да отмените това действие."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Изтриване на всичко"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Не се състоя рестартиране, защото услугата за изчистване на системата не се предлага."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Да се изтрият ли всички данни?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"За този потребител не е налице възстановяване на фабричните настройки"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Изтрива се"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Моля, изчакайте..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Изтриване на всички данни"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Изтриване на всички данни"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Цялата ви лична информация и всички изтеглени приложения ще бъдат изтрити. Не можете да отмените това действие."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Цялата ви лична информация, включително изтеглените приложения и SIM карти, ще бъде изтрита. Не можете да отмените това действие."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Да се изтрият ли всички данни?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"За този потребител не е налице възстановяване на фабричните настройки"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Изтрива се"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Моля, изчакайте…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Настройки за обаждане"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Настройка на гласова поща, пренасочване, изчакване и идентификация на обаждането"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Тетъринг през USB"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Не може да се извърши тетъринг с над <xliff:g id="MAXCONNECTION">%1$d</xliff:g> устройства."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Тетърингът на <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ще бъде прекъснат."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Тетъринг чрез Ethernet"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Споделете връзката с интернет на телефона чрез Ethernet през USB"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Споделете връзката с интернет на телефона чрез Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Използвайте точка за достъп и тетъринг, за да предоставите достъп до интернет на други устройства чрез мобилната си връзка за данни. Приложенията могат също да създават точки за достъп, за да споделят съдържание с устройства в близост."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Използвайте точка за достъп и тетъринг, за да предоставите достъп до интернет на други устройства чрез Wi-Fi или мобилната си връзка за данни. Приложенията могат също да създават точки за достъп, за да споделят съдържание с устройства в близост."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Помощ"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Предпочитания за надписите"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Ниво на мащаба"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Област за увеличаване"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Режим за увеличение: Активиране"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Изберете кои области от екрана да бъдат увеличени при използване на съответната функция"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Цял екран"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Част от екрана"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Целият екран и част от екрана"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Увеличаване на целия екран"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Увеличаване на част от екрана"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Да се превключи ли към бутона за достъпност?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Трикратното докосване с цел увеличение на част от екрана ще предизвика забавяне при въвеждането и други действия.\n\nИскате ли вместо това да използвате за увеличение бутона за достъпност?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Превключване към бутона за достъпност"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Запазване на трикратното докосване с цел увеличение"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Настройки за увеличението"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Увеличаване с трикратно докосване"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Увеличаване на мащаба с пряк път"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Край на обажд.: Бутон за захранване"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Голям курсор на мишката"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Премахване на анимациите"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Монозвук"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Комбиниране на каналите при възпроизв. на звук"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Баланс на звука"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Ляво"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Дясно"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Монозвук"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Комбиниране на каналите при възпроизв. на звук"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Баланс на звука"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Ляво"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Дясно"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"По подразбиране"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 секунди"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 секунди"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Вибриране при известия"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Вибриране при звънене"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Обратна връзка при докосване"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Използване на „<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>“"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Отваряне на <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Използване на корекция на цветовете"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Показване на надписите"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Само за поддържаното приложение"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Използване на <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Отваряне на <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Използване на корекция на цветовете"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Показване на надписите"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Само за поддържаното приложение"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Размер и стил на надписите"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Размер на текста: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Още опции"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Деутераномалия"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Протаномалия"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Тританомалия"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Сива скала"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Червено-зелено"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Червено-зелено"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Синьо-жълто"</string>
@@ -2271,7 +2272,7 @@
     <string name="accessibility_vibration_summary_high" msgid="1764693979030913712">"За звъненето и известията е зададено „Силно“"</string>
     <string name="accessibility_vibration_intensity_off" msgid="972159695404061944">"Изключено"</string>
     <string name="accessibility_vibration_intensity_low" msgid="6311161118835287335">"Слабо"</string>
-    <string name="accessibility_vibration_intensity_medium" msgid="1734058611879392797">"средно"</string>
+    <string name="accessibility_vibration_intensity_medium" msgid="1734058611879392797">"Средно"</string>
     <string name="accessibility_vibration_intensity_high" msgid="5982896399775212514">"Силно"</string>
     <string name="accessibility_menu_item_settings" msgid="2652637954865389271">"Настройки"</string>
     <string name="accessibility_feature_state_on" msgid="1777344331063467511">"Вкл."</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Ограничение за заден план"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Разрешаване приложението да се изпълнява на заден план"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Приложението няма разрешение да се изпълнява на заден план"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Използването на заден план не може да бъде ограничено"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Използването на заден план не може да бъде ограничено"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Да се ограничи ли активността на заден план?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Ако ограничите активността на заден за дадено приложение, то може да не функционира правилно"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Тъй като прил. не е зададено да оптимизира батерията, можете да го ограничите.\n\nЗа тази цел първо включете оптим. на батерията."</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Задаване на график"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Удължаване на живота на батерията"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Изключване при зареждане"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Режимът за запазване на батерията се изключва, когато телефонът ви е зареден на <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Режимът за запазване на батерията се изключва, когато таблетът ви е зареден на <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Режимът за запазване на батерията се изключва, когато устройството ви е заредено на <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Режимът за запазване на батерията се изключва, когато телефонът ви се зареди над <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Режимът за запазване на батерията се изключва, когато таблетът ви се зареди над <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Режимът за запазване на батерията се изключва, когато устройството ви се зареди над <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Включване"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Нулиране"</string>
     <string name="tts_play" msgid="2945513377250757221">"Възпроизвеждане"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Функция за адаптивно свързване"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Удължава живота на батерията и подобрява ефективността на устройството чрез автоматично управление на връзките с мрежата"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Хранилище за идент. данни"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Инсталиране на сертификат"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Инсталиране на сертификати от хранилището"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Идентиф. данни на потребителя"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Преглед и промяна на съхранените идентификационни данни"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Разширени"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Тип на хранилището"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"С хардуерна поддръжка"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Само софтуерно"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Идентификационните данни не са налице за този потребител"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Инсталирани за виртуалната частна мрежа (VPN) и приложения"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Инсталирани за Wi-Fi"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Плащане на терминал"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Настройте приложение за плащане. След което трябва само да задържите задната част на телефона си до който и да е терминал със символа за безконтактно плащане."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Разбрах"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Още..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Още…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Задаване на основно приложение за плащане"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Актуализиране на основното приложение за плащане"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"На терминала за безконтактно плащане платете посредством <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Използване винаги за обаждания"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Изберете SIM карта за данни"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Изберете SIM карта за SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"SIM картата за данни се превключва. Това може да отнеме до една минута..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"SIM картата за данни се превключва. Това може да отнеме до една минута…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Обаждане чрез"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Изберете SIM карта"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM карта <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"поредица, график, режим за запазване на батерията, енергоспестяващ режим, батерия, автоматично, процент"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, разширени обаждания, обаждане през 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"добавяне на език, език: добавяне"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"размер на текста"</string>
     <string name="default_sound" msgid="6604374495015245195">"Стандартен звук"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Силата на звука за звъненето и известията е зададена на <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Сила на звука, вибриране, „Не безпокойте“"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Звуци при включване"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Надписи в реално време"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Мултимедия с автоматични надписи"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Няма"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other">Зададени са <xliff:g id="ON_COUNT">%d</xliff:g> графика</item>
-      <item quantity="one">Зададен е 1 график</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Нито един}=1{Зададен е 1 график}other{Зададени са # графика}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Не безпокойте"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Получаване на известия само от важни хора и приложения"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Ограничаване на прекъсванията"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Само с приоритет"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Включено/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Изключено/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Изкл."</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Включено"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Извеждане на запитване всеки път"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"До изключване"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> часа</item>
-      <item quantity="one">1 час</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> минути"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> графика могат да се включват автоматично</item>
-      <item quantity="one">1 график може да се включва автоматично</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 час}other{# часа}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 минута}other{# минути}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Изкл.}=1{Изкл./1 график може да се включва автоматично}other{Изкл./# графика могат да се включват автоматично}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Кое може да прекъсва режима „Не безпокойте“"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Хора"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Приложения"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Известията с по-нисък приоритет автоматично се задават като ненатрапчиви"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Адаптивно класиране на известията"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Автоматично класиране на известията по уместност"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Отзиви за адаптивните известия"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Посочва приложените към известията корекции и показва опцията за изпращане на отзиви до системата"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Предложени действия и отговори"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Автоматично показване на предложените действия и отговори"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Показване на скорошните и отложените известия"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Достъп до „Не безпокойте“"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Разрешаване на режима „Не безпокойте“"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Никое инсталирано приложение не е заявило достъп до „Не безпокойте“"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Приложенията се зареждат..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Приложенията се зареждат…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"По ваша заявка Android блокира показването на известията от това приложение на устройството"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"По ваша заявка Android блокира показването на тази категория известия на устройството"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"По ваша заявка Android блокира показването на тази група известия на устройството"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Всички разговори"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Разговори с приоритет"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Никакви"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> разговора</item>
-      <item quantity="one">1 разговор</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Никакви"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Нито един}=1{1 разговор}other{# разговора}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Кой може да прекъсва режима"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Обаждания"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Обаждания"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"За да се уверите, че за разрешените обаждания се възпроизвежда звук, проверете дали за устройството е зададено звънене"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Входящите обаждания за „<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>“ са блокирани. Можете да коригирате настройките, за да разрешите на близки, приятели и други контакти да се свързват с вас."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Контакти със звезда"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other">Още <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="one">Още 1</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Няма"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Нито един}=1{{contact_1}}=2{{contact_1} и {contact_2}}=3{{contact_1}, {contact_2} и {contact_3}}other{{contact_1}, {contact_2} и още #}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Съобщения"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"съобщения"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Съобщения"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Входящите съобщения са блокирани за „<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>“. Можете да коригирате настройките, за да разрешите на близки, приятели и други контакти да се свързват с вас."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Можете да получавате всички съобщения"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Можете да получавате всички обаждания"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Няма"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> контакта</item>
-      <item quantity="one">1 контакт</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Нито един}=1{1 контакт}other{# контакта}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Всеки"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Контакти"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Контакти със звезда"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Всички известия"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Някои известия"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Избраните хора пак могат да се свързват с вас дори ако не разрешавате на приложенията да прекъсват режима"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> могат да прекъсват</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> може да прекъсва</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"още <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Нито едно приложение не може да прекъсва режима}=1{{app_1} може да прекъсва режима}=2{{app_1} и {app_2} могат да прекъсват режима}=3{{app_1}, {app_2} и {app_3} могат да прекъсват режима}other{{app_1}, {app_2} и още # могат да прекъсват режима}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Приложения"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Всички известия"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Някои известия"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Известия, които могат да прекъсват режима"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Разрешаване на всички известия"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> могат да прекъсват</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> може да прекъсва</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Нищо не може да прекъсва режима"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"още <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Нищо не може да прекъсва режима}=1{{sound_category_1} може да прекъсва режима}=2{{sound_category_1} и {sound_category_2} могат да прекъсват режима}=3{{sound_category_1}, {sound_category_2} и {sound_category_3} могат да прекъсват режима}other{{sound_category_1}, {sound_category_2} и още # могат да прекъсват режима}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Нищо не може да прекъсва режима"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Никой не може да прекъсва режима"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Някои хора могат да прекъсват режима"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Всички хора могат да прекъсват режима"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB се контролира от"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"свързаното устройство"</string>
     <string name="usb_control_device" msgid="527916783743021577">"това устройство"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Превключва се..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Превключва се…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Превключването не бе успешно"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Зареждане на това устройство"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Зареждане на свързаното устройство"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Преглед на подробностите"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Икономия на данни"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Неограничен достъп до данни"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Данните на заден план са изключени"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Данните на заден план са изключени"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Включено"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Изключено"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Използване на „Икономия на данни“"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Предотвратяване на въвеждането на отговори или друг текст в известията, когато устройството е заключено"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Стандартна правописна проверка"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Избор на правописна проверка"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Използване на правописна проверка"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Използване на проверка на правописа"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Не е избрано"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(няма)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"За да ви помогне да освободите място за съхранение, мениджърът на хранилището премахва от устройството ви резервните копия на снимки и видеоклипове."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Премахване на снимките и видеоклиповете"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Мениджър на хранилището"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Използване на мениджъра на хранилището"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Използване на мениджъра на хранилището"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Автоматично"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Ръчни"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Освободете място сега"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Двукратно докосване за проверка на телефона"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Двукратно докосване за проверка на таблета"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Двукратно докосване за проверка на устройството"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Прекарване на пръст за известия"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Прекарайте пръст надолу през долния край на екрана, за да видите известията си"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Режим за работа с една ръка"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Използване на режима за работа с една ръка"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Изход при превключване на приложенията"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Време за изчакване"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 секунди"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 секунди"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 секунди"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"достъпност"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"За да проверите часа, известията и друга информация, докоснете екрана два пъти."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Повдигане на телефона за проверка"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Повдигане за проверка на таблета"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Докоснете за проверка на таблета"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Докоснете за проверка на устройството"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"За да проверите часа, известията и друга информация, докоснете екрана."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Паник бутон"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Стартирайте действията при спешни случаи (SOS) с бързо петкратно натискане на бутона за включване/изключване."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Предупредителен звук"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Сигнал преди стартиране на действията"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Контакти при спешни случаи"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Преглед на известията с плъзване през сензора за отпечатъци"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Плъзване през сензора за отпечат."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"За да проверите известията си, плъзнете пръст надолу през сензора за отпечатъци на гърба на телефона си."</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Активиране за всички приложения"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Избиране на графичен драйвер"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"По подразбиране"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Драйвер за игри"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Драйвер за игри"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Драйвер за програмисти"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Системен графичен драйвер"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Не можаха да бъдат намерени мрежи. Опитайте отново."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(забранено)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Няма SIM карта"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Няма SIM карта"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Няма"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"За установяването на връзка се изисква SIM карта"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"За установяването на връзка се изисква SIM карта от <xliff:g id="WIRELESS_CARRIER">%s</xliff:g>"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Предпочитан режим на мрежата: Предпочита се WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Предпочитан режим на мрежата: Само GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Предпочитан режим на мрежата: Само WCDMA"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Мобилни данни"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Достъп до данните през мобилната мрежа"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Телефонът автоматично ще превключва към този оператор, когато е в обхват"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Няма налице SIM карта"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Предпочитание за обажданията"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Предпочитание за SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Запитване всеки път"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Разрешаване на екранни наслагвания в/у „Настройки“"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Разрешаване на приложенията, които могат да се показват върху други приложения, да се наслагват върху екрана на „Настройки“"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Мултимедия"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Скриване на плейъра при прикл. сесия за мултимедия"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Плейърът ви позволява да възобновите дадена сесия от разгънатия панел с бързи настройки."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Медиен плейър в бързите настройки"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Показване на медийния плейър за продължителен период от време с цел лесно възобновяване на възпроизвеждането"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Скриване на плейъра"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Показване на плейъра"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Няма налични плейъри"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Разрешени приложения"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"мултимедия"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Ще се включи Bluetooth"</string>
 </resources>
diff --git a/res/values-bn/arrays.xml b/res/values-bn/arrays.xml
index 8b5aaa1..2ede29b 100644
--- a/res/values-bn/arrays.xml
+++ b/res/values-bn/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"মাঝারি"</item>
     <item msgid="6740026006576843477">"দীর্ঘ"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"ছোট"</item>
+    <item msgid="7397961711906421599">"মাঝারি"</item>
+    <item msgid="4079132024502041928">"বড়"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"ডিফল্ট"</item>
     <item msgid="4234707448428002595">"Sans Serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"গ্লোবাল"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"শুধুমাত্র TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"গ্লোবাল"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 1e06896..3dae8c3 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"লক স্ক্রিনে প্রোফাইলের তথ্য প্রদর্শন করুন"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"অ্যাকাউন্টগুলি"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"লোকেশন"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"লোকেশন ব্যবহার করুন"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"লোকেশন ব্যবহার করুন"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"বন্ধ আছে"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">চালু আছে - <xliff:g id="COUNT_1">%1$d</xliff:g>টি অ্যাপ লোকেশন অ্যাক্সেস করতে পারবে</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"যাচাইকরণ করতে আপনার ফেস ব্যবহার করুন"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"শুরু করুন"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"অ্যাক্সেসিবিলিটি ফেস আনলক বন্ধ থাকলে কিছু সেটআপ পদ্ধতি টকব্যাকের ক্ষেত্রে সঠিকভাবে কাজ নাও করতে পারে।"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"ফিরে যান"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"সেটআপ চালিয়ে যান"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"অ্যাক্সেসিবিলিটি সেট-আপ ব্যবহার"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="other">অবশ্যই <xliff:g id="NUMBER_1">%d</xliff:g>টি সংখ্যার থেকে কম হতে হবে</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"ডিভাইস প্রশাসক একটি সাম্প্রতিক পিন ব্যবহার করতে দেয় না"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"একইধরনের পিন আপনার আইটি অ্যাডমিনের মাধ্যমে ব্লক করা হয়। অন্য একটি পিন ব্যবহার করার চেষ্টা করুন।"</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"এতে কোনো অবৈধ অক্ষর অন্তর্ভুক্ত করা যাবে না"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"কমপক্ষে একটি অক্ষর থাকতে হবে"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"কমপক্ষে একটি সংখ্যা থাকতে হবে"</string>
@@ -653,7 +655,6 @@
       <item quantity="other">কমপক্ষে এমন <xliff:g id="COUNT">%d</xliff:g>টি অক্ষর থাকতে হবে যেটি সংখ্যা নয়</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"ডিভাইস প্রশাসক একটি সাম্প্রতিক পাসওয়ার্ড ব্যবহার করতে দেয় না"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"একইধরনের পাসওয়ার্ড আপনার আইটি অ্যাডমিনের মাধ্যমে ব্লক করা হয়। অন্য একটি পাসওয়ার্ড ব্যবহার করার চেষ্টা করুন।"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"সংখ্যাগুলি ছোট থেকে বড় ক্রমে, বড় থেকে ছোট ক্রমে বা একই সংখ্যাকে বার বার লেখা যাবে না"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"নিশ্চিত করুন"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"বাতিল"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"ওয়াই-ফাই"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"ওয়াই-ফাই চালু করুন"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"ওয়াই-ফাই"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"ওয়াই-ফাই ব্যবহার করুন"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"ওয়াই-ফাই ব্যবহার করুন"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"ওয়াই-ফাই সেটিংস"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"ওয়াই-ফাই"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"ওয়্যারলেস অ্যাক্সেস পয়েন্ট সেট-আপ ও পরিচালনা করুন"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"“<xliff:g id="SSID">%1$s</xliff:g>”-এর সাথে কানেক্ট করার জন্য QR কোড মাঝখানে রাখুন"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"QR কোড স্ক্যান করে ওয়াই-ফাইতে যোগ দিন"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"ওয়াই-ফাই শেয়ার করুন"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"“<xliff:g id="SSID">%1$s</xliff:g>”-এ কানেক্ট করতে এই QR কোড স্ক্যান করুন ও পাসওয়ার্ড শেয়ার করুন"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"“<xliff:g id="SSID">%1$s</xliff:g>”-এ যোগ করতে অন্য ডিভাইস ব্যবহার করে এই QR কোড স্ক্যান করুন"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"“<xliff:g id="SSID">%1$s</xliff:g>”-এর সাথে কানেক্ট করতে এই QR কোড স্ক্যান করুন"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"আবার চেষ্টা করুন৷ সমস্যা যদি তাও থেকে যায় তাহলে ডিভাইসের প্রস্তুতকারকের সাথে যোগাযোগ করুন"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"কোনও সমস্যা হয়েছে"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"ওয়াই-ফাইয়ের পাসওয়ার্ড: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"হটস্পটের পাসওয়ার্ড: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"অটো-কানেক্ট"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"এই নেটওয়ার্কের কাছাকাছি আসলেই আপনার ফোন যাতে অটোমেটিক কানেক্ট হয়ে যায়, তার অনুমতি দিন"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"এই নেটওয়ার্কের কাছাকাছি আসলেই আপনার ট্যাবলেট যাতে অটোমেটিক কানেক্ট হয়ে যায়, তার অনুমতি দিন"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"সীমার মধ্যে থাকলে এই নেটওয়ার্কে কানেকশনের অনুমতি দিন"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"ডিভাইস যোগ করুন"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"এই নেটওয়ার্কে কোনও ডিভাইস যোগ করার জন্য QR কোড ব্যবহার করুন"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR কোড ফর্ম্যাট ভুল"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"সিস্টেমের সার্টিফিকেটগুলি ব্যবহার করুন"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"প্রদান করবেন না"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"যাচাই করবেন না"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"কোনও সার্টিফিকেট নির্দিষ্ট করা নেই৷ আপনার কানেকশন ব্যক্তিগত করা হবে না৷"</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"নেটওয়ার্কের নাম খুব বড়।"</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"একটি ডোমেন উল্লেখ করা আবশ্যক৷"</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"সার্টিফিকেট প্রয়োজন।"</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"কানেক্ট করুন"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"ওয়াই-ফাই চালু আছে"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>-এ কানেক্ট আছে"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>-এ কানেক্ট করা হচ্ছে"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"কানেক্ট করা হচ্ছে…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"নেটওয়ার্কের সাথে কানেক্ট করতে ব্যর্থ হয়েছে"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"নেটওয়ার্ক পরিষেবা সীমার মধ্যে নেই"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"অ্যাপ থেকে কন্টেন্ট শেয়ার করা হচ্ছে। ইন্টারনেট কানেকশন শেয়ার করতে হটস্পট বন্ধ করে আবার চালু করুন"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"পাসওয়ার্ড সেট করা নেই"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"হটস্পটের নাম"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> চালু করা হচ্ছে..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> চালু করা হচ্ছে…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> এর সাথে অন্য ডিভাইস কানেক্ট হতে পারে"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"হটস্পটের পাসওয়ার্ড"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP ব্যান্ড"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"স্মুথ ডিসপ্লে"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"কিছু কন্টেন্টের রিফ্রেশ রেট অটোমেটিক ৬০ থেকে ৯০ Hz পর্যন্ত বেড়ে যায়। ব্যাটারির ব্যবহার বেড়ে যায়।"</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"স্মুথ ডিসপ্লে"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"ফোর্স 90 Hz রিফ্রেশ রেট"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"সর্বাধিক রিফ্রেশ রেট সেট করে টাচ রেসপন্সিভনেস এবং অ্যানিমেশন কোয়ালিটি উন্নত করুন। ব্যাটারির খরচ বেড়ে যায়।"</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"স্ক্রিন অ্যাটেনশন"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"চালু আছে / আপনি এটির দিকে তাকিয়ে থাকলে স্ক্রিন বন্ধ হবে না"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android ভার্সন"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android-এর নিরাপত্তা সংক্রান্ত আপডেট"</string>
     <string name="model_info" msgid="8997566254717810904">"মডেল"</string>
-    <string name="model_summary" msgid="2246651782442466213">"মডেল: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"মডেল ও হার্ডওয়্যার"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"হার্ডওয়্যার ভার্সন"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"টুল ID"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"নেটওয়ার্ক সেটিংস আবার সেট করা হয়েছে"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"সিমগুলি মোছা যাচ্ছে না"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"ডাউনলোড করা সিম কোনও সমস্যার জন্য মোছা যাচ্ছে না।\n\nআপনার ডিভাইস আবার চালু করে চেষ্টা করুন।"</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"সমস্ত ডেটা মুছুন (ফ্যাক্টরি রিসেট)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"সবকিছু মুছুন (ফ্যাক্টরি রিসেট)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"এটি আপনার ট্যাবলেটের "<b>"ইন্টারনাল স্টোরেজ"</b>", থেকে সমস্ত ডেটা মুছে দেবে, এগুলি সহ:\n\n"<li>"আপনার Google অ্যাকাউন্ট"</li>\n<li>"সিস্টেম এবং অ্যাপ ডেটা এবং সেটিংস"</li>\n<li>"ডাউনলোড করা অ্যাপ"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"এটি আপনার ফোনের "<b>"ইন্টারনাল স্টোরেজ"</b>", থেকে সমস্ত ডেটা মুছে দেবে, এগুলি সহ:\n\n"<li>"আপনার Google অ্যাকাউন্ট"</li>\n<li>"সিস্টেম এবং অ্যাপ ডেটা এবং সেটিংস"</li>\n<li>"ডাউনলোড করা অ্যাপ"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"আপনি বর্তমানে নিম্নলিখিত অ্যাকাউন্টে সাইন-ইন করে আছেন:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"এই ডিভাইসে অন্যান্য ব্যবহারকারীরাও রয়েছেন৷\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"সঙ্গীত"</li>\n<li>"ফটো"</li>\n<li>"অন্যান্য ব্যবহারকারী ডেটা"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"ই-সিম"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"এতে আপনার মোবাইল পরিষেবার প্ল্যান বাতিল হবে না।"</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"আপনার সঙ্গীত, ছবি এবং অন্যান্য ব্যবহারকারী ডেটা সাফ করতে, "<b>"USB সঞ্চয়স্থানটিকে"</b>" মুছে দিতে হবে।"</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"আপনার সঙ্গীত, ছবি এবং অন্যান্য ব্যবহারকারী ডেটা সাফ করতে, "<b>"SD কার্ডটিকে"</b>" মুছে দিতে হবে।"</string>
+    <string name="main_clear_title" msgid="277664302144837723">"সমস্ত ডেটা মুছুন (ফ্যাক্টরি রিসেট)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"সমস্ত ডেটা মুছুন (ফ্যাক্টরি রিসেট)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"এটি আপনার ট্যাবলেটের "<b>"ইন্টার্নাল স্টোরেজ"</b>" থেকে সমস্ত ডেটা মুছে দেবে, এগুলি সহ:\n\n"<li>"আপনার Google অ্যাকাউন্ট"</li>\n<li>"সিস্টেম এবং অ্যাপ ডেটা এবং সেটিংস"</li>\n<li>"ডাউনলোড করা অ্যাপ"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"এটি আপনার ফোনের "<b>"ইন্টার্নাল স্টোরেজ"</b>" থেকে সমস্ত ডেটা মুছে দেবে, এগুলি সহ:\n\n"<li>"আপনার Google অ্যাকাউন্ট"</li>\n<li>"সিস্টেম এবং অ্যাপ ডেটা এবং সেটিংস"</li>\n<li>"ডাউনলোড করা অ্যাপ"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"আপনি বর্তমানে নিম্নলিখিত অ্যাকাউন্টে সাইন-ইন করে আছেন:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"এই ডিভাইসে অন্যান্য ব্যবহারকারীরাও রয়েছেন।\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"মিউজিক"</li>\n<li>"ফটো"</li>\n<li>"অন্যান্য ব্যবহারকারী ডেটা"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"ই-সিম"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"এতে আপনার মোবাইল পরিষেবার প্ল্যান বাতিল হবে না।"</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"আপনার মিউজিক, ছবি এবং অন্যান্য ব্যবহারকারী ডেটা মোছার জন্য "<b>"ইউএসবি স্টোরেজ"</b>" খালি করতে হবে।"</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"আপনার মিউজিক, ছবি এবং অন্যান্য ব্যবহারকারী ডেটা মোছার জন্য "<b>"এসডি কার্ড"</b>" সরিয়ে দিতে হবে।"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USB স্টোরেজ মুছে ফেলুন"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SD কার্ড মুছে ফেলুন"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"অভ্যন্তরীণ USB সঞ্চয়স্থানের সমস্ত ডেটা মুছে দিন, যেমন সঙ্গীত বা ফটো"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"SD কার্ডের সমস্ত তথ্য মুছে দিন, যেমন সঙ্গীত এবং ফটো"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"সব ডেটা মুছে দিন"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"সব ডেটা মুছে দিন"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"ডাউনলোড করা অ্যাপ সহ আপনার সব ব্যক্তিগত তথ্য মুছে যাবে। এটি আগের অবস্থায় আর ফিরিয়ে আনা যাবে না।"</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"ডাউনলোড করা অ্যাপ ও সিম সহ আপনার সব ব্যক্তিগত তথ্য মুছে যাবে। এটি আগের অবস্থায় আর ফিরিয়ে আনা যাবে না।"</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"সবকিছু মুছে দিন"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"সিস্টেম সাফ করুন পরিষেবাটি উপলব্ধ না থাকার কারণে কোনো আবার সেট করুন নির্দেশ সঞ্চালনা করা যায়নি।"</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"সমস্ত ডেটা মুছে ফেলতে চান?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"এই ব্যবহারকারীর জন্য ফ্যাক্টরি রিসেট উপলব্ধ নেই"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"মোছা হচ্ছে"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"দয়া করে অপেক্ষা করুন..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"সব ডেটা মুছে দিন"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"সব ডেটা মুছে দিন"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"ডাউনলোড করা অ্যাপ সহ আপনার সব ব্যক্তিগত তথ্য মুছে যাবে। এটি আগের অবস্থায় আর ফিরিয়ে আনা যাবে না।"</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"ডাউনলোড করা অ্যাপ ও সিম সহ আপনার সব ব্যক্তিগত তথ্য মুছে যাবে। এটি আগের অবস্থায় আর ফিরিয়ে আনা যাবে না।"</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"সমস্ত ডেটা মুছে ফেলতে চান?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"এই ব্যবহারকারীর জন্য ফ্যাক্টরি রিসেটের সুবিধা উপলভ্য নেই"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"মোছা হচ্ছে"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"একটু অপেক্ষা করুন…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"কল সেটিংস"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"ভয়েসমেল, কল ফরওয়ার্ডিং, কল ওয়েটিং, কলার আইডি সেট-আপ করুন"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB টিথারিং"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> ডিভাইসের থেকে বেশি ডিভাইসে টেদার করা যাবে না।"</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> আনটেদার্ড হয়ে যাবে।"</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"ইথারনেট টিথারিং"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"ইউএসবি কেবেলের মাধ্যমে ফোনের ইন্টারনেট কানেকশন শেয়ার করুন"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"ইথারনেটের মাধ্যমে ফোনের ইন্টারনেট কানেকশন শেয়ার করুন"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"আপনার মোবাইল ডেটা কানেকশন মাধ্যমে অন্যান্য ডিভাইসে ইন্টারনেট কানেকশন দিতে হটস্পট এবং টিথারিং ব্যবহার করুন। অ্যাপগুলিও আশেপাশের ডিভাইসের সাথে কন্টেন্ট শেয়ার করার জন্য হটস্পট তৈরি করে নিতে পারে।"</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"আপনার মোবাইল ডেটা কানেকশন অথবা ওয়াই-ফাই থেকে অন্য ডিভাইসে ইন্টারনেট কানেকশন দিতে হটস্পট এবং টেথারিং ব্যবহার করুন। অ্যাপগুলি আশেপাশের ডিভাইসের সাথে কন্টেন্ট শেয়ার করার জন্য হটস্পট তৈরি করতে পারে।"</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"সহায়তা"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"ক্যাপশন অভিরুচি"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"বড় করে দেখা"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"বড় করার জায়গা"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"স্ক্রিন বড় করে দেখা চালু করার মোড"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"স্ক্রিনকে বড় করার সময় আপনি যে জায়গা বড় করতে চান তা বেছে নিন"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"ফুল স্ক্রিন"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"স্ক্রিনের অংশ"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"ফুল স্ক্রিন এবং স্ক্রিনের অংশ"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"সম্পূর্ণ স্ক্রিন বড় করুন"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"স্ক্রিনের অংশ বড় করুন"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"বদল করে অ্যাক্সেসিবিলিটি বোতাম ব্যবহার করতে চান?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"স্ক্রিনের কিছু অংশ বড় করে দেখার জন্য ট্রিপল ট্যাপ করা হলে টাইপিং এবং অন্যান্য কাজ দেরি হতে পারে।\n\nআপনি কি এর বদলে বড় করে দেখার জন্য অ্যাক্সেসিবিলিটি বোতাম ব্যবহার করতে চান?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"বদল করে অ্যাক্সেসিবিলিটি বোতাম ব্যবহার করুন"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"বড় করে দেখার জন্য ট্রিপল ট্যাপ করার সুবিধা রাখুন"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"বড় করে দেখার সেটিংস"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"তিনবার ট্যাপ করে বড় করে দেখুন"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"শর্টকাটের সাহায্যে বড় করে দেখা"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"পাওয়ার বোতামে কল শেষ হয়"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"বড় মাউস পয়েন্টার"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"অ্যানিমেশন সরিয়ে দিন"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"মোনো অডিও"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"অডিও বাজানোর সময় চ্যানেলগুলিকে একত্রিত করুন"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"অডিও ব্যালেন্স"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"বাঁদিক"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"ডানদিক"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"মোনো অডিও"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"অডিও বাজানোর সময় সব চ্যানেলের অডিও সিঙ্ক করুন"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"অডিও ব্যালেন্স"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"বাঁদিকে"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"ডানদিকে"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"ডিফল্ট"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"১০ সেকেন্ড"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"৩০ সেকেন্ড"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"বিজ্ঞপ্তির ভাইব্রেশন"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"রিং ভাইব্রেশন"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"টাচ ফিডব্যাক"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ব্যবহার করুন"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> খুলুন"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"রঙ সংশোধন ফিচারটি ব্যবহার করুন"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"ক্যাপশন দেখুন"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"শুধুমাত্র সমর্থিত অ্যাপের জন্যই"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ব্যবহার করুন"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> খুলুন"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"কালার কারেকশন ব্যবহার করুন"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"ক্যাপশন দেখুন"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"শুধুমাত্র ব্যবহারযোগ্য অ্যাপের জন্য"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"ক্যাপশনের সাইজ এবং স্টাইল"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> টেক্সটের সাইজ"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"আরও বিকল্প"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"ডিউটারনোম্যালি"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"প্রোটানোম্যালি"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"ট্রিট্যানোম্যালি"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"গ্রেস্কেল"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"লাল-সবুজ"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"লাল-সবুজ"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"নীল-হলুদ"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"ব্যাকগ্রাউন্ডে ব্যবহার সীমাবদ্ধ"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"অ্যাপটি পটভূমিতে চলতে দিন"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"অ্যাপটির পটভুমিতে চালু থাকার অনুমতি নেই"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"ব্যাকগ্রাউন্ডে ব্যবহারের সীমা নির্দিষ্ট করা যায় না"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"ব্যাকগ্রাউন্ড অ্যাক্টিভিটিতে বিধিনিষেধ আরোপ করা যাবে না"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"ব্যাকগ্রাউন্ড অ্যাক্টিভিটি সীমিত করবেন?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"কোনও অ্যাপের ব্যাকগ্রাউন্ড অ্যাক্টিভিটি সীমিত করলে তা সঠিক ভাবে কাজ নাও করতে পারে"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"যেহেতু এই অ্যাপটিকে ব্যাটারি অপ্টিমাইজ করার জন্য সেট করা হয়নি, তাই আপনি এটির অ্যাক্টিভিটি সীমিত করতে পারবেন না।\n\nঅ্যাপের অ্যাক্টিভিটি সীমিত করতে আগে ব্যাটারি অপ্টিমাইজেশন চালু করুন।"</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"সময়সূচি সেট করুন"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"ব্যাটারি আরও বেশি সময় চলবে"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"চার্জের সময় বন্ধ করুন"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"আপনার ফোনের চার্জ <xliff:g id="PERCENT">%1$s</xliff:g> হলে ব্যাটারি সেভার বন্ধ হয়ে যায়"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"আপনার ট্যাবলেটের চার্জ <xliff:g id="PERCENT">%1$s</xliff:g> হলে ব্যাটারি সেভার বন্ধ হয়ে যায়"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"আপনার ডিভাইসের চার্জ <xliff:g id="PERCENT">%1$s</xliff:g> হলে ব্যাটারি সেভার বন্ধ হয়ে যায়"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"আপনার ফোনের চার্জ <xliff:g id="PERCENT">%1$s</xliff:g>-এর বেশি হলে ব্যাটারি সেভার বন্ধ হয়ে যাবে"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"আপনার ট্যাবলেটের চার্জ <xliff:g id="PERCENT">%1$s</xliff:g>-এর বেশি হলে ব্যাটারি সেভার বন্ধ হয়ে যাবে"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"আপনার ডিভাইসের চার্জ <xliff:g id="PERCENT">%1$s</xliff:g>-এর বেশি হলে ব্যাটারি সেভার বন্ধ হয়ে যাবে"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"চালু করুন"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"রিসেট করুন"</string>
     <string name="tts_play" msgid="2945513377250757221">"চালান"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"অ্যাডাপ্টিভ কানেক্টিভিটি"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"আপনার নেটওয়ার্ক কানেকশন অটোমেটিক ম্যানেজ করে ব্যাটারি আরও বেশিক্ষণ ব্যবহার করুন এবং ডিভাইসের পারফর্ম্যান্স উন্নত করুন"</string>
     <string name="credentials_title" msgid="7535942196886123656">"ক্রেডেনশিয়াল স্টোরেজ"</string>
     <string name="credentials_install" msgid="3933218407598415827">"সার্টিফিকেট ইনস্টল করা"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"স্টোরেজ থেকে সার্টিফিকেট ইনস্টল করুন"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"ব্যবহারকারীর সার্টিফিকেট"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"সংরক্ষিত সার্টিফিকেট দেখুন এবং সংশোধন করুন"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"উন্নত"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"স্টোরেজের প্রকার"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"হার্ডওয়্যার-ব্যাকড"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"শুধুমাত্র সফ্টওয়্যার"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"এই ব্যবহারকারীর জন্য প্রমাণপ্রত্রাদি উপলব্ধ নয়"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN এবং অ্যাপ্সের জন্য ইনস্টল করা হয়েছে"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"ওয়াই-ফাই এর জন্য ইনস্টল করা হয়েছে"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"টার্মিনালে পেমেন্টের পদ্ধতি"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"একটি পেমেন্ট অ্যাপ সেট করুন। কন্ট্যাক্টলেস চিহ্ন থাকা যেকোনও টার্মিনালের উপর ফোনের পিছন দিকটি  রাখুন।"</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"বুঝেছি"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"আরো..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"আরও…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"ডিফল্ট পেমেন্ট অ্যাপ সেট করুন"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"ডিফল্ট পেমেন্ট অ্যাপ আপডেট করুন"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"কন্ট্যাক্টলেস টার্মিনালে, <xliff:g id="APP">%1$s</xliff:g> ব্যবহার করে পেমেন্ট করুন"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"কলের জন্য সবসময় এটি ব্যবহার করুন"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"ডেটার জন্য একটি সিম বেছে নিন"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"এসএমএসের জন্য কোনও একটি সিম বেছে নিন"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"ডেটা সিম পাল্টাতে এক মিনিট পর্যন্ত সময় লাগতে পারে..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"ডেটা সিম পাল্টাতে এক মিনিট পর্যন্ত সময় লাগতে পারে…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"এর মাধ্যমে কল করুন"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"একটি সিম কার্ড বেছে নিন"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"সিম <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"রুটিন, সময়সূচি, ব্যাটারি সেভার, পাওয়ার সেভার, ব্যাটারি, অটোমেটিক, শতাংশ"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"VoLTE, উন্নত কলিং, 4G কলিং"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"ভাষা যোগ করুন, কোনও একটি ভাষা যোগ করুন"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"টেক্সটের সাইজ"</string>
     <string name="default_sound" msgid="6604374495015245195">"ডিফল্ট সাউন্ড"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"রিং ও বিজ্ঞপ্তির ভলিউম <xliff:g id="PERCENTAGE">%1$s</xliff:g>-এ সেট করা আছে"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"ভলিউম, ভাইব্রেশন, বিরক্ত করবে না"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"ধ্বনিগুলিতে শক্তি"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"লাইভ ক্যাপশন"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"মিডিয়া অটোমেটিক ক্যাপশন করুন"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"কোনওটিই নয়"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g>টি শিডিউল সেট করা হয়েছে</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g>টি শিডিউল সেট করা হয়েছে</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{একটিও নেই}=1{১টি শিডিউল সেট করা হয়েছে}one{#টি শিডিউল সেট করা হয়েছে}other{#টি শিডিউল সেট করা হয়েছে}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"বিরক্ত করবে না"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"শুধু গুরুত্বপূর্ণ লোকজন এবং অ্যাপ থেকে বিজ্ঞপ্তি পান"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"বিরক্তিকর কন্টেন্ট বন্ধ করা"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"শুধুমাত্র অগ্রাধিকার"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"চালু / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"বন্ধ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"বন্ধ"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"চালু"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"প্রতিবার জিজ্ঞেস করুন"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"যতক্ষণ না আপনি বন্ধ করছেন"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> ঘণ্টা</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> ঘণ্টা</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> মিনিট"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g>টি সময়সূচী নিজে থেকে চালু হতে পারে</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g>টি সময়সূচী নিজে থেকে চালু হতে পারে</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{১ ঘণ্টা}one{# ঘণ্টা}other{# ঘণ্টা}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{১ মিনিট}one{# মিনিট}other{# মিনিট}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{বন্ধ আছে}=1{বন্ধ আছে / ১টি শিডিউল অটোমেটিক চালু হতে পারে}one{বন্ধ আছে / #টি শিডিউল অটোমেটিক চালু হতে পারে}other{বন্ধ আছে / #টি শিডিউল অটোমেটিক চালু হতে পারে}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"\'বিরক্ত করবে না\' মোড কী কারণে বাধা পেতে পারে"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"লোকজন"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"অ্যাপ"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"কম অগ্রাধিকার সম্পন্ন বিজ্ঞপ্তি অটোমেটিক সাইলেন্ট মোডে সেট করা থাকে"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"অ্যাডাপ্টিভ বিজ্ঞপ্তির র‌্যাঙ্কিং"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"প্রাসঙ্গিকতার ভিত্তিতে অটোমেটিক র‌্যাঙ্কিংয়ের বিজ্ঞপ্তি"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"অ্যাডাপ্টিভ বিজ্ঞপ্তির মতামত"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"বিজ্ঞপ্তি দেখানোর ক্ষেত্রে করা পরিবর্তনগুলি জানায় এবং সিস্টেমে মতামত জানানোর বিকল্প দেখায়"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"সাজেস্ট করা অ্যাকশন ও উত্তর"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"সাজেস্ট করা অ্যাকশন ও উত্তর অটোমেটিক দেখানো হয়"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"সাম্প্রতিক এবং স্নুজ করা বিজ্ঞপ্তি দেখুন"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"বিরক্ত করবে না মোডের ক্ষেত্রে অ্যাক্সেস"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"\'বিরক্ত করবে না\' মোডের জন্য অনুমতি দিন"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"ইনস্টল করা নেই এমন অ্যাপগুলি বিরক্ত করবে না অ্যাক্সেস করুন এর অনুরোধ জানিয়েছে"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"অ্যাপ্লিকেশানগুলি লোড করা হচ্ছে..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"অ্যাপ লোড হচ্ছে…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"আপনার অনুরোধ অনুযায়ী Android এই অ্যাপের বিজ্ঞপ্তি এই ডিভাইসে দেখাচ্ছে না"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"আপনার অনুরোধ অনুযায়ী Android এই বিভাগের বিজ্ঞপ্তিগুলি এই ডিভাইসে দেখাচ্ছে না"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"আপনার অনুরোধ অনুযায়ী Android এই ধরনের বিজ্ঞপ্তিগুলি এই ডিভাইসে দেখাচ্ছে না"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"সমস্ত কথোপকথন"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"গুরুত্বপূর্ণ কথোপকথন"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"এমন কেউ নেই"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g>টি কথোপকথন</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g>টি কথোপকথন</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"এমন কেউ নেই"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{একটিও নেই}=1{১টি কথোপকথন}one{#টি কথোপকথন}other{#টি কথোপকথন}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"যেগুলি \'বিরক্ত করবে না\' মোড এড়িয়ে নিজের কাজ করতে পারে"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"কল"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"কল"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"কল আসলে রিং বাজবে কিনা তা নিশ্চিত করতে ডিভাইসটি রিং হওয়ার মোডে সেট করা আছে কিনা"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’-এর জন্য ইনকামিং কল ব্লক করা হয়েছে। আপনার বন্ধুবান্ধব, পরিবারের সদস্য অথবা অন্য পরিচিতিরা যাতে আপনার সাথে যোগাযোগ করতে পারেন তার জন্য আপনি সেটিংস অ্যাডজাস্ট করে নিতে পারেন।"</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"তারা চিহ্নিত পরিচিতি"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one">আরও <xliff:g id="NUM_PEOPLE">%d</xliff:g>টি</item>
-      <item quantity="other">আরও <xliff:g id="NUM_PEOPLE">%d</xliff:g>টি</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"কোনও তারা চিহ্নিত পরিচিতি নেই"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{কেউ নেই}=1{{contact_1}}=2{{contact_1} এবং {contact_2}}=3{{contact_1}, {contact_2} এবং {contact_3}}one{{contact_1}, {contact_2} এবং অন্যান্য #জন}other{{contact_1}, {contact_2} এবং অন্যান্য #জন}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Messages"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"মেসেজ"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Messages"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’-এর জন্য ইনকামিং মেসেজ ব্লক করা হয়েছে। আপনার বন্ধুবান্ধব, পরিবারের সদস্য অথবা অন্য পরিচিতিরা যাতে আপনার সাথে যোগাযোগ করতে পারেন তার জন্য আপনি সেটিংস অ্যাডজাস্ট করে নিতে পারেন।"</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"আপনার ফোনে সব মেসেজই আসতে পারবে"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"এক্ষেত্রে আপনার ফোনে সব কলই আসবে"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"কোনও পরিচিতি নেই"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g>টি পরিচিতি</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g>টি পরিচিতি</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{কেউ নেই}=1{১টি পরিচিতি}one{#টি পরিচিতি}other{#টি পরিচিতি}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"যেকেউ"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"পরিচিতি"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"তারা চিহ্নিত পরিচিতিগুলি"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"সব বিজ্ঞপ্তি"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"কিছু বিজ্ঞপ্তি"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"এমনকী আপনি অ্যাপগুলিকে বিরক্ত করতে না দিলেও বেছে নেওয়া লোকজন আপনার সাথে যোগাযোগ করতে পারবেন"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one"><xliff:g id="APP_NAMES">%s</xliff:g> বাধা দিতে পারবে</item>
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> বাধা দিতে পারবে</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"আরও <xliff:g id="NUMBER">%d</xliff:g>টি"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{কোনও অ্যাপই বাধা দিতে পারবে না}=1{{app_1} বাধা দিতে পারবে}=2{{app_1} ও {app_2} বাধা দিতে পারবে}=3{{app_1}, {app_2} ও {app_3} বাধা দিতে পারবে}one{{app_1}, {app_2}, ও #টি অ্যাপ বাধা দিতে পারবে}other{{app_1}, {app_2}, ও #টি অ্যাপ বাধা দিতে পারবে}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"অ্যাপ"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"সমস্ত বিজ্ঞপ্তি"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"কিছু বিজ্ঞপ্তি"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"যে বিজ্ঞপ্তিগুলি \'বিরক্ত করবে না\' মোড এড়িয়ে নিজের কাজ করতে পারে"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"সব বিজ্ঞপ্তিকে অনুমতি দিন"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> বাধা দিতে পারবে</item>
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> বাধা দিতে পারবে</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"কিছুই বাধা দিতে পারবে না"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"আরও <xliff:g id="NUMBER">%d</xliff:g>টি"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{কিছুই বাধা দিতে পারবে না}=1{{sound_category_1} বাধা দিতে পারবে}=2{{sound_category_1} ও {sound_category_2} বাধা দিতে পারবে}=3{{sound_category_1}, {sound_category_2} ও {sound_category_3} বাধা দিতে পারবে}one{{sound_category_1}, {sound_category_2}, ও #টি অ্যাপ বাধা দিতে পারবে}other{{sound_category_1}, {sound_category_2}, ও #টি অ্যাপ বাধা দিতে পারবে}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"কেউ বাধা দিতে পারবে না"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"কেউই বাধা দিতে পারবে না"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"কিছু লোকজন বাধা দিতে পারবে"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"সবাই বাধা দিতে পারবে"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"ইউএসবি দ্বারা নিয়ন্ত্রিত"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"কানেক্ট থাকা ডিভাইস"</string>
     <string name="usb_control_device" msgid="527916783743021577">"এই ডিভাইসটি"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"পাল্টানো হচ্ছে…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"পাল্টানো হচ্ছে…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"পাল্টানো যায়নি"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"এই ডিভাইসটি চার্জ করা হচ্ছে"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"কানেক্ট ডিভাইসে চার্জ দেওয়া"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"বিবরণ দেখুন"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"ডেটা সেভার"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"অসীমিত ডেটা"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"পটভূমির ডেটা বন্ধ রয়েছে"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"ব্যাকগ্রাউন্ড ডেটা বন্ধ করা আছে"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"চালু আছে"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"বন্ধ আছে"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"ডেটা সেভার ব্যবহার করুন"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"যদি ডিভাইসটি লক থাকে তাহলে, বিজ্ঞপ্তিগুলির মধ্যে উত্তর বা অন্যান্য পাঠ্য লেখা আটকায়"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"ডিফল্ট বানান পরিক্ষক"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"বানান পরীক্ষক চয়ন করুন"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"বানান পরিক্ষক ব্যবহার করুন"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"বানান-পরীক্ষক ফিচার ব্যবহার করুন"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"নির্বাচন করা হয়নি"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(কোনো কিছুই নয়)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"স্টোরেজ খালি করার কাজে সাহায্য করার জন্য, স্টোরেজ ম্যানেজার আপনার ডিভাইস থেকে ব্যাক-আপ নেওয়া ফটো এবং ভিডিওগুলিকে সরিয়ে দেয়৷"</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"ফটো এবং ভিডিওগুলিকে সরান"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"সঞ্চয়স্থানের পরিচালক"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"স্টোরেজ পরিচালক ব্যবহার করুন"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"\'স্টোরেজ ম্যানেজার\' ব্যবহার করুন"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"অটোমেটিক"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"ম্যানুয়াল"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"এখনই জায়গা খালি করুন"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"ফোন চেক করতে ডাবল-ট্যাপ করুন"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"ট্যাবলেট চেক করতে ডাবল-ট্যাপ করুন"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"ডিভাইস চেক করতে ডাবল-ট্যাপ করুন"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"বিজ্ঞপ্তি দেখতে সোয়াইপ করুন"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"বিজ্ঞপ্তি দেখার জন্য স্ক্রিনের নিচের দিকে সোয়াইপ করুন"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"এক হাতে ব্যবহার করার মোড"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"এক হাতে ব্যবহার করার মোড ব্যবহার করুন"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"একটি অ্যাপ থেকে আরেকটিতে যাওয়ার সময় বেরিয়ে আসুন"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"সময় সমাপ্ত"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"৪ সেকেন্ড"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"৮ সেকেন্ড"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"১২ সেকেন্ড"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"রিচেবিলিটি"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"সময়, বিজ্ঞপ্তি এবং অন্যান্য তথ্য দেখতে আপনার স্ক্রিনে ডবল-ট্যাপ করুন।"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"ফোন চেক করতে সেটিকে হাতে নিন"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"চেক করতে ট্যাবলেটটিকে হাতে নিন"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"ট্যাবলেট যাচাই করতে ট্যাপ করুন"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"ডিভাইস যাচাই করতে ট্যাপ করুন"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"সময়, বিজ্ঞপ্তি এবং অন্যান্য তথ্য দেখতে আপনার স্ক্রিনে ট্যাপ করুন।"</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"প্যানিক বোতাম"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"পাওয়ার বোতাম ৫ বার দ্রুত প্রেস করে জরুরি SOS অ্যাকশন চালু করুন।"</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"সতর্কতামূলক শব্দ"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"অ্যাকশন শুরু করার আগে সতর্কতা সম্পর্কিত বিজ্ঞপ্তি"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"জরুরি পরিচিতি"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"বিজ্ঞপ্তির জন্য আঙ্গুলের ছাপ সোয়াইপ করা"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"আঙ্গুলের ছাপ সোয়াইপ করুন"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"আপনার বিজ্ঞপ্তিগুলি চেক করতে, আপনার ফোনের পিছনে আঙ্গুলের ছাপ নেওয়ার সেন্সরে নিচের দিকে সোয়াইপ করুন৷"</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"সব অ্যাপের জন্য চালু করুন"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"গ্রাফিক্স ড্রাইভার বেছে নিন"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"ডিফল্ট"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"গেম ড্রাইভার"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"গেম ড্রাইভার"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"ডেভেলপার ড্রাইভার"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"সিস্টেম গ্রাফিক্স ড্রাইভার"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"নেটওয়ার্ক পাওয়া যায়নি। আবার চেষ্টা করুন।"</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(নিষিদ্ধ)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"কোনও সিম কার্ড নেই"</string>
+    <string name="sim_card" msgid="6381158752066377709">"সিম"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"কোনও সিম নেই"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"কোনও কিছুই নয়"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"কানেক্ট করার জন্য সিম প্রয়োজন"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"কানেক্ট করার জন্য <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> সিম প্রয়োজন"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"পছন্দের নেটওয়ার্ক মোড: বেছে নেওয়া WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"পছন্দের নেটওয়ার্ক মোড: শুধুমাত্র GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"পছন্দের নেটওয়ার্ক মোড: শুধুমাত্র WCDMA"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"মোবাইল ডেটা"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"মোবাইল নেটওয়ার্ক ব্যবহার করে ডেটা অ্যাক্সেস করুন"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"সীমার মধ্যে আসলে ফোনটি এই প্রদানকারীর পরিষেবা অটোমেটিক ব্যবহার করবে"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"কোনও সিম কার্ড নেই"</string>
     <string name="calls_preference" msgid="2166481296066890129">"কোন নেটওয়ার্ক থেকে কল করবেন"</string>
     <string name="sms_preference" msgid="7742964962568219351">"কোন নেটওয়ার্কে এসএমএস পাবেন"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"প্রতিবার জিজ্ঞাসা করা হবে"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"সেটিংসে স্ক্রিন ওভারলে করার অনুমতি দিন"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"যেসব অ্যাপ অন্যান্য অ্যাপের উপর কন্টেন্ট দেখাতে পারে সেগুলিকে সেটিংস স্ক্রিনের উপর ওভারলে করার অনুমতি দিন"</string>
     <string name="media_controls_title" msgid="403271085636252597">"মিডিয়া"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"মিডিয়া সেশন শেষ হয়ে গেলে প্লেয়ার লুকান"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"আপনি প্লেয়ার ব্যবহার করে বড় করা দ্রুত সেটিংস প্যানেল থেকে সেশন আবার শুরু করতে পারবেন।"</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"দ্রুত সেটিংসে মিডিয়া প্লেয়ার"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"প্লেব্যাক সহজেই আবার শুরু করতে, মিডিয়া প্লেয়ারকে আরও দীর্ঘ সময়ের জন্য দেখান"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"প্লেয়ার লুকান"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"প্লেয়ার দেখুন"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"কোনও প্লেয়ার উপলভ্য নেই"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"অনুমোদিত অ্যাপ"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"মিডিয়া"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth চালু হবে"</string>
 </resources>
diff --git a/res/values-bs/arrays.xml b/res/values-bs/arrays.xml
index 154723b..adf1877 100644
--- a/res/values-bs/arrays.xml
+++ b/res/values-bs/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Srednje"</item>
     <item msgid="6740026006576843477">"Dugo"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Kratko"</item>
+    <item msgid="7397961711906421599">"Srednje"</item>
+    <item msgid="4079132024502041928">"Dugo"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Zadano"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Globalno"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Samo TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Globalno"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index e75c449..b3876bd 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -216,8 +216,8 @@
     <string name="dlg_remove_locales_error_title" msgid="5875503658221562572">"Ne mogu se ukloniti svi jezici"</string>
     <string name="dlg_remove_locales_error_message" msgid="6504279959974675302">"Zadržite najmanje jedan preferirani jezik"</string>
     <string name="locale_not_translated" msgid="5079729745235316146">"Možda nije dostupno u nekim aplikacijama"</string>
-    <string name="action_drag_label_move_up" msgid="3392196942330705015">"Pomjeri prema gore"</string>
-    <string name="action_drag_label_move_down" msgid="9069518740553953426">"Pomjeri prema dolje"</string>
+    <string name="action_drag_label_move_up" msgid="3392196942330705015">"Pomjeri nagore"</string>
+    <string name="action_drag_label_move_down" msgid="9069518740553953426">"Pomjeri nadolje"</string>
     <string name="action_drag_label_move_top" msgid="2430471023612171619">"Pomjeri na vrh"</string>
     <string name="action_drag_label_move_bottom" msgid="6266165197792827003">"Pomjeri na dno"</string>
     <string name="action_drag_label_remove" msgid="1034900377796780568">"Ukloni jezik"</string>
@@ -298,7 +298,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Prikazuj informacije o profilu na zaključ. ekranu"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Računi"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Lokacija"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Koristi lokaciju"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Koristi lokaciju"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Isključeno"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">Uključeno – <xliff:g id="COUNT_1">%1$d</xliff:g> aplikacija ima pristup lokaciji</item>
@@ -332,6 +332,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Koristite lice za autentifikaciju"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Započni"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Ako je otključavanje licem za pristupačnost isključeno, neki koraci za postavljanje možda neće funkcionirati ispravno s Talkbackom."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Nazad"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Nastavi postavljanje"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Koristi postavku za pristupačnost"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -627,7 +630,6 @@
       <item quantity="other">Ukupan broj cifara mora biti manji od <xliff:g id="NUMBER_1">%d</xliff:g></item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Administrator uređaja ne dozvoljava korištenje nedavnog PIN-a"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Vaš IT administrator je blokirao česte PIN kôdove. Probajte drugi PIN kôd."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Ne može sadržavati nevažeći znak"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Mora sadržavati najmanje jedno slovo"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Mora sadržavati najmanje jednu cifru"</string>
@@ -668,7 +670,6 @@
       <item quantity="other">Mora sadržavati najmanje <xliff:g id="COUNT">%d</xliff:g> znakova koji nisu brojevi</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Administrator uređaja ne dozvoljava korištenje nedavne lozinke"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Vaš IT administrator je blokirao česte lozinke. Probajte drugu lozinku."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Nije dozvoljen rastući, opadajući ili ponavljajući niz cifara"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Potvrdi"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Otkaži"</string>
@@ -812,7 +813,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"WiFi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Uključite Wi‑Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"WiFi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Koristi WiFi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Koristi WiFi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"WiFi postavke"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"WiFi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Podešavanje bežičnih pristupnih tačaka i upravljanje njima"</string>
@@ -920,7 +921,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Centrirajte QR kôd ispod da se povežete na mrežu “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Skenirajte QR kôd da se pridružite WiFi mreži"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Dijeli WiFi mrežu"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Skenirajte ovaj QR kôd da se povežete s mrežom “<xliff:g id="SSID">%1$s</xliff:g>” i dijelite lozinku"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Skenirajte ovaj QR kôd pomoću drugog uređaja da se pridružite mreži “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Skenirajte ovaj QR kôd da se povežete s mrežom “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Pokušajte ponovo. Ako se problem ne riješi, kontaktirajte proizvođača uređaja"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Nešto nije uredu"</string>
@@ -946,8 +947,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Lozinka WiFi mreže: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Lozinka pristupne tačke: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Automatsko povezivanje"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Dozvoli telefonu da se automatski poveže kada je u blizini ove mreže"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Dozvoli tabletu da se automatski poveže kada je u blizini ove mreže"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Dozvolite povezivanje s ovom mrežom kada je u dometu"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Dodaj uređaj"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Dodajte uređaj na ovu mrežu pomoću QR koda"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"Format QR koda nije važeći"</string>
@@ -959,7 +959,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Koristi certifikate sistema"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Ne navodi"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Ne potvrđuj valjanost"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Nije naveden certifikat. Veza neće biti privatna."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Naziv mreže je predug."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Morate navesti domenu."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Potreban je certifikat."</string>
@@ -986,6 +985,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Poveži se"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"WiFi je uključen"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Povezano s mrežom <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Povezivanje s mrežom <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Povezivanje…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Povezivanje na mrežu nije uspjelo"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Mreža nije u dometu"</string>
@@ -1060,7 +1060,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Aplikacija dijeli sadržaj. Za dijeljenje internetske veze isključite pa uključite pristupnu tačku"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Lozinka nije postavljena"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Naziv pristupne tačke"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Uključivanje pristupne tačke <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Uključivanje pristupne tačke <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Drugi uređaji se mogu povezati na pristupnu tačku <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Lozinka pristupne tačke"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP opseg"</string>
@@ -1210,7 +1210,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Glatki prikaz"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Automatski povećava interval osvježavanja sa 60 na 90 Hz za određeni sadržaj. Povećava potrošnju baterije."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Glatki prikaz"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Nametni brzinu osvježavanja od 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Najveća brzina osvježavanja za poboljšanu reakciju na dodir i kvalitet animacije. Povećava potrošnju baterije."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Svjesni ekran"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Uključeno / ekran se neće isključiti ako gledate u njega"</string>
@@ -1350,7 +1350,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Verzija Androida"</string>
     <string name="security_patch" msgid="4071756145347865382">"Sigurnosno ažuriranje za Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Model"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Model: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Model i hardver"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Verzija hardvera"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ID opreme"</string>
@@ -1625,31 +1624,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Postavke mreže vraćene su na zadano"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Nije moguće izbrisati SIM-ove"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Preuzete SIM-ove nije moguće izbrisati zbog greške.\n\nPonovo pokrenite uređaj i pokušajte ponovo."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Izbriši sve podatke (vraćanje na fabričke postavke)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Potpuno izbriši sve podatke"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Na ovaj način će se izbrisati svi podaci "<b>"interne memorije"</b>" tableta, uključujući:\n\n"<li>"Google račun"</li>\n<li>"sistemske i aplikacijske podatke i postavke"</li>\n<li>"preuzete aplikacije"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Na ovaj način će se izbrisati svi podaci "<b>"interne memorije"</b>" telefona, uključujući:\n\n"<li>"vaš Google račun"</li>\n<li>"podatke i postavke sistema i aplikacija"</li>\n<li>"preuzete aplikacije"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Trenutno ste prijavljeni u sljedeće račune:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Drugi korisnici su prisutni na ovom uređaju.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"muziku"</li>\n<li>"fotografije"</li>\n<li>"ostale korisničke podatke"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM-ove"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Ovim se neće otkazati vaš plan usluga mobilnog operatera."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Da biste izbrisali muziku, slike i ostale korisničke podatke, "<b>"USB pohrana"</b>" treba biti izbrisana."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Da biste izbrisali muziku, slike i ostale korisničke podatke, "<b>"SD kartica"</b>" treba biti izbrisana."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Potpuno izbriši sve podatke (vraćanje na fabričke postavke)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Potpuno izbriši sve podatke (vraćanje na fabričke postavke)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Ovim će se u potpunosti izbrisati svi podaci "<b>"unutrašnje memorije"</b>" tableta, uključujući:\n\n"<li>"vaš Google račun"</li>\n<li>"podatke i postavke sistema i aplikacija"</li>\n<li>"preuzete aplikacije"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Ovim će se potpuno izbrisati svi podaci "<b>"unutrašnje memorije"</b>" telefona, uključujući:\n\n"<li>"vaš Google račun"</li>\n<li>"podatke i postavke sistema i aplikacija"</li>\n<li>"preuzete aplikacije"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Trenutno ste prijavljeni na sljedećim računima:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Drugi korisnici su prisutni na ovom uređaju.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"muziku"</li>\n<li>"fotografije"</li>\n<li>"ostale korisničke podatke"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM-ove"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Ovim se neće otkazati vaš plan usluga mobilnog operatera."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Da obrišete muziku, slike i druge korisničke podatke, potrebno je potpuno izbrisati podatke s "<b>"USB memorije"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Da obrišete muziku, slike i druge korisničke podatke, potrebno je potpuno izbrisati podatke sa "<b>"SD kartice"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Izbriši USB pohranu"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Izbriši SD karticu"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Izbrišite sve podatke na internoj USB pohrani, poput muzike ili fotografija"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Izbrišite sve podatke na SD kartici, poput muzike ili fotografija"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Izbriši sve podatke"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Izbriši sve podatke"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Izbrisat će se svi vaši lični podaci i preuzete aplikacije. Ne možete poništiti ovu radnju."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Izbrisat će se svi vaši lični podaci, uključujući preuzete aplikacije i SIM-ove. Ne možete poništiti ovu radnju."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Izbriši sve"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Resetovanje nije izvršeno jer usluga Brisanje sistema nije dostupna."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Izbrisati sve podatke?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Vraćanje na fabričke postavke nije dostupno za ovog korisnika"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Brisanje u toku"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Pričekajte..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Potpuno izbriši sve podatke"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Potpuno izbriši sve podatke"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Izbrisat će se svi vaši lični podaci i preuzete aplikacije. Ne možete poništiti ovu radnju."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Izbrisat će se svi vaši lični podaci, uključujući preuzete aplikacije i SIM-ove. Ne možete poništiti ovu radnju."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Potpuno izbrisati sve podatke?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Vraćanje na fabričke postavke nije dostupno za ovog korisnika"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Brisanje"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Pričekajte…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Postavke poziva"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Postavite govornu poštu, prosljeđivanje poziva, poziv na čekanju, ID pozivaoca"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Povezivanje mobitela USB-om"</string>
@@ -1697,7 +1694,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Nije se moguće povezati sa više od <xliff:g id="MAXCONNECTION">%1$d</xliff:g> uređaja."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Prestat će se dijeliti veza s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Povez. putem mob. za eth."</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Dijeljenje internetske veze telefona putem USB etherneta"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Dijeljenje internetske veze telefona putem etherneta"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Koristite pristupnu tačku i povezivanje putem mobitela za pružanje interneta drugim uređajima putem veze za prijenos podataka na mobilnoj mreži. Aplikacije također mogu kreirati pristupne tačke za dijeljenje sadržaja s uređajima u blizini."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Koristite pristupnu tačku i povezivanje putem mobitela za pružanje interneta drugim uređajima putem WiFi mreže ili veze za prijenos podataka na mobilnoj mreži. Aplikacije također mogu kreirati pristupne tačke za dijeljenje sadržaja s uređajima u blizini."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Pomoć"</string>
@@ -2141,13 +2138,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Postavke titlova"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Uvećavanje"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Područje uvećavanja"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Omogućavanje uvećavanja"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Odabir područja uvećavanja koja želite koristiti prilikom uvećavanja ekrana"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Cijeli ekran"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Dio ekrana"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Cijeli ekran i dio ekrana"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Povećavanje cijelog ekrana"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Uvećavanje dijela ekrana"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Prebaciti na dugme Pristupačnost?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Trostruki dodir za uvećavanje dijela ekrana će prouzrokovati kašnjenje unosa teksta i drugih radnji. \n\nŽelite li prebaciti na korištenje dugmeta Pristupačnost za uvećavanje?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Prebaci na dugme Pristupačnost"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Zadrži trostruki dodir za uvećavanje"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Postavke uvećavanja"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Uvećavanje trostrukim dodirom"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Uvećavanje pomoću prečice"</string>
@@ -2201,11 +2201,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Dugme uklj./isklj. prekida poziv"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Veliki pokazivač miša"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Ukloni animacije"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Mono audio"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Kombiniranje kanala prilikom reprodukcije zvuka"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Balans zvuka"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Lijevo"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Desno"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Mono zvuk"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Kombiniranje kanala prilikom reprodukcije zvuka"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Balans zvuka"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Lijevo"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Desno"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Zadano"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 sekundi"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 sekundi"</string>
@@ -2235,11 +2235,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Vibracija obavještenja"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Vibracija pri zvonu"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Vibracija na dodir"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Koristi <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Otvori aplikaciju <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Koristi ispravku boje"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Prikaži titlove"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Samo za podržane aplikacije"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Korištenje aplikacije <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Otvaranje aplikacije <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Koristi ispravku boja"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Prikaži titlove"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Samo za podržane aplikacije"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Veličina i stil titlova"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Veličina teksta: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Više opcija"</string>
@@ -2270,6 +2270,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomalija"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomalija"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomalija"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Nijanse sive"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Crveno-zeleno"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Crveno-zeleno"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Plavo-žuto"</string>
@@ -2405,7 +2406,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Ograničenje rada u pozadini"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Dopustite aplikaciji da radi u pozadini"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Aplikaciji nije dopušteno da radi u pozadini"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Nije moguće ograničiti upotrebu u pozadini"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Nije moguće ograničiti upotrebu u pozadini"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Ograničiti aktivnost u pozadini?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Ako aplikaciji ograničite aktivnost u pozadini, može raditi nepravilno"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Aplikaciju ne možete ograničiti jer nije postavljena optimizacija baterije.\n\nDa je ograničite prvo uključite optimizaciju."</string>
@@ -2629,9 +2630,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Postavite raspored"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Produžite vijek trajanja baterije"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Isključi nakon punjenja"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Ušteda baterije se isključuje kada je baterija telefona napunjena <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Ušteda baterije se isključuje kada je baterija tableta napunjena <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Ušteda baterije se isključuje kada je baterija uređaja napunjena <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Ušteda baterije se isključuje kada se telefon napuni više od <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Ušteda baterije se isključuje kada se tablet napuni više od <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Ušteda baterije se isključuje kada se uređaj napuni više od <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Uključi"</string>
@@ -2696,6 +2697,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Vrati na zadano"</string>
     <string name="tts_play" msgid="2945513377250757221">"Pokreni"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Prilagodljiva povezivost"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Produžava vijek trajanja baterije i poboljšava performanse uređaja automatskim upravljanjem vaših mrežnih veza"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Pohrana akreditiva"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Instaliranje certifikata"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Instaliranje certifikata iz pohrane"</string>
@@ -2707,9 +2710,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Korisnički akreditivi"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Prikaz i izmjena pohranjenih akreditiva"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Napredno"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Vrsta pohrane"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Sa hardverskom podlogom"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Samo softverski"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Akreditivi nisu dostupni za ovog korisnika"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Instalirani za VPN i aplikacije"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Instalirani za WiFi mrežu"</string>
@@ -3103,7 +3103,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Plaćanje na terminalu"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Postavite aplikaciju za plaćanje, zatim jednostavno prislonite poleđinu svog telefona uz bilo koji terminal označen simbolom beskontaktnog povezivanja."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Razumijem"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Više..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Više…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Postavite zadanu aplikaciju za plaćanje"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Ažurirajte zadanu aplikaciju za plaćanje"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Na terminalu za beskontaktno plaćanje, platite koristeći aplikaciju <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3187,7 +3187,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Uvijek koristi ovo za pozive"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Odaberite SIM za podatke"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Odaberite SIM za SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Prebacuje se SIM za prijenos podataka. Ovo može potrajati najviše jednu minutu..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Prebacivanje SIM-a za prijenos podataka. Ovo može potrajati najviše jednu minutu…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Poziv putem"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Odaberite SIM karticu"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3331,6 +3331,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"rutina, raspored, ušteda baterije, ušteda energije, baterija, automatski, procenat"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, napredno pozivanje, 4g pozivanje"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"dodavanje jezika, dodaj jezik"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"veličina teksta"</string>
     <string name="default_sound" msgid="6604374495015245195">"Podrazumijevani zvuk"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Zvuk zvona i obavještenja postavljen je na <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Jačina zvuka, vibracija, Ne ometaj"</string>
@@ -3370,12 +3371,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Uključivanje zvukova"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Automatski titlovi"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Automatski titluj medije"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Nema"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one">Postavljen je <xliff:g id="ON_COUNT">%d</xliff:g> raspored</item>
-      <item quantity="few">Postavljena su <xliff:g id="ON_COUNT">%d</xliff:g> rasporeda</item>
-      <item quantity="other">Postavljeno je <xliff:g id="ON_COUNT">%d</xliff:g> rasporeda</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Nema}=1{Postavljen je 1 raspored}one{Postavljen je # raspored}few{Postavljena su # rasporeda}other{Postavljeno je # rasporeda}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Ne ometaj"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Primajte obavještenja samo od važnih osoba i aplikacija"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Ograničite ometanja"</string>
@@ -3443,22 +3439,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Samo prioriteti"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Uključeno / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Isključeno / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Isključeno"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Uključeno"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Pitaj svaki put"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Dok ne isključite"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> sat</item>
-      <item quantity="few"><xliff:g id="NUM_HOURS">%d</xliff:g> sata</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> sati</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> min"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> raspored se može automatski uključiti</item>
-      <item quantity="few"><xliff:g id="ON_COUNT">%d</xliff:g> rasporeda se mogu automatski uključiti</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> rasporeda se može automatski uključiti</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 sat}one{# sat}few{# sata}other{# sati}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minuta}one{# minuta}few{# minute}other{# minuta}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Isključeno}=1{Isključeno/1 raspored se može automatski uključiti}one{Isključeno/# raspored se može automatski uključiti}few{Isključeno/# rasporeda se mogu automatski uključiti}other{Isključeno/# rasporeda se može automatski uključiti}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Šta može prekinuti funkciju Ne ometaj"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Osobe"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Aplikacije"</string>
@@ -3504,6 +3490,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Obavještenja niskog prioriteta automatski će se postaviti na Diskretno"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Prilagodljivo rangiranje obavještenja"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Automatski rangira obavještenja prema relevantnosti"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Povratne informacije o prilagodljivim obavještenjima"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Pokazivanje prilagođavanja obavještenja i prikaz opcije za pružanje povratnih informacija sistemu"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Predložene radnje i odgovori"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Automatski se prikazuju predložene radnje i odgovori"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Pregledajte nedavna i odgođena obavještenja"</string>
@@ -3705,7 +3693,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Pristup načinu rada Ne ometaj"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Dozvoli način rada Ne ometaj"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Nijedna instalirana aplikacija nije zatražila pristup za Ne ometaj"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Učitavaju se aplikacije..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Učitavanje aplikacija…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Na vaš zahtjev, Android blokira pojavljivanje obavještenja iz ove aplikacije na ovom uređaju"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Na vaš zahtjev, Android blokira pojavljivanje ove kategorije obavještenja na ovom uređaju"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Na vaš zahtjev, Android blokira pojavljivanje ove grupe obavještenja na ovom uređaju"</string>
@@ -3800,12 +3788,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Svi razgovori"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Prioritetni razgovori"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Nema"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> razgovor</item>
-      <item quantity="few"><xliff:g id="CONVERSATIONS">%d</xliff:g> razgovora</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> razgovora</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Nema"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Nema}=1{1 razgovor}one{# razgovor}few{# razgovora}other{# razgovora}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Ko vas može prekinuti"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Pozivi"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Pozivi"</string>
@@ -3814,12 +3797,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Da se uvjerite da ćete čuti dozvoljene pozive, provjerite je li uređaj postavljen da zvoni"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Dolazni pozivi su blokirani za raspored \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\". Postavke možete podesiti da omogućite prijateljima, porodici ili drugim kontaktima da vas kontaktiraju."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Kontakti označeni zvjezdicom"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one">još <xliff:g id="NUM_PEOPLE">%d</xliff:g> osoba</item>
-      <item quantity="few">još <xliff:g id="NUM_PEOPLE">%d</xliff:g> osobe</item>
-      <item quantity="other">još <xliff:g id="NUM_PEOPLE">%d</xliff:g> osoba</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Ništa"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Nema}=1{{contact_1}}=2{{contact_1} i {contact_2}}=3{{contact_1}, {contact_2} i {contact_3}}one{{contact_1}, {contact_2} i još # kontakt}few{{contact_1}, {contact_2} i još # kontakta}other{{contact_1}, {contact_2} i još # kontakata}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Poruke"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"poruke"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Poruke"</string>
@@ -3828,12 +3806,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Dolazne poruke su blokirane za raspored \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\". Postavke možete podesiti da prijateljima, porodici ili drugim kontaktima dozvolite da vas kontaktiraju."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Primate sve poruke"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Primate sve pozive"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Ništa"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontakt</item>
-      <item quantity="few"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontakta</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontakata</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Nema}=1{1 kontakt}one{# kontakt}few{# kontakta}other{# kontakata}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Svako"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Kontakti"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Kontakti označeni zvjezdicom"</string>
@@ -3871,24 +3844,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Sva obavještenja"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Neka obavještenja"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Odabrane osobe vas i dalje mogu kontaktirati čak i ako ne dozvolite aplikacijama da vas prekidaju"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one">Aplikacije <xliff:g id="APP_NAMES">%s</xliff:g> mogu prekinuti</item>
-      <item quantity="few">Aplikacije <xliff:g id="APP_NAMES">%s</xliff:g> mogu prekinuti</item>
-      <item quantity="other">Aplikacije <xliff:g id="APP_NAMES">%s</xliff:g> mogu prekinuti</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"još <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Nijedna aplikacija ne može prekinuti}=1{Aplikacija {app_1} može prekinuti}=2{Aplikacije {app_1} i {app_2} mogu prekinuti}=3{Aplikacije {app_1}, {app_2} i {app_3} mogu prekinuti}one{Aplikacije {app_1}, {app_2} i još # njih mogu prekinuti}few{Aplikacije {app_1}, {app_2} i još # njih mogu prekinuti}other{Aplikacije {app_1}, {app_2} i još # njih mogu prekinuti}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Aplikacije"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Sva obavještenja"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Neka obavještenja"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Obavještenja koja vas mogu prekinuti"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Dozvoli sva obavještenja"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one">Zvukovi <xliff:g id="SOUND_CATEGORIES">%s</xliff:g> mogu prekinuti</item>
-      <item quantity="few">Zvukovi <xliff:g id="SOUND_CATEGORIES">%s</xliff:g> mogu prekinuti</item>
-      <item quantity="other">Zvukovi <xliff:g id="SOUND_CATEGORIES">%s</xliff:g> mogu prekinuti</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Ništa ne može prekinuti"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"još <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Ništa ne može prekinut}=1{Zvuk {sound_category_1} može prekinuti}=2{Zvukovi {sound_category_1} i {sound_category_2} mogu prekinuti}=3{Zvukovi {sound_category_1}, {sound_category_2} i {sound_category_3} mogu prekinuti}one{Zvukovi {sound_category_1}, {sound_category_2} i još # njih mogu prekinuti}few{Zvukovi {sound_category_1}, {sound_category_2} i još # njih mogu prekinuti}other{Zvukovi {sound_category_1}, {sound_category_2} i još # njih mogu prekinuti}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Ništa ne može prekinuti"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Niko ne može prekinuti"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Neke osobe mogu prekinuti"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Sve osobe mogu prekinuti"</string>
@@ -4142,7 +4105,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB-om upravlja"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Povezani uređaj"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Ovaj uređaj"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Prebacivanje…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Prebacivanje…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Prebacivanje nije uspjelo"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Punjenje ovog uređaja"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Punjenje povezanog uređaja"</string>
@@ -4396,7 +4359,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Prikaži detalje"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Ušteda podataka"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Neograničen prijenos podataka"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Pozadinski podaci su isključeni"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Pozadinski podaci su isključeni"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Uključeno"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Isključeno"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Koristi funkciju Ušteda podataka"</string>
@@ -4419,7 +4382,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Ako je uređaj zaključan, spriječiti kucanje odgovora ili drugog teksta u obavijestima"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Zadana provjera pravopisa"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Odaberite provjeru pravopisa"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Koristi provjeru pravopisa"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Koristi provjeru pravopisa"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Nije odabrano"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(ništa)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4513,7 +4476,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Radi lakšeg oslobađanja prostora za pohranu, upravitelj pohranom s vašeg uređaja uklanja sigurnosne kopije fotografija i videozapisa."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Ukloni fotografije i videozapise"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Upravitelj prostora za pohranu"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Koristi Upravitelja pohrane"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Koristi Upravitelja pohrane"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automatski"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Ručno"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Oslobodite prostor odmah"</string>
@@ -4551,6 +4514,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Dodirnite dvaput da provjerite telefon"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Provjera tableta dvostrukim dodirom"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Provjera uređaja dvostrukim dodirom"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Prevucite za obavještenja"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Prevucite prema dolje na dnu ekrana da prikažete obavještenja"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Način rada jednom rukom"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Koristi način rada jednom rukom"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Izađi pri prebacivanju između aplikacija"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Isteklo vrijeme"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 sekunde"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 sekundi"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 sekundi"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"mogućnost dosega"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Dvaput dodirnite ekran da provjerite vrijeme, obavještenja i druge informacije."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Podignite da provjerite telefon"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Podignite za provjeru tableta"</string>
@@ -4563,6 +4536,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Dodirnite da provjerite tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Dodirnite da provjerite uređaj"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Da provjerite vrijeme, obavještenja i druge informacije, dodirnite ekran."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Dugme za uzbunu"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Pokrenite radnje za pomoć u hitnim slučajevima brzim pritiskanjem dugmeta za isključivanje u trajanju od 5 sekundi."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Zvuk upozorenja"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Upozorenje prije započinjanja radnji"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Kontakti za hitne slučajeve"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Prevucite prstom za obavještenja"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Prevlačenje prstom"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Da provjerite obavještenja, prevucite prstom prema dolje po senzoru za otisak prsta na poleđini uređaja."</string>
@@ -4724,7 +4702,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Omogućeno za sve aplikacije"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Odabir drajvera za grafiku"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Zadano"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Drajver za igru"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Drajver za igru"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Drajver programera"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Drajver za grafiku sistema"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4793,6 +4771,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Nisu pronađene mreže. Pokušajte ponovo."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(zabranjeno)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Nema SIM kartice"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Nema SIM-a"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Nema"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Potreban je SIM da se povežete"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Potreban je SIM operatera <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> da se povežete"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Preferirani način rada mreže: preferiraj WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Preferirani način rada mreže: samo GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Preferirani način rada mreže: samo WCDMA"</string>
@@ -4846,6 +4829,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Prijenos podataka na mobilnoj mreži"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Pristup prijenosu podataka putem mobilne mreže"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Telefon će se automatski prebaciti na ovog operatera kada bude u dometu"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Sim kartica nije dostupna"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Postavke za pozive"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Postavke za SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Pitaj svaki put"</string>
@@ -5031,10 +5015,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Dozvolite preklapanja ekrana na Postavkama"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Dozvolite aplikacijama koje mogu prikazivati preko drugih aplikacija da preklapaju ekrane Postavki"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Mediji"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Sakrij plejer kada se sesija medija završi"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Ovaj plejer omogućava da nastavite sesiju iz proširene ploče Brze postavke."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Media plejer u Brzim postavkama"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Prikažite Medija plejer produženi period da s lakoćom nastavite reprodukciju"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Sakrij plejer"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Prikaži plejer"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Nema dostupnih plejera"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Odobrene aplikacije"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"mediji"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth će se uključiti"</string>
 </resources>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index ac0e8bd..3d1f1c4 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Mitjà"</item>
     <item msgid="6740026006576843477">"Llarg"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Curt"</item>
+    <item msgid="7397961711906421599">"Mitjà"</item>
+    <item msgid="4079132024502041928">"Llarg"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Predeterminat"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Només TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Global"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 561fd52..1fc49e2 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Mostra la inf. de perfil a la pantalla de bloqueig"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Comptes"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Ubicació"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Utilitza la ubicació"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Utilitza la ubicació"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Desactivat"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">Activada - <xliff:g id="COUNT_1">%1$d</xliff:g> aplicacions tenen accés a la ubicació</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Utilitza l\'autenticació facial"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Comença"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Si el desbloqueig facial amb accessibilitat està desactivat, és possible que alguns passos de configuració no funcionin correctament amb TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Torna"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Continua la configuració"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Utilitza la config. d\'accessibilitat"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="one">Ha de tenir <xliff:g id="NUMBER_0">%d</xliff:g> dígit o menys</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"L\'administrador del dispositiu no permet que s\'utilitzi un PIN recent"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"L\'administrador de TI ha bloquejat els PIN més comuns. Prova un altre PIN."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"No pot incloure un caràcter no vàlid"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Ha de contenir com a mínim una lletra"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Ha de contenir com a mínim un dígit"</string>
@@ -653,7 +655,6 @@
       <item quantity="one">Ha de contenir com a mínim 1 caràcter que no sigui un número</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"L\'administrador del dispositiu no permet que s\'utilitzi una contrasenya recent"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"L\'administrador de TI ha bloquejat les contrasenyes més comunes. Prova una altra contrasenya."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"No es permet cap seqüència de dígits ascendents, descendents ni repetits"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Confirma"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Cancel·la"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Activa la Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Utilitza la Wi‑Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Utilitza la Wi‑Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Configuració de Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Configura i gestiona els punts d\'accés sense fil"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Centra el codi QR a sota per connectar-te a \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Escaneja un codi QR per unir-te a la xarxa Wi‑Fi"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Comparteix la Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Escaneja aquest codi QR per connectar-te a <xliff:g id="SSID">%1$s</xliff:g> i compartir la contrasenya"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Escaneja aquest codi QR amb un altre dispositiu per unir-te a <xliff:g id="SSID">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Escaneja aquest codi QR per conectar-te a <xliff:g id="SSID">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Torna-ho a provar. Si el problema continua, contacta amb el fabricant del dispositiu"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"S\'ha produït un error"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Contrasenya de la Wi‑Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Contrasenya del punt d\'accés Wi‑Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Connexió automàtica"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Permet que el telèfon es connecti automàticament quan sigui a prop d\'aquesta xarxa"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Permet que la tauleta es connecti automàticament quan sigui a prop d\'aquesta xarxa"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Permet la connexió a aquesta xarxa quan estigui dins de l\'abast"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Afegeix un dispositiu"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Utilitza un codi QR per afegir un dispositiu a aquesta xarxa"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"El codi QR no té un format vàlid"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Utilitza certificats del sistema"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"No proporcionis un certificat d\'usuari"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"No validis"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"No s\'ha especificat cap certificat. La connexió no serà privada."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"El nom de la xarxa és massa llarg."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Has d\'especificar un domini."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Es necessita un certificat."</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Connecta"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"La xarxa Wi‑Fi està activada"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Connectat a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"S\'està connectant a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"S\'està connectant…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"No s\'ha pogut connectar a la xarxa"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"La xarxa està fora de l\'abast"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"L\'aplicació està compartint contingut. Per compartir la connexió a Internet, desactiva el punt d\'accés Wi-Fi i torna\'l a activar."</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"No s\'ha definit cap contrasenya"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Nom del punt d\'accés Wi-Fi"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"S\'està activant <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"S\'està activant <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Altres dispositius es poden connectar a <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Contrasenya del punt d\'accés Wi-Fi"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Banda del punt d\'accés"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Augmenta automàticament la freqüència d\'actualització de 60 a 90 Hz en alguns continguts. Augmenta l\'ús de la bateria."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Força una freqüència d\'actualització de 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"La freqüència d\'actualització més alta millora la resposta al tacte i la qualitat de les animacions. Augmenta l\'ús de la bateria."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Atenció a la pantalla"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Activat / La pantalla no s\'apagarà si estàs mirant-la"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Versió d\'Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Actualització de seguretat d\'Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Model"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Model: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Model i maquinari"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Versió del maquinari"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Id. de l\'equip"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"S\'ha restablert la configuració de la xarxa"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"No es poden esborrar les targetes SIM"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"No s\'han pogut esborrar les targetes SIM que has baixat a causa d\'un error.\n\nReinicia el dispositiu i torna-ho a provar."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Esborra totes les dades (restabliment de les dades de fàbrica)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Esborra totes les dades"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Aquesta acció esborrarà totes les dades de l\'"<b>"emmagatzematge intern"</b>" de la tauleta, com ara:\n\n"<li>"el teu Compte de Google"</li>\n<li>"les dades i la configuració del sistema i de les aplicacions"</li>\n<li>"les aplicacions baixades"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"S\'esborraran totes les dades de l\'"<b>"emmagatzematge intern"</b>" del telèfon, inclosos:\n\n"<li>"El teu Compte de Google"</li>\n<li>"Les dades i la configuració del sistema i de les aplicacions"</li>\n<li>"Les aplicacions baixades"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Tens la sessió iniciada als comptes següents:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"En aquest dispositiu hi ha altres usuaris.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Música"</li>\n<li>"Fotos"</li>\n<li>"Altres dades de l\'usuari"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"No es cancel·larà el teu pla de servei mòbil."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Per esborrar també música, imatges i altres dades d\'usuari, cal esborrar l\'"<b>"emmagatzematge USB"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Si vols suprimir música, imatges i altres dades de l\'usuari, cal que esborris la "<b>"targeta SD"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Esborra totes les dades (restabliment de fàbrica)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Esborra totes les dades"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"S\'esborraran totes les dades de l\'"<b>"emmagatzematge intern"</b>" de la tauleta, com ara:\n\n"<li>"el teu Compte de Google"</li>\n<li>"les dades i la configuració del sistema i de les aplicacions"</li>\n<li>"les aplicacions baixades"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"S\'esborraran totes les dades de l\'"<b>"emmagatzematge intern"</b>" del telèfon, com ara:\n\n"<li>"el teu Compte de Google"</li>\n<li>"les dades i la configuració del sistema i de les aplicacions"</li>\n<li>"les aplicacions baixades"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Tens la sessió iniciada als comptes següents:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"En aquest dispositiu hi ha altres usuaris.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"música"</li>\n<li>"fotos"</li>\n<li>"altres dades de l\'usuari"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"No es cancel·larà el teu pla de servei mòbil."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Si vols suprimir música, imatges i altres dades de l\'usuari, cal que esborris l\'"<b>"emmagatzematge USB"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Si vols suprimir música, imatges i altres dades de l\'usuari, cal que esborris la "<b>"targeta SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Esborra l\'emmagatzematge USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Esborra la targeta SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Esborra totes les dades de l\'emmagatzematge USB intern, com ara música o fotos"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Esborra totes les dades de la targeta SD, com ara música o fotos"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Esborra totes les dades"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Esborra totes les dades"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Se suprimiran tota la teva informació personal i les aplicacions baixades. Aquesta acció no es pot desfer."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Se suprimirà tota la teva informació personal, incloses les aplicacions i SIM que hagis baixat. Aquesta acció no es pot desfer."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Esborra-ho tot"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"No s\'ha restablert perquè el servei d\'esborrament del sistema no està disponible."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Vols esborrar totes les dades?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"El restabliment de fàbrica no està disponible per a aquest usuari."</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"S\'està esborrant"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Espera…"</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Esborra totes les dades"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Esborra totes les dades"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Se suprimiran tota la teva informació personal i les aplicacions baixades. Aquesta acció no es pot desfer."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Se suprimirà tota la teva informació personal, incloses les targetes SIM i les aplicacions que hagis baixat. Aquesta acció no es pot desfer."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Vols esborrar totes les dades?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"El restabliment de fàbrica no està disponible per a aquest usuari"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"S\'està esborrant"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Espera…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Configuració de trucades"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Configura la bústia, la desviació de trucades, les trucades en espera i l\'identificador"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Compartició de xarxa per USB"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"No es pot compartir la xarxa amb més de <xliff:g id="MAXCONNECTION">%1$d</xliff:g> dispositius."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Es desactivarà la compartició de xarxa per a: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Compartició d\'Ethernet"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Comparteix la connexió a Internet del telèfon per Ethernet USB"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Comparteix la connexió a Internet del telèfon per Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Utilitza el punt d\'accés Wi-Fi i la compartició de xarxa per proporcionar Internet a altres dispositius mitjançant la teva connexió de dades mòbils. Les aplicacions també poden crear un punt d\'accés Wi-Fi per compartir contingut amb els dispositius que es trobin a prop."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Utilitza el punt d\'accés Wi‑Fi i la compartició de xarxa per proporcionar Internet a altres dispositius amb la teva connexió Wi‑Fi o de dades mòbils. Les aplicacions també poden crear un punt d\'accés Wi‑Fi per compartir contingut amb els dispositius propers."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Ajuda"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Preferències dels subtítols"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Ampliació"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Àrea d\'ampliació"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Activa l\'ampliació"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Tria les àrees d\'ampliació que vols utilitzar en ampliar la pantalla"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Pantalla completa"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Pantalla parcial"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Pantalla completa i pantalla parcial"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Amplia tota la pantalla"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Amplia una part de la pantalla"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Vols canviar al botó d\'accessibilitat?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Si fas triple toc per ampliar una part de la pantalla, l\'escriptura i altres accions funcionaran amb retard.\n\nVols utilitzar el botó d\'accessibilitat per ampliar la pantalla?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Canvia al botó d\'accessibilitat"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Mantén el triple toc per ampliar"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Configuració de l\'ampliació"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Amplia amb tres tocs"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Amplia amb una drecera"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"El botó d\'engegada penja"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Punter de ratolí gran"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Suprimeix les animacions"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Àudio mono"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Combina els canals en reproduir àudio"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Balanç d\'àudio"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Esquerra"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Dreta"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Àudio mono"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Combina els canals en reproduir àudio"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Balanç d\'àudio"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Esquerra"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Dreta"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Predeterminat"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 segons"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 segons"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Vibració de les notificacions"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Vibració de les trucades"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Resposta tàctil"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Utilitza <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Obre <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Utilitza la correcció de color"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Mostra els subtítols"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Només per a aplicacions compatibles"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Utilitza <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Obre <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Utilitza la correcció de color"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Mostra els subtítols"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Només per a aplicacions compatibles"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Mida i estil dels subtítols"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Mida del text: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Més opcions"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomalia"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomalia"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomalia"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Escala de grisos"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Vermell-verd"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Vermell-verd"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Blau-groc"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Restricció en segon pla"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Permet que l\'aplicació s\'executi en segon pla"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"L\'aplicació no es pot executar en segon pla"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"No es pot restringir l\'ús en segon pla"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"No es pot restringir l\'ús en segon pla"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Vols limitar l\'activitat en segon pla?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Si limites l\'activitat en segon pla d\'una aplicació, és possible que no funcioni correctament"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Com que aquesta aplicació no s\'ha configurat per optimitzar la bateria, no pots restringir-la.\n\nPer restringir l\'aplicació, activa l\'optimització de la bateria."</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Defineix una programació"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Allarga la durada de la bateria"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Desactiva quan estigui carregada"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"L\'estalvi de bateria es desactiva quan el telèfon té un <xliff:g id="PERCENT">%1$s</xliff:g> de bateria"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"L\'estalvi de bateria es desactivarà quan la tauleta tingui un <xliff:g id="PERCENT">%1$s</xliff:g> de bateria"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"L\'estalvi de bateria es desactivarà quan el dispositiu tingui un <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Estalvi de bateria es desactiva quan el telèfon té més d\'un <xliff:g id="PERCENT">%1$s</xliff:g> de bateria"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Estalvi de bateria es desactiva quan la tauleta té més d\'un <xliff:g id="PERCENT">%1$s</xliff:g> de bateria"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Estalvi de bateria es desactiva quan el dispositiu té més d\'un <xliff:g id="PERCENT">%1$s</xliff:g> de bateria"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Activa"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Restableix"</string>
     <string name="tts_play" msgid="2945513377250757221">"Reprodueix"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Connectivitat adaptativa"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Allarga la durada de la bateria i millora el rendiment del dispositiu gestionant automàticament les connexions a la xarxa"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Emmagatzematge de credencials"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Instal·la un certificat"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Instal·la els certificats des de l\'emmagatzematge"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Credencials d\'usuari"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Mostra i modifica les credencials emmagatzemades"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Configuració avançada"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Tipus d\'emmagatzematge"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Emmagatzemat en maquinari"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Només programari"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Les credencials no estan disponibles per a aquest usuari."</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Instal·lada per a xarxes VPN i aplicacions"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Instal·lada per a xarxes Wi-Fi"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Pagar al terminal"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Configura una aplicació per pagar. A continuació, apropa la part posterior del telèfon a un terminal amb el símbol de pagament sense contacte."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Entesos"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Més..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Més…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Defineix una aplicació per pagar predeterminada"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Actualitza l\'aplicació de pagament predeterminada"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"En un terminal sense contacte, paga amb <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Utilitza sempre per a les trucades"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Selecciona una SIM per a les dades"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Selecciona una SIM per als SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"S\'està canviant la SIM de dades. Això pot tardar un minut..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"S\'està canviant la SIM de dades. Aquest procés pot tardar fins a un minut…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Truca mitjançant"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Selecciona una targeta SIM"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"rutina, programació, estalvi de bateria, estalvi d\'energia, bateria, automàtic, percentatge"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, trucades avançades, trucades 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"afegir idioma, afegir un idioma"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"mida del text"</string>
     <string name="default_sound" msgid="6604374495015245195">"So predeterminat"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"El volum de les trucades i notificacions està establert al <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Volum, vibració, No molestis"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Sons d\'inici"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Subtítols instantanis"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Subtitula el contingut multimèdia automàticament"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Cap"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other">S\'han definit <xliff:g id="ON_COUNT">%d</xliff:g> programacions</item>
-      <item quantity="one">S\'ha definit 1 programació</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Cap}=1{S\'ha definit 1 programació}other{S\'han definit # programacions}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"No molestis"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Rep notificacions només de persones i aplicacions importants"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Restringeix les interrupcions"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Només amb prioritat"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>."</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Activat / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Desactivat (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Desactivat"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Activat"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Pregunta sempre"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Fins que no el desactivis"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> hores</item>
-      <item quantity="one">1 hora</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minuts"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> programacions es poden activar automàticament</item>
-      <item quantity="one">1 programació es pot activar automàticament</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 hora}other{# hores}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minut}other{# minuts}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Desactivat}=1{Desactivat / Es pot activar automàticament 1 programació}other{Desactivat / Es poden activar automàticament # programacions}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Què pot interrompre el mode No molestis"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Persones"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Aplicacions"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Estableix automàticament les notificacions de prioritat baixa com a discretes"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Classificació de les notificacions adaptatives"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Classifica automàticament les notificacions per ordre de rellevància"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Suggeriments sobre les notificacions adaptatives"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Indica els ajustos que s\'han fet a les notificacions i mostra l\'opció per enviar suggeriments al sistema"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Accions i respostes suggerides"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Mostra automàticament les accions i respostes suggerides"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Mostra les notificacions recents i posposades"</string>
@@ -3571,7 +3562,7 @@
     <string name="notification_importance_high_title" msgid="394129291760607808">"Mostra en pantalla"</string>
     <string name="notification_block_title" msgid="7392909527700971673">"Bloqueja"</string>
     <string name="notification_silence_title" msgid="4085829874452944989">"Silenci"</string>
-    <string name="notification_alert_title" msgid="1632401211722199217">"Predeterminada"</string>
+    <string name="notification_alert_title" msgid="1632401211722199217">"Predeterminat"</string>
     <string name="allow_interruption" msgid="5237201780159482716">"Permet interrupcions"</string>
     <string name="allow_interruption_summary" msgid="9044131663518112543">"Permet que l\'aplicació emeti un so, vibri o mostri notificacions emergents a la pantalla"</string>
     <string name="notification_priority_title" msgid="5554834239080425229">"Prioritat"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Accés a No molestis"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Permet l\'accés al mode No molestis"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Cap aplicació instal·lada no ha sol·licitat accés a No molestis."</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"S\'estan carregant les aplicacions..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"S\'estan carregant les aplicacions…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Tal com has sol·licitat, Android està bloquejant les notificacions d\'aquesta aplicació perquè no apareguin al dispositiu"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Tal com has sol·licitat, Android està bloquejant aquesta categoria de notificacions perquè no apareguin al dispositiu"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Tal com has sol·licitat, Android està bloquejant aquest grup de notificacions perquè no apareguin al dispositiu"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Totes les converses"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Converses prioritàries"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Cap"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> converses</item>
-      <item quantity="one">1 conversa</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Cap"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Cap}=1{1 conversa}other{# converses}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Qui et pot interrompre"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Trucades"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Trucades"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Per assegurar-te que les trucades permeses emetin so, comprova que s\'hagi configurat el dispositiu perquè soni"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Amb la programació <xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>, les trucades entrants es bloquegen. Pots ajustar la configuració per permetre que els teus amics, familiars o altres persones contactin amb tu."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Contactes destacats"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> persones més</item>
-      <item quantity="one">1 persona més</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Cap"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Cap}=1{{contact_1}}=2{{contact_1} i {contact_2}}=3{{contact_1}, {contact_2} i {contact_3}}other{{contact_1}, {contact_2} i # persones més}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Missatges"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"missatges"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Missatges"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Amb la programació \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\", els missatges entrants es bloquegen. Pots ajustar la configuració per permetre que els teus amics, familiars o altres persones contactin amb tu."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Pots rebre tots els missatges"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Pots rebre totes les trucades"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Cap"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> contactes</item>
-      <item quantity="one">1 contacte</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Cap}=1{1 contacte}other{# contactes}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Tothom"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Contactes"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Contactes destacats"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Totes les notificacions"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Algunes notificacions"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Les persones seleccionades podran contactar amb tu, encara que les aplicacions no tinguin permís per interrompre\'t"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> poden interrompre</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> pot interrompre</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> més"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Cap aplicació no pot interrompre}=1{{app_1} pot interrompre}=2{{app_1} i {app_2} poden interrompre}=3{{app_1}, {app_2} i {app_3} poden interrompre}other{{app_1}, {app_2} i # més poden interrompre}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Aplicacions"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Totes les notificacions"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Algunes notificacions"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Notificacions que et poden interrompre"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Permet totes les notificacions"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> poden interrompre</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> pot interrompre</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Res no pot interrompre"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> més"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Res no pot interrompre}=1{{sound_category_1} pot interrompre}=2{{sound_category_1} i {sound_category_2} poden interrompre}=3{{sound_category_1}, {sound_category_2} i {sound_category_3} poden interrompre}other{{sound_category_1}, {sound_category_2} i # més poden interrompre}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Res no pot interrompre"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Ningú no pot interrompre"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Algunes persones poden interrompre"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Tothom pot interrompre"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB controlat per"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Dispositiu connectat"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Aquest dispositiu"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"S\'està canviant..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"S\'està canviant…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"No s\'ha pogut canviar"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Càrregant el dispositiu"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Càrrega de dispositius connectats"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Mostra els detalls"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Economitzador de dades"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Dades sense restricció"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Les dades en segon pla estan desactivades"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Les dades en segon pla estan desactivades"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Activat"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Desactivat"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Utilitza l\'Economitzador de dades"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Si el dispositiu està bloquejat, impedeix que s\'escriguin respostes o altres textos a les notificacions"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Corrector predeterminat"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Tria un corrector ortogràfic"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Utilitza el corrector ortogràfic"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Utilitza el corrector ortogràfic"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"No s\'ha seleccionat"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(cap)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Per alliberar espai, el gestor d\'emmagatzematge suprimeix del dispositiu les còpies de seguretat de fotos i vídeos."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Suprimeix fotos i vídeos amb"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Gestor d\'emmagatzematge"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Utilitza el gestor d\'emmagatzematge"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Utilitza el gestor d\'emmagatzematge"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automàtica"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Allibera espai ara"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Doble toc per consultar el telèfon"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Doble toc per consultar la tauleta"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Doble toc per consultar el dispositiu"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Llisca per a notificacions"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Llisca cap avall a la part inferior de la pantalla per mostrar les notificacions"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Mode d\'una mà"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Utilitza el mode d\'una mà"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Surt en canviar d\'aplicació"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Temps d\'espera"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 segons"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 segons"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 segons"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"accessibilitat"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Per veure l\'hora, les notificacions i altres dades, fes doble toc a la pantalla."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Aixeca per consultar el telèfon"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Aixeca per consultar la tauleta"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Toca per consultar la tauleta"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Toca per consultar el dispositiu"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Per veure l\'hora, les notificacions i altres dades, toca la pantalla."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Botó del pànic"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Per iniciar les accions d\'emergència, prem el botó d\'engegada 5 vegades ràpidament."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"So d\'advertiment"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Mostra una alerta abans d\'iniciar les accions"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Contactes d\'emergència"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Fes lliscar l\'empremta digital per veure notificacions"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Fes lliscar l\'empremta"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Per consultar les notificacions, llisca cap avall al sensor d\'empremtes dactilars de la part posterior del telèfon."</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Activa per a totes les aplicacions"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Selecciona un controlador de gràfics"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Predeterminat"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Controlador de jocs"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Controlador de jocs"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Controlador per a desenvolupadors"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Controlador de gràfics del sistema"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"No s\'ha pogut trobar cap xarxa. Torna-ho a provar."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(prohibida)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"No hi ha cap SIM"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"No hi ha cap SIM"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Cap"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Cal una SIM per connectar-se"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Cal una SIM <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> per connectar-se"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Mode de xarxa preferent: WCDMA preferit"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Mode de xarxa preferent: només GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Mode de xarxa preferent: només WCDMA"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Dades mòbils"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Accedeix a les dades amb la xarxa mòbil"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"El telèfon canviarà de manera automàtica a aquest operador de telefonia mòbil quan estigui dins del seu abast"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"No hi ha cap targeta SIM disponible"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Preferència de trucades"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Preferència d\'SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Pregunta sempre"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Permet les superposicions de pantalla a Configuració"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Permet que les aplicacions que poden mostrar-se sobre altres aplicacions se superposin sobre les pantalles de Configuració"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Multimèdia"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Amaga el reproductor quan la sessió multimèdia acabi"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"El reproductor et permet reprendre la sessió des del tauler desplegat de configuració ràpida."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Reproductor multimèdia a la configuració ràpida"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Mostra el reproductor multimèdia durant un període de temps llarg per poder reprendre la reproducció més fàcilment"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Amaga el reproductor"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Mostra el reproductor"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"No hi ha cap reproductor disponible"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Aplicacions permeses"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"multimèdia"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"S\'activarà el Bluetooth"</string>
 </resources>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index a28e701..9c240d6 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Střední"</item>
     <item msgid="6740026006576843477">"Dlouhá"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Krátký"</item>
+    <item msgid="7397961711906421599">"Střední"</item>
+    <item msgid="4079132024502041928">"Dlouhý"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Výchozí"</item>
     <item msgid="4234707448428002595">"Bezpatkové"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Globální"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Pouze TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Globální"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 6047514..e50e9de 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -300,7 +300,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Zobrazit informace o profilu na zamčené obrazovce"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Účty"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Poloha"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Používat polohu"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Používat polohu"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Vypnuto"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="few">Zapnuto – <xliff:g id="COUNT_1">%1$d</xliff:g> aplikace mají přístup k poloze</item>
@@ -335,6 +335,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Ověření pomocí obličeje"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Začít"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Pokud je vypnuto odemknutí obličejem v režimu přístupnosti, některé kroky nastavení nemusí s aplikací TalkBack fungovat správně."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Zpět"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Pokračovat v nastavení"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Použít nastavení přístupnosti"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -635,7 +638,6 @@
       <item quantity="one">Musí obsahovat méně než <xliff:g id="NUMBER_0">%d</xliff:g> číslici</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Administrátor zařízení nedovoluje použití nedávno použitého kódu PIN"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Obvyklé kódy PIN jsou blokovány administrátorem IT. Použijte jiný PIN."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Heslo nesmí obsahovat neplatné znaky."</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Heslo musí obsahovat alespoň jedno písmeno."</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Heslo musí obsahovat alespoň jednu číslici."</string>
@@ -683,7 +685,6 @@
       <item quantity="one">Musí obsahovat alespoň 1 znak jiný než číslici</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Administrátor zařízení neumožňuje použít heslo, které jste použili nedávno"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Obvyklá hesla jsou blokována administrátorem IT. Použijte jiné heslo."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Posloupnost rostoucích, klesajících nebo opakujících se číslic není povolena"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Potvrdit"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Zrušit"</string>
@@ -829,7 +830,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Zapnout Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Používat Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Použít Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Nastavení Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Umožňuje nastavit a spravovat přístupové body bezdrátové sítě"</string>
@@ -937,7 +938,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Chcete-li se připojit k síti <xliff:g id="SSID">%1$s</xliff:g>, níže vycentrujte QR kód"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Naskenováním QR kódu se připojíte k síti Wi-Fi"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Sdílení sítě Wi-Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Chcete-li se připojit k síti <xliff:g id="SSID">%1$s</xliff:g>, naskenujte tento QR kód a sdílejte heslo"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Chcete-li se připojit k síti <xliff:g id="SSID">%1$s</xliff:g>, naskenujte tento QR kód v jiném zařízení"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Chcete-li se připojit k síti <xliff:g id="SSID">%1$s</xliff:g>, naskenujte tento QR kód"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Zkuste to znovu. Pokud problém přetrvává, obraťte se na výrobce zařízení"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Něco se pokazilo"</string>
@@ -963,8 +964,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Heslo k Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Heslo k hotspotu: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Automatické připojení"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Povolit telefonu automatické připojování v dosahu této sítě"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Povolit tabletu automatické připojování v dosahu této sítě"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Povolit připojení k této síti, když bude v dosahu"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Přidat zařízení"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Pomocí QR kódu přidejte zařízení do této sítě"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR kód není platný formát"</string>
@@ -976,7 +976,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Použít certifikáty systému"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Neposkytovat"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Neověřovat"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Není určen žádný certifikát. Připojení nebude soukromé."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Název sítě je příliš dlouhý."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Zadejte doménu."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Je vyžadován certifikát."</string>
@@ -1003,6 +1002,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Připojit"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Připojení Wi-Fi je zapnuto"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Připojeno k <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Připojování k síti <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Připojování…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Připojení k síti se nezdařilo."</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Síť není v dosahu"</string>
@@ -1080,7 +1080,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Aplikace sdílí obsah. Chcete-li sdílet připojení k internetu, vypněte hotspot a znovu jej zapněte"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Není nastaveno žádné heslo"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Název hotspotu"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Zapínám hotspot <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Zapínání hotspotu <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Ostatní zařízení se mohou připojit k hostpotu <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Heslo hotspotu"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Pásmo přístupového bodu"</string>
@@ -1147,7 +1147,7 @@
     <string name="ring_volume_title" msgid="4869034595079914541">"Hlasitost vyzvánění a oznámení"</string>
     <string name="vibrate_in_silent_title" msgid="5076579100685867363">"Vibrovat v tichém režimu"</string>
     <string name="notification_sound_title" msgid="8747567935870133157">"Výchozí zvuk oznámení"</string>
-    <string name="incoming_call_volume_title" msgid="8445408274513654261">"Vyzváněcí tón"</string>
+    <string name="incoming_call_volume_title" msgid="8445408274513654261">"Vyzvánění"</string>
     <string name="notification_volume_title" msgid="328053763590888609">"Oznámení"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1798481722572489141">"Použije hlasitost příchozích hovorů také pro oznámení"</string>
     <string name="home_work_profile_not_supported" msgid="2605589489324241338">"Nepodporuje pracovní profily"</string>
@@ -1230,7 +1230,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Plynulé zobrazení"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"U některého obsahu automaticky zvýší obnovovací frekvenci z 60 na 90 Hz. Zvyšuje využití baterie."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Plynulé zobrazení"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Vynutit obnovovací frekvenci 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Vyšší obnovovací frekvence za účelem vylepšení responzivity klepnutí a kvality animace. Zvyšuje využití baterie."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Vnímavá obrazovka"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Zapnuto / obrazovka se nevypne, když se na ni budete dívat"</string>
@@ -1371,7 +1371,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Verze systému Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Aktualizace zabezpečení Androidu"</string>
     <string name="model_info" msgid="8997566254717810904">"Model"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Model: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Model a hardware"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Verze hardwaru"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ID zařízení"</string>
@@ -1646,31 +1645,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Nastavení sítí bylo resetováno"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"SIM karty nelze vymazat"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Staženou SIM kartu nelze vymazat z důvodu chyby.\n\nRestartujte zařízení a zkuste to znovu."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Vymazat data (tovární reset)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Vymazat data (tovární reset)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Tato akce smaže veškerá data z "<b>"interního úložiště"</b>" tabletu, např.:\n\n"<li>"váš účet Google"</li>\n<li>"nastavení a data systému a aplikací"</li>\n<li>"stažené aplikace"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Tato akce smaže veškerá data z "<b>"interního úložiště"</b>" telefonu, např.:\n\n"<li>"váš účet Google"</li>\n<li>"nastavení a data systému a aplikací"</li>\n<li>"stažené aplikace"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Aktuálně jste přihlášeni k těmto účtům:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"V tomto zařízení jsou přítomni další uživatelé.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"hudba"</li>\n<li>"fotky"</li>\n<li>"další uživatelské údaje"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Tímto krokem nebude zrušen mobilní tarif."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Chcete-li smazat také hudbu, obrázky a další uživatelská data, je potřeba vymazat "<b>"úložiště USB"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Chcete-li smazat také hudbu, obrázky a další uživatelská data, je potřeba vymazat "<b>"kartu SD"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Vymazat data (tovární reset)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Vymazat data (tovární reset)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Tato akce smaže veškerá data z "<b>"interního úložiště"</b>" tabletu, např.:\n\n"<li>"váš účet Google"</li>\n<li>"nastavení a data systému a aplikací"</li>\n<li>"stažené aplikace"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Tato akce smaže veškerá data z "<b>"interního úložiště"</b>" telefonu, např.:\n\n"<li>"váš účet Google"</li>\n<li>"nastavení a data systému a aplikací"</li>\n<li>"stažené aplikace"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Aktuálně jste přihlášeni k těmto účtům:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"V tomto zařízení jsou přítomni další uživatelé.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"hudba"</li>\n<li>"fotky"</li>\n<li>"další uživatelská data"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Tímto krokem nebude zrušen mobilní tarif."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Chcete-li smazat také hudbu, obrázky a další uživatelská data, je potřeba vymazat "<b>"úložiště USB"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Chcete-li smazat také hudbu, obrázky a další uživatelská data, je potřeba vymazat "<b>"kartu SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Smazat úložiště USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Smazat kartu SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Smazat všechna data v interním úložišti USB, například hudbu a fotografie."</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Smazat všechna data na kartě SD, například hudbu a fotografie."</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Vymazat všechna data"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Vymazat všechna data"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Všechny osobní údaje a stažené aplikace budou smazány. Tuto akci nelze vrátit zpět."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Budou smazány všechny vaše osobní údaje, včetně stažených aplikací a SIM karet. Tuto akci nelze vrátit zpět."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Vymazat vše"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Pokus o obnovení se nezdařil, protože služba System Clear není dostupná."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Vymazat všechna data?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Pro tohoto uživatele není obnovení továrního nastavení dostupné"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Mazání"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Prosím čekejte..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Vymazat všechna data"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Vymazat všechna data"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Všechny osobní údaje a stažené aplikace budou smazány. Tuto akci nelze vrátit zpět."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Budou smazány všechny vaše osobní údaje, včetně stažených aplikací a SIM karet. Tuto akci nelze vrátit zpět."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Vymazat všechna data?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Pro tohoto uživatele není resetování do továrního nastavení dostupné"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Mazání"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Čekejte prosím…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Nastavení hovorů"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Nastavení hlasové schránky, přesměrování a čekání hovorů a ID volajícího"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Připojení přes USB"</string>
@@ -1718,7 +1715,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Připojení lze sdílet s nejvýše <xliff:g id="MAXCONNECTION">%1$d</xliff:g> zařízeními."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"U zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bude ukončeno sdílené připojení."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Tethering ethernetu"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Sdílet připojení telefonu k internetu přes USB ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Sdílet připojení telefonu k internetu přes ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Hotspot a tethering umožňují poskytovat připojení k internetu přes mobilní datové připojení dalším zařízením. Aplikace také mohou vytvořit hotspot ke sdílení obsahu s okolními zařízeními."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Hotspot a tethering umožňují poskytovat připojení k internetu přes připojení Wi-Fi nebo mobilní datové připojení dalším zařízením. Aplikace také mohou vytvořit hotspot ke sdílení obsahu s okolními zařízeními."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Nápověda"</string>
@@ -2165,13 +2162,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Předvolby titulků"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Zvětšení"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Oblast zvětšení"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Povolit zvětšení"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Vyberte oblast zvětšení, kterou chcete použít při zvětšení obrazovky"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Celá obrazovka"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Část obrazovky"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Celá obrazovka a část obrazovky"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Zvětšit celou obrazovku"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Zvětšit část obrazovky"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Přepnout na tlačítko přístupnosti?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Pokud ke zvětšení části obrazovky budete používat trojité klepnutí, při psaní a dalších akcích bude docházet ke zpoždění.\n\nChcete přepnout na zvětšování pomocí tlačítka přístupnosti?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Přepnout na tlačítko přístupnosti"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"I nadále ke zvětšení používat trojité klepnutí"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Nastavení zvětšení"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Zvětšení trojitým klepnutím"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Zvětšení zkratkou"</string>
@@ -2225,11 +2225,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Vypínač ukončí hovor"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Velký kurzor myši"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Odstranit animace"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Zvuk mono"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Při přehrávání zvuku kombinovat kanály"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Vyvážení zvuku"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Vlevo"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Vpravo"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Zvuk mono"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Při přehrávání zvuku kombinovat kanály"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Vyvážení zvuku"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Vlevo"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Vpravo"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Výchozí"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 sekund"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 sekund"</string>
@@ -2259,11 +2259,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Vibrace při oznámení"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Vibrace při vyzvánění"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Odezva klepnutí"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Použít <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Otevřít aplikaci <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Používat korekci barev"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Zobrazit titulky"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Jen pro podporovanou aplikaci"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Použít <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Otevřít adresu <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Používat korekci barev"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Zobrazit titulky"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Jen pro podporovanou aplikaci"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Velikost a styl titulků"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> velikost textu"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Další možnosti"</string>
@@ -2295,6 +2295,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomálie"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomálie"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomálie"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Zešednutí obrazovky"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Červená a zelená"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Červená a zelená"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Modrá a žlutá"</string>
@@ -2436,7 +2437,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Omezení na pozadí"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Povolit aplikaci spouštění na pozadí"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Aplikace nemá povoleno spouštění na pozadí"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Využití na pozadí omezit nelze"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Využití na pozadí omezit nelze"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Omezit aktivitu na pozadí?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Pokud u aplikace omezíte aktivitu na pozadí, může dojít k nepředvídatelnému chování"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Aplikace není nastavena k optimalizaci baterie, nelze ji tedy omezit.\n\nChcete-li ji omezit, nejprve zapněte optimalizaci."</string>
@@ -2667,9 +2668,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Nastavení plánu"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Prodloužení výdrže baterie"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Vypnout při nabití"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Spořič baterie se vypne, až bude telefon na <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Spořič baterie se vypne, až bude tablet na <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Spořič baterie se vypne, až bude zařízení na <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Spořič baterie se vypne, až se telefon nabije nad <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Spořič baterie se vypne, až se tablet nabije nad <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Spořič baterie se vypne, až se zařízení nabije nad <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Zapnout"</string>
@@ -2734,6 +2735,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Obnovit"</string>
     <string name="tts_play" msgid="2945513377250757221">"Přehrát"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"Síť VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Adaptivní připojení"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Prodlužuje životnost baterie a zlepšuje výkon zařízení tím, že automaticky spravuje síťová připojení"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Úložiště pověření"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Instalace certifikátu"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Nainstalovat certifikáty z úložiště"</string>
@@ -2745,9 +2748,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Identifikační údaje uživatele"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Zobrazení a úprava uložených identifikačních údajů"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Rozšířené nastavení"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Typ úložiště"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardwarové"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Pouze software"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Pro tohoto uživatele jsou identifikační údaje nedostupné."</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Nainstalováno pro síť VPN a aplikace"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Nainstalování pro síť Wi-Fi"</string>
@@ -3146,7 +3146,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Platba na terminálu"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"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="4717868843368296630">"Rozumím"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Další..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Více…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Nastavení výchozí platební aplikace"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Aktualizace výchozí platební aplikace"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Na bezkontaktním terminálu zaplaťte pomocí aplikace <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3230,7 +3230,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Vždy používat pro hovory"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Vyberte SIM kartu pro data"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Vyberte SIM kartu pro SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Přepínání datových SIM karet, tato operace může chvíli trvat..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Přepínání datových SIM karet, tato operace může chvíli trvat…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Volat pomocí"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Vyberte SIM kartu"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM karta <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3375,6 +3375,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"sled činností, plán, spořič baterie, úspora energie, baterie, automatické, procenta"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, rozšířené volání, volání 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"přidat jazyk, přidání jazyka"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"velikost textu"</string>
     <string name="default_sound" msgid="6604374495015245195">"Výchozí zvuk"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Hlasitost vyzvánění a oznámení je na <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Hlasitost, vibrace, režim Nerušit"</string>
@@ -3387,7 +3388,7 @@
     <string name="alarm_volume_option_title" msgid="6398641749273697140">"Hlasitost budíku"</string>
     <string name="ring_volume_option_title" msgid="1520802026403038560">"Hlasitost vyzvánění a oznámení"</string>
     <string name="notification_volume_option_title" msgid="4838818791683615978">"Hlasitost oznámení"</string>
-    <string name="ringtone_title" msgid="3271453110387368088">"Vyzváněcí tón telefonu"</string>
+    <string name="ringtone_title" msgid="3271453110387368088">"Vyzvánění telefonu"</string>
     <string name="notification_ringtone_title" msgid="6924501621312095512">"Výchozí zvuk oznámení"</string>
     <string name="notification_unknown_sound_title" msgid="1319708450698738980">"Zvuk z aplikace"</string>
     <string name="notification_sound_default" msgid="8630353701915294299">"Výchozí zvuk oznámení"</string>
@@ -3414,13 +3415,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Zvuky při spouštění"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Okamžité titulky"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Automatické přepisy médií"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Žádné"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="few">Nastaveny <xliff:g id="ON_COUNT">%d</xliff:g> plány</item>
-      <item quantity="many">Nastaveno <xliff:g id="ON_COUNT">%d</xliff:g> plánu</item>
-      <item quantity="other">Nastaveno <xliff:g id="ON_COUNT">%d</xliff:g> plánů</item>
-      <item quantity="one">Nastaven 1 plán</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Žádný}=1{Nastaven 1 plán}few{Nastaveny # plány}many{Nastaveno # plánu}other{Nastaveno # plánů}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Nerušit"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Přijímat pouze oznámení od důležitých lidí a z důležitých aplikací"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Omezení vyrušení"</string>
@@ -3488,24 +3483,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Pouze prioritní"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Zapnuto / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Vypnuto / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Vypnuto"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Zapnuto"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Pokaždé se zeptat"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Dokud tuto funkci nevypnete"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="few"><xliff:g id="NUM_HOURS">%d</xliff:g> hodiny</item>
-      <item quantity="many"><xliff:g id="NUM_HOURS">%d</xliff:g> hodiny</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> hodin</item>
-      <item quantity="one">1 hodina</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> min"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="few"><xliff:g id="ON_COUNT">%d</xliff:g> plány se mohou zapnout automaticky</item>
-      <item quantity="many"><xliff:g id="ON_COUNT">%d</xliff:g> plánu se může zapnout automaticky</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> plánů se může zapnout automaticky</item>
-      <item quantity="one">1 plán se může zapnout automaticky</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 hodina}few{# hodiny}many{# hodiny}other{# hodin}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minuta}few{# minuty}many{# minuty}other{# minut}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Vypnuto}=1{1 plán se může zapnout automaticky}few{Vypnuto / # plány se můžou zapnout automaticky}many{Vypnuto / # plánu se může zapnout automaticky}other{Vypnuto / # plánů se může zapnout automaticky}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Co smí vyrušovat režim Nerušit"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Lidé"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Aplikace"</string>
@@ -3530,7 +3513,7 @@
     <string name="sound_work_settings" msgid="752627453846309092">"Zvuky pracovního profilu"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Použít zvuky osobního profilu"</string>
     <string name="work_use_personal_sounds_summary" msgid="4482832555278975008">"Zvuky pracovního a osobního profilu jsou stejné"</string>
-    <string name="work_ringtone_title" msgid="4810802758746102589">"Vyzváněcí tón prac. telefonu"</string>
+    <string name="work_ringtone_title" msgid="4810802758746102589">"Vyzvánění prac. telefonu"</string>
     <string name="work_notification_ringtone_title" msgid="2955312017013255515">"Výchozí zvuk pracovního oznámení"</string>
     <string name="work_alarm_ringtone_title" msgid="3369293796769537392">"Výchozí zvuk pracovního budíku"</string>
     <string name="work_sound_same_as_personal" msgid="1836913235401642334">"Stejné jako v osobním profilu"</string>
@@ -3539,7 +3522,7 @@
     <string name="work_sync_dialog_message" msgid="1328692374812258546">"Pro pracovní profil budou použity zvuky z osobního profilu"</string>
     <string name="ringtones_install_custom_sound_title" msgid="3885712267015760638">"Přidat vlastní zvuk?"</string>
     <string name="ringtones_install_custom_sound_content" msgid="5844996763705884979">"Soubor bude zkopírován do složky <xliff:g id="FOLDER_NAME">%s</xliff:g>"</string>
-    <string name="ringtones_category_preference_title" msgid="26680768777533727">"Vyzváněcí tóny"</string>
+    <string name="ringtones_category_preference_title" msgid="26680768777533727">"Vyzvánění"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Další zvuky a vibrace"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Oznámení"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Nedávno odeslané"</string>
@@ -3551,6 +3534,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Oznámení s nižší prioritou automaticky nastavit na Nenápadná"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Adaptivní hodnocení oznámení"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Automaticky oznámení hodnotit podle relevance"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Zpětná vazba k adaptivnímu oznámení"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Uvádět, jaké úpravy byly u oznámení provedeny, a ukazovat možnost poskytnout systému zpětnou vazbu"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Navrhované akce a odpovědi"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Automaticky zobrazovat navrhované akce a odpovědi"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Zobrazit nedávná a odložená oznámení"</string>
@@ -3757,7 +3742,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Přístup při nastavení Nerušit"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Povolit režim Nerušit"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"O přístup při nastavení Nerušit nepožádaly žádné nainstalované aplikace"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Načítání aplikací..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Načítání aplikací…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Oznámení této aplikace jsou v zařízení na vaši žádost blokována systémem Android"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Tato kategorie oznámení je v zařízení na vaši žádost blokována systémem Android"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Tato skupina oznámení je v zařízení na vaši žádost blokována systémem Android"</string>
@@ -3855,13 +3840,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Všechny konverzace"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Prioritní konverzace"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Žádné"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="few"><xliff:g id="CONVERSATIONS">%d</xliff:g> konverzace</item>
-      <item quantity="many"><xliff:g id="CONVERSATIONS">%d</xliff:g> konverzace</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> konverzací</item>
-      <item quantity="one">1 konverzace</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Žádné"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Žádná}=1{1 konverzace}few{# konverzace}many{# konverzace}other{# konverzací}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Kdo smí vyrušovat"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Volání"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Volání"</string>
@@ -3870,13 +3849,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Pokud chcete, aby povolená volání vydávala zvuk, zkontrolujte, zda je zařízení nastavené na vyzvánění"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"V plánu <xliff:g id="SCHEDULE_NAME">%1$s</xliff:g> jsou blokovány příchozí hovory. Nastavení můžete upravit, aby se s vámi mohli spojit kamarádi, členové rodiny nebo jiné vybrané kontakty."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Kontakty označené hvězdičkou"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="few"><xliff:g id="NUM_PEOPLE">%d</xliff:g> další</item>
-      <item quantity="many"><xliff:g id="NUM_PEOPLE">%d</xliff:g> dalšího</item>
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> dalších</item>
-      <item quantity="one">1 další</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Žádné"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Nikdo}=1{{contact_1}}=2{{contact_1} a {contact_2}}=3{{contact_1}, {contact_2} a {contact_3}}few{{contact_1}, {contact_2} a # další}many{{contact_1}, {contact_2} a # dalšího}other{{contact_1}, {contact_2} a # dalších}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Zprávy"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"zprávy"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Zprávy"</string>
@@ -3885,13 +3858,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"V plánu <xliff:g id="SCHEDULE_NAME">%1$s</xliff:g> jsou blokovány příchozí zprávy. Nastavení můžete upravit, aby se vám dovolali kamarádi, členové rodiny nebo jiné vybrané kontakty."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Kdokoli vám může poslat zprávu"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Kdokoli se vám může dovolat"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Žádné"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="few"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontakty</item>
-      <item quantity="many"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontaktu</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontaktů</item>
-      <item quantity="one">1 kontakt</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Nikdo}=1{1 kontakt}few{# kontakty}many{# kontaktu}other{# kontaktů}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Kdokoli"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Kontakty"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Kontakty označené hvězdičkou"</string>
@@ -3929,26 +3896,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Všechna oznámení"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Některá oznámení"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Vybraní lidé vás stále budou moct kontaktovat, i když aplikacím zakážete vyrušovat"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="few">Vyrušovat mohou aplikace <xliff:g id="APP_NAMES">%s</xliff:g></item>
-      <item quantity="many">Vyrušovat mohou aplikace <xliff:g id="APP_NAMES">%s</xliff:g></item>
-      <item quantity="other">Vyrušovat mohou aplikace <xliff:g id="APP_NAMES">%s</xliff:g></item>
-      <item quantity="one">Vyrušovat může aplikace <xliff:g id="APP_NAME_0">%s</xliff:g></item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"ještě <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Vyrušovat nemohou žádné aplikace}=1{Vyrušovat může aplikace {app_1}}=2{Vyrušovat můžou aplikace {app_1} a {app_2}}=3{Vyrušovat můžou aplikace {app_1}, {app_2} a {app_3}}few{Vyrušovat můžou aplikace {app_1}, {app_2} a # další}many{Vyrušovat můžou aplikace {app_1}, {app_2} a # další}other{Vyrušovat můžou aplikace {app_1}, {app_2} a # dalších}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Aplikace"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Všechna oznámení"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Některá oznámení"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Oznámení, která smí vyrušovat"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Povolit všechna oznámení"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="few">Vyrušovat mohou <xliff:g id="SOUND_CATEGORIES">%s</xliff:g></item>
-      <item quantity="many">Vyrušovat mohou <xliff:g id="SOUND_CATEGORIES">%s</xliff:g></item>
-      <item quantity="other">Vyrušovat mohou <xliff:g id="SOUND_CATEGORIES">%s</xliff:g></item>
-      <item quantity="one">Vyrušovat mohou <xliff:g id="SOUND_CATEGORY">%s</xliff:g></item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Nic nemůže vyrušovat"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"ještě <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Nic nemůže vyrušovat}=1{Vyrušovat může zvuk {sound_category_1}}=2{Vyrušovat můžou zvuky {sound_category_1} a {sound_category_2}}=3{Vyrušovat můžou zvuky {sound_category_1}, {sound_category_2} a {sound_category_3}}few{Vyrušovat můžou zvuky {sound_category_1}, {sound_category_2} a # další}many{Vyrušovat můžou zvuky {sound_category_1}, {sound_category_2} a # dalšího}other{Vyrušovat můžou zvuky {sound_category_1}, {sound_category_2} a # dalších}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Nic nemůže vyrušovat"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Nikdo nemůže vyrušovat"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Vyrušovat mohou někteří lidé"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Všichni lidé mohou vyrušovat"</string>
@@ -4212,7 +4167,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB ovládá:"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Připojené zařízení"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Toto zařízení"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Přepínání..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Přepínání…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Nelze přepnout"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Nabíjení zařízení"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Nabíjení připojeného zařízení"</string>
@@ -4473,7 +4428,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Zobrazit podrobnosti"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Spořič dat"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Neomezená data"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Data na pozadí jsou vypnuta"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Data na pozadí jsou vypnuta"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Zapnuto"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Vypnuto"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Použít spořič dat"</string>
@@ -4496,7 +4451,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Pokud je zařízení zamknuté, zakázat psaní odpovědí a jiných textů do oznámení"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Výchozí kontrola pravopisu"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Výběr kontroly pravopisu"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Použít kontrolu pravopisu"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Používat kontrolu pravopisu"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Nevybráno"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(žádný)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4594,7 +4549,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Správce úložiště vám pomůže uvolnit místo v úložišti tím, že ze zařízení odstraní zálohované fotky a videa."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Odstranit fotky a videa"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Správce úložiště"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Používat správce úložiště"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Používat správce úložiště"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automaticky"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Ruční"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Uvolnit místo"</string>
@@ -4632,6 +4587,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Kontrola telefonu dvojitým klepnutím"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Kontrola tabletu dvojitým klepnutím"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Kontrola zařízení dvojitým klepnutím"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Zobrazení oznámení přejetím prstem"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Oznámení zobrazíte přejetím prstem dolů na dolním okraji obrazovky"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Režim jedné ruky"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Použít režim jedné ruky"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Ukončit při přepnutí aplikací"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Časový limit"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 sekundy"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 sekund"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 sekund"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"dosažitelnost"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Chcete-li zobrazit čas, oznámení a další informace, dvakrát klepněte na obrazovku."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Kontrola telefonu zvednutím"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Kontrola tabletu zvednutím"</string>
@@ -4644,6 +4609,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Kontrola tabletu klepnutím"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Kontrola zařízení klepnutím"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Chcete-li zobrazit čas, oznámení a další informace, klepněte na obrazovku."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Tlačítko zvukového alarmu"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Nouzové SOS akce spustíte, když pětkrát za sebou rychle stisknete vypínač."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Zvuk upozornění"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Upozornění před zahájením akce"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Nouzové kontakty"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Sejmout otisk prstu pro zobrazení oznámení"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Sejmout otisk prstu"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Chcete-li zkontrolovat oznámení, přejeďte prstem dolů po snímači otisků prstů na zadní straně telefonu."</string>
@@ -4812,7 +4782,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Zapnout pro všechny aplikace"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Vyberte ovladač grafiky"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Výchozí"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Herní ovladač"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Herní ovladač"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Ovladač pro vývojáře"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Systémový ovladač grafiky"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4881,6 +4851,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Nebyla nalezena žádná síť. Zkuste to znovu."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(zakázáno)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Chybí SIM karta"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Žádná SIM karta"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Žádné"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"K připojení vyžaduje SIM kartu"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"K připojení vyžaduje SIM kartu <xliff:g id="WIRELESS_CARRIER">%s</xliff:g>"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Preferovaný režim sítě: preferováno WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Preferovaný režim sítě: pouze GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Preferovaný režim sítě: pouze WCDMA"</string>
@@ -4934,6 +4909,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobilní data"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Přistupovat k datům přes mobilní síť"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Telefon se v dosahu automaticky přepne na tohoto operátora"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Není k dispozici žádná SIM karta"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Předvolby hovorů"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Předvolby SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Pokaždé se zeptat"</string>
@@ -5122,10 +5098,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Povolte překryvné vrstvy obrazovek v Nastavení"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Povolte aplikace, které se smí zobrazovat přes jiné aplikace a vytvářet vrstvy obrazovek Nastavení"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Média"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Skrýt přehrávač po ukončení relace média"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Přehrávač umožňuje obnovit relaci z rozbaleného panelu Rychlé nastavení."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Přehrávač médií v rychlém nastavení"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Zobrazit přehrávač médií delší dobu, aby bylo snadné obnovit přehrávání"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Skrýt přehrávač"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Zobrazit přehrávač"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Nejsou k dispozici žádné přehrávače"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Povolené aplikace"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"média"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Zapne se Bluetooth"</string>
 </resources>
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index 2aa7c34..5a4e9e3 100644
--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Mellem"</item>
     <item msgid="6740026006576843477">"Lang"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Kort"</item>
+    <item msgid="7397961711906421599">"Mellem"</item>
+    <item msgid="4079132024502041928">"Langt"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Standard"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA+LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Kun TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Global"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 382a87e..d31a550 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Vis profiloplysninger på låseskærmen"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Konti"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Placering"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Brug placering"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Brug placering"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Fra"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">Til – <xliff:g id="COUNT_1">%1$d</xliff:g> app har adgang til din placering</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Brug dit ansigt til godkendelse"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Start"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Hvis hjælpefunktionen Ansigtslås er deaktiveret, vil nogle konfigurationstrin muligvis ikke fungere korrekt via TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Gå tilbage"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Fortsæt konfig."</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Brug avanceret konfiguration"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="other">Skal indeholde færre end <xliff:g id="NUMBER_1">%d</xliff:g> cifre</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Enhedens administrator tillader ikke brug af en nylig brugt pinkode"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Brug af almindelige pinkoder er blokeret af din it-administrator. Prøv en anden pinkode."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Der kan ikke bruges et ugyldigt tegn"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Skal indeholde mindst ét bogstav"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Skal indeholde mindst ét tal"</string>
@@ -653,7 +655,6 @@
       <item quantity="other">Skal indeholde mindst <xliff:g id="COUNT">%d</xliff:g> tegn, som ikke er et tal</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Enhedens administrator tillader ikke brug af en nylig brugt adgangskode"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Brug af almindelige adgangskoder er blokeret af din it-administrator. Prøv en anden adgangskode."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Stigende eller faldende talsekvens og gentagne tal er ikke tilladt"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Bekræft"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Annuller"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Slå Wi-Fi til"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Brug Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Brug Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Indstillinger for Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Konfiguration og administration af trådløse adgangspunkter"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Centrer QR-koden nedenfor for at oprette forbindelse til \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Opret forbindelse til Wi-Fi-netværket ved at scanne en QR-kode"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Del Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Scan denne QR-kode for at oprette forbindelse til \"<xliff:g id="SSID">%1$s</xliff:g>\" og dele adgangskoden"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Scan denne QR-kode med en anden enhed for at oprette forbindelse til \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Scan denne QR-kode for at oprette forbindelse til \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Prøv igen. Hvis problemet fortsætter, skal du kontakte enhedsproducenten"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Noget gik galt"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Adgangskode til Wi-Fi-netværk: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Adgangskode til hotspot: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Opret automatisk forbindelse"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Tillad, at telefonen automatisk opretter forbindelse, når den er i nærheden af dette netværk"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Tillad, at din tablet automatisk opretter forbindelse, når den er i nærheden af dette netværk"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Tillad forbindelse til dette netværk, når det er inden for rækkevidde"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Tilføj enhed"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Brug en QR-kode til at føje en enhed til dette netværk"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR-koden har ikke et gyldigt format"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Brug systemets certifikater"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Angiv ikke"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Bekræft ikke"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Der er ikke angivet noget certifikat. Din forbindelse er ikke privat."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Netværksnavnet er for langt."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Domæne skal angives."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Certifikat er påkrævet."</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Forbind"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi er slået til"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Forbundet til <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Opretter forbindelse til <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Tilslutter…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Der kunne ikke oprettes forbindelse til netværket"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Netværket er ikke inden for rækkevidde"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Appen deler indhold. Hvis du vil dele internetforbindelsen, skal du deaktivere hotspot og derefter aktivere det"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Der er ikke indstillet nogen adgangskode"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Navn på hotspot"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Aktiverer <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Aktiverer <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Andre enheder kan oprette forbindelse til <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Adgangskode til hotspot"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP-bånd"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Øger automatisk opdateringshastigheden fra 60 til 90 Hz for noget indhold. Medfører højere batteriforbrug."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Gennemtving en opdateringshastighed på 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Den højeste opdateringshastighed, som giver forbedret animationskvalitet og reaktionsevne ved berøring. Medfører højere batteriforbrug."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Opmærksom skærm"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Til – Skærmen slukker ikke, når du kigger på den"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android-version"</string>
     <string name="security_patch" msgid="4071756145347865382">"Sikkerhedsopdatering til Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Model"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Model: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Model og hardware"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Hardwareversion"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Udstyrs-id"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Netværksindstillingerne er blevet nulstillet"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"SIM-kortene kan ikke ryddes"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Downloadede SIM-kort kan ikke ryddes på grund af en fejl.\n\nGenstart din enhed, og prøv igen."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Ryd alle data (gendan fabriksindstillinger)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Ryd alle data (nulstil)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Dette sletter alle data fra den "<b>"interne lagerplads"</b>" på din tablet, f.eks.: \n\n"<li>"Din Google-konto"</li>\n<li>"Data og indstillinger for system og apps"</li>\n<li>"Downloadede apps"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Dette sletter alle data fra den "<b>"interne lagerplads"</b>" på telefonen, f.eks.: \n\n"<li>"Din Google-konto"</li>\n<li>"Data og indstillinger for system og apps"</li>\n<li>"Downloadede apps"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Du er i øjeblikket logget ind på disse konti:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Der er andre brugere til stede på denne enhed.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Musik"</li>\n<li>"Billeder"</li>\n<li>"Andre brugerdata"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM-kort"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Dette vil ikke automatisk opsige dit mobilabonnement."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Ryd musik, billeder og andre brugerdata ved at formatere "<b>"USB-lager"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Hvis du vil rydde musik, billeder og andre brugerdata, skal du formatere "<b>"SD-kortet"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Ryd alle data (gendan fabriksindstillinger)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Ryd alle data (gendan fabriksindstillinger)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Dette rydder alle data fra den "<b>"interne lagerplads"</b>" på din tablet, f.eks.: \n\n"<li>"Din Google-konto"</li>\n<li>"Data og indstillinger for system og apps"</li>\n<li>"Downloadede apps"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Dette rydder alle data fra den "<b>"interne lagerplads"</b>" på din telefon, f.eks.: \n\n"<li>"Din Google-konto"</li>\n<li>"Data og indstillinger for system og apps"</li>\n<li>"Downloadede apps"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Du er i øjeblikket logget ind på følgende konti:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Der er andre brugere til stede på denne enhed.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Musik"</li>\n<li>"Billeder"</li>\n<li>"Andre brugerdata"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM-kort"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Dette opsiger ikke automatisk dit mobilabonnement."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Ryd musik, billeder og andre brugerdata ved at rydde "<b>"USB-lageret"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Hvis du vil rydde musik, billeder og andre brugerdata, skal du rydde "<b>"SD-kortet"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Slet USB-lager"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Formatér SD-kort"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Slet alle data på det interne USB-lager, f.eks. musik eller billeder"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Formatér alle data på SD-kortet, f.eks. musik eller billeder"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Ryd alle data"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Ryd alle data"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Alle dine personlige oplysninger og downloadede apps slettes. Denne handling kan ikke fortrydes."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Alle dine personlige oplysninger, bl.a. downloadede apps og SIM-kort, slettes. Denne handling kan ikke fortrydes."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Slet alt"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Der blev ikke foretaget nogen nulstilling, fordi tjenesten Systemoprydning ikke er tilgængelig."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Vil du slette alle data?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Gendannelse af fabriksindstillinger er ikke tilgængeligt for denne bruger"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Sletter…"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Vent et øjeblik…"</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Ryd alle data"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Ryd alle data"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Alle dine personlige oplysninger og downloadede apps slettes. Denne handling kan ikke fortrydes."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Alle dine personlige oplysninger, bl.a. downloadede apps og SIM-kort, slettes. Denne handling kan ikke fortrydes."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Vil du rydde alle data?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Det er ikke muligt for denne bruger at gendanne fabriksindstillingerne"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Rydder"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Vent et øjeblik…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Indstillinger for opkald"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Konfigurer telefonsvarer, viderestilling af opkald, ventende opkald, opkalds-id"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Netdeling via USB"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Netdeling kan ikke bruges til mere end <xliff:g id="MAXCONNECTION">%1$d</xliff:g> enheder."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Netdelingen med <xliff:g id="DEVICE_NAME">%1$s</xliff:g> vil blive afbrudt."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Netdeling via Ethernet"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Del telefonens internetforbindelse via USB Ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Del telefonens internetforbindelse via Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Brug hotspot og netdeling til at give andre enheder adgang til internettet via din mobildataforbindelse. Apps kan også oprette et hotspot for at dele indhold med enheder i nærheden."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Brug hotspot og netdeling til at give andre enheder adgang til internettet via din Wi-Fi- eller mobildataforbindelse. Apps kan også oprette et hotspot til at dele indhold med enheder i nærheden."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Hjælp"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Præferencer for undertekster"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Forstørrelse"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Forstørrelsesområde"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Aktivering af forstørrelse"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Vælg de områder, du vil bruge, når du forstørrer skærmen"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Fuld skærm"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"En del af skærmen"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Fuld skærm og en del af skærmen"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Forstør hele skærmen"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Forstør en del af skærmen"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Vil du skifte til knappen Hjælpefunktioner?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Hvis du bruger bevægelsen med tre tryk til at forstørre dele af skærmen, forsinker det indtastning og andre handlinger.\n\nVil du skifte til at bruge knappen Hjælpefunktioner til at forstørre skærmen?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Skift til knappen Hjælpefunktioner"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Behold bevægelsen med tre tryk for at forstørre"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Forstørrelsesindstillinger"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Tryk tre gange for at forstørre"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Brug en genvej til forstørrelse"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Afbryderknap afslutter opkald"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Stor musemarkør"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Fjern animationer"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Monolyd"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Kombiner kanaler ved afspilning af lyd"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Lydbalance"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Venstre"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Højre"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Monolyd"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Kombiner kanaler ved afspilning af lyd"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Lydbalance"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Venstre"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Højre"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Standard"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 sekunder"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 sekunder"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Vibration ved notifikation"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Vibration ved opkald"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Feedback ved tryk"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Brug <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Åbn <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Brug farvekorrigering"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Vis undertekster"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Kun til understøttet app"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Brug <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Åbn <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Brug farvekorrigering"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Vis undertekster"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Kun til understøttet app"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Tekststørrelse og format"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Tekststørrelse <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Flere valgmuligheder"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomali"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomali"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomali"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Gråtoner"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Rød-grøn"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Rød-grøn"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Blå-gul"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Begrænsning af baggrundsaktivitet"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Giv appen tilladelse til at køre i baggrunden"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Appen har ikke tilladelse til at køre i baggrunden"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Baggrundsforbruget kan ikke begrænses"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Baggrundsforbruget kan ikke begrænses"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Vil du begrænse baggrundsaktiviteten?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Hvis du begrænser en apps baggrundsaktivitet, kan det medføre, at den ikke fungerer korrekt"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Appen kan ikke begrænses, da batterioptimering er deaktiveret.\n\nAktivér batterioptimering for at begrænse appen."</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Angiv en tidsplan"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Forlæng batteritiden"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Deaktiver, når enheden er opladet"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Batterisparefunktion slås fra, når din telefon er på <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Batterisparefunktion slås fra, når din tablet er på <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Batterisparefunktion slås fra, når din enhed er på <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Batterisparefunktion deaktiveres, når din telefon er opladet til mere end <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Batterisparefunktion deaktiveres, når din tablet er opladet til mere end <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Batterisparefunktion deaktiveres, når din enhed er opladet til mere end <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Aktivér"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Nulstil"</string>
     <string name="tts_play" msgid="2945513377250757221">"Afspil"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Selvjusterende forbindelse"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Forlænger batteritiden og forbedrer enhedens ydeevne ved at administrere din netværksforbindelse automatisk"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Lager for loginoplysninger"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Installer et certifikat"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Installer certifikater fra lager"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Brugerloginoplysninger"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Se og rediger gemte loginoplysninger"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Avanceret"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Lagertype"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardwarebaseret"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Kun software"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Loginoplysningerne for denne bruger er ikke tilgængelige"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Installeret til VPN og apps"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Installeret til Wi-Fi"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Betaling på terminalen"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Konfigurer en betalingsapp. Derefter skal du blot holde bagsiden af din telefon mod en terminal med symbolet for kontaktløs betaling."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"OK, det er forstået"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Flere..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Mere…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Angiv en standardapp til betalinger"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Opdater standardappen til betalinger"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Ved kontaktløse terminaler vil du betale med <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Brug altid denne indstilling til opkald"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Vælg et SIM-kort til data"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Vælg et SIM-kort til sms"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Data-SIM skiftes. Dette kan tage op til et minut..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Data-SIM skiftes. Dette kan tage op til et minut…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Ring med"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Vælg et SIM-kort"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM-kort: <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"rutine, tidsplan, batterisparefunktion, strømsparefunktion, batteri, automatisk, procent"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, avancerede opkald, 4g-opkald"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"tilføj sprog, tilføj et sprog"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"tekststørrelse"</string>
     <string name="default_sound" msgid="6604374495015245195">"Standardlyd"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Lydstyrken for ringetone og notifikationer er på <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Lydstyrke, vibration, Forstyr ikke"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Aktivér lyde"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Livetekstning"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Undertekster til medier"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Ingen"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> tidsplan er angivet</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> tidsplaner er angivet</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Ingen}=1{1 tidsplan er angivet}one{# tidsplan er angivet}other{# tidsplaner er angivet}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Forstyr ikke"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Få kun notifikationer om vigtige personer og apps"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Begræns antallet af afbrydelser"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Kun prioritet"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Til – <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Fra – <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Fra"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Til"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Spørg hver gang"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Indtil du deaktiverer"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> time</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> timer</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minutter"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> tidsplan kan starte automatisk</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> tidsplaner kan starte automatisk</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 time}one{# time}other{# timer}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minut}one{# minut}other{# minutter}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Deaktiveret}=1{Deaktiveret/1 tidsplan kan starte automatisk}one{Deaktiveret/# tidsplan kan starte automatisk}other{Deaktiveret/# tidsplaner kan starte automatisk}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Hvad kan afbryde Forstyr ikke"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Personer"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Apps"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Angiv automatisk notifikationer med lavere prioritet som Diskret"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Automatisk rangering af notifikationer"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Ranger automatisk notifikationer efter relevans"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Feedback om tilpassede notifikationer"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Vis justeringer af notifikationer, og vis en mulighed for at give feedback til systemet"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Foreslåede handlinger og svar"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Vis automatisk foreslåede handlinger og svar"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Vis seneste notifikationer og notifikationer, der er udsat"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Adgang til Forstyr ikke"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Tillad Forstyr ikke"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Ingen installerede apps har anmodet om adgang, når indstillingen \"Forstyr ikke\" er aktiveret."</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Indlæser apps..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Indlæser apps…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Android blokerer på din anmodning notifikationer for denne app, så de ikke vises på enheden"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Android blokerer på din anmodning notifikationer i denne kategori, så de ikke vises på enheden"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Android blokerer på din anmodning notifikationer i denne gruppe, så de ikke vises på enheden"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Alle samtaler"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Prioriterede samtaler"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Ingen"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> samtale</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> samtaler</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Ingen"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Ingen}=1{1 samtale}one{# samtale}other{# samtaler}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Hvem kan afbryde?"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Opkald"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Opkald"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Hvis du vil sørge for, at tilladte opkald benytter lyd, skal du tjekke, at enheden er indstillet til at ringe"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Indgående opkald blokeres for \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\". Du kan ændre indstillingerne, så dine venner, din familie eller andre kontakter kan få fat i dig."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Stjernemarkerede kontakter"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one"><xliff:g id="NUM_PEOPLE">%d</xliff:g> anden</item>
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> andre</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Ingen"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Ingen}=1{{contact_1}}=2{{contact_1} og {contact_2}}=3{{contact_1}, {contact_2} og {contact_3}}one{{contact_1}, {contact_2} og # mere}other{{contact_1}, {contact_2} og # andre}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Beskeder"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"beskeder"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Beskeder"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Indgående beskeder er blokeret for \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\". Du kan ændre indstillingerne, så dine venner, din familie eller andre kontakter kan få fat i dig."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Du modtager alle beskeder"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Du modtager alle opkald"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Ingen"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontakt</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontakter</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Ingen}=1{1 kontakt}one{# kontakt}other{# kontakter}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Alle"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Kontakter"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Stjernemarkerede kontakter"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Alle notifikationer"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Nogle notifikationer"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Valgte personer kan stadig kontakte dig, selv hvis du ikke tillader, at apps kan afbryde"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one"><xliff:g id="APP_NAMES">%s</xliff:g> kan afbryde</item>
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> kan afbryde</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> til"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Ingen apps kan afbryde}=1{{app_1} kan afbryde}=2{{app_1} og {app_2} kan afbryde}=3{{app_1}, {app_2} og {app_3} kan afbryde}one{{app_1}, {app_2} og # mere kan afbryde}other{{app_1}, {app_2} og # andre kan afbryde}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Apps"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Alle notifikationer"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Nogle notifikationer"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Notifikationer, der kan afbryde"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Tillad alle notifikationer"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> kan afbryde</item>
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> kan afbryde</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Intet kan afbryde"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> til"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Intet kan afbryde}=1{{sound_category_1} kan afbryde}=2{{sound_category_1} og {sound_category_2} kan afbryde}=3{{sound_category_1}, {sound_category_2} og{sound_category_3} kan afbryde}one{{sound_category_1}, {sound_category_2} og # mere kan afbryde}other{{sound_category_1}, {sound_category_2} og # andre kan afbryde}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Intet kan afbryde"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Ingen kan afbryde"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Nogle personer kan afbryde"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Alle personer kan afbryde"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB styres af"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Tilsluttet enhed"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Denne enhed"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Skifter…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Skifter…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Der kunne ikke skiftes"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Oplader denne enhed"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Den tilsluttede enhed oplades"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Se info"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Datasparefunktion"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Ubegrænset data"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Baggrundsdata er slået fra"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Baggrundsdata er deaktiveret"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Til"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Fra"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Brug datasparefunktion"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Der skal ikke kunne skrives svar eller anden tekst i notifikationer, når enheden er låst."</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Standardstavekontrol"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Vælg stavekontrol"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Brug stavekontrol"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Brug stavekontrol"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Ikke valgt"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(ingen)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"For at hjælpe med at frigøre lagerplads fjerner lagerstyringen sikkerhedskopierede billeder og videoer fra din enhed."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Fjern billeder og videoer"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Lagerstyring"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Brug lagerstyring"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Brug Lageradministrator"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automatisk"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Manuel"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Frigør plads nu"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Tryk to gange for at tjekke telefonen"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Tryk to gange for at tjekke din tablet"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Tryk to gange for at tjekke enheden"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Stryg for notifikationer"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Stryg nedad ved skærmens nederste kant for at se dine notifikationer"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Enhåndstilstand"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Brug enhåndstilstand"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Afslut ved skift mellem apps"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Timeout"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 sekunder"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 sekunder"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 sekunder"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"brug med en hånd"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Tryk to gange på skærmen for at se klokkeslæt, notifikationer og andre oplysninger."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Løft for at tjekke telefonen"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Løft for at tjekke din tablet"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Tryk for at tjekke din tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Tryk for at tjekke enheden"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Tryk på skærmen for at se klokkeslæt, notifikationer og andre oplysninger."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Panikknap"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Start nødhandlinger ved at trykke på afbryderknappen hurtigt fem gange."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Advarselslyd"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Lav en lyd, inden handlingerne påbegyndes"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Kontaktpersoner ved nødsituationer"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Stryg over fingeraftrykslæser for at se notifikationer"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Stryg fingeraftryk"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Du kan tjekke dine notifikationer ved at stryge nedad på fingeraftrykslæseren på bagsiden af telefonen."</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Aktivér for alle apps"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Vælg grafikdriver"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Standard"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Game Driver"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Game Driver"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Udviklerdriver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Grafikdriver til system"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Der blev ikke fundet nogen netværk. Prøv igen."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(forbudt)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Intet SIM-kort"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Intet SIM-kort"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Ingen"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Du skal bruge et SIM-kort for at oprette forbindelse"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Du skal bruge et SIM-kort fra <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> for at oprette forbindelse"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Foretrukken netværkstilstand: WCDMA foretrækkes"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Foretrukken netværkstilstand: Kun GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Foretrukken netværkstilstand: Kun WCDMA"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobildata"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Brug data via mobilnetværk"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Telefonen skifter automatisk til dette mobilselskab, når netværket er inden for rækkevidde"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Der er ikke noget tilgængeligt SIM-kort"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Opkaldspræference"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Sms-præference"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Spørg hver gang"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Tillad overlejring af skærme fra Indstillinger"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Giv apps, som kan vises over andre apps, tilladelse til at overlejre skærme fra appen Indstillinger"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Medier"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Skjul afspiller, når mediesessionen er afsluttet"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"I denne afspiller kan du genoptage en session via det udvidede panel for Kvikmenu."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Medieafspiller i Kvikmenu"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Vis medieafspilleren i længere tid, så du nemmere kan genoptage afspilningen"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Skjul afspiller"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Vis afspiller"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Der er ingen tilgængelige afspillere"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Tilladte apps"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"Medier"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth aktiveres"</string>
 </resources>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 4c32e97..882b02e 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Mittel"</item>
     <item msgid="6740026006576843477">"Lang"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Kurz"</item>
+    <item msgid="7397961711906421599">"Mittel"</item>
+    <item msgid="4079132024502041928">"Lang"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Standard"</item>
     <item msgid="4234707448428002595">"Sans Serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Nur TD-SCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Global"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 42b68a5..3e0e3f0 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Profilinformationen auf Sperrbildschirm anzeigen"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Konten"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Standort"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Standort verwenden"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Standort verwenden"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Aus"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">An: <xliff:g id="COUNT_1">%1$d</xliff:g> Apps haben Zugriff auf den Standort</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Per Gesichtserkennung authentifizieren"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Starten"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Wenn Face Unlock mit Bedienungshilfen deaktiviert ist, funktionieren manche Einrichtungsschritte möglicherweise nicht richtig mit TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Zurück"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Einrichtung fortsetzen"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Bedienungshilfen-Einrichtung verwenden"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="one">Muss weniger als <xliff:g id="NUMBER_0">%d</xliff:g> Ziffer haben</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Der Geräteadministrator lässt die Verwendung einer früheren PIN nicht zu"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Häufig verwendete PINs werden von deinem IT-Administrator blockiert. Versuch es mit einer anderen PIN."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Es sind keine ungültigen Zeichen zulässig"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Es muss mindestens ein Buchstabe enthalten sein"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Es muss mindestens eine Ziffer enthalten sein"</string>
@@ -653,7 +655,6 @@
       <item quantity="one">Passwort muss mindestens ein Zeichen enthalten, das keine Ziffer ist</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Der Geräteadministrator lässt die Verwendung eines früheren Passworts nicht zu"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Häufig verwendete Passwörter werden von deinem IT-Administrator blockiert. Versuch es mit einem anderen Passwort."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Aufsteigende, absteigende oder wiederholte Ziffernfolgen sind unzulässig"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Bestätigen"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Abbrechen"</string>
@@ -796,7 +797,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"WLAN"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"WLAN aktivieren"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"WLAN"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"WLAN verwenden"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"WLAN verwenden"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"WLAN-Einstellungen"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"WLAN"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"WLAN-Zugangspunkte festlegen und verwalten"</string>
@@ -904,7 +905,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Wenn du eine Verbindung zu \"<xliff:g id="SSID">%1$s</xliff:g>\" herstellen möchtest, scanne den QR-Code unten"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Scanne den QR-Code, um dein Gerät mit dem WLAN zu verbinden"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"WLAN teilen"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Scanne diesen QR-Code, um eine Verbindung mit \"<xliff:g id="SSID">%1$s</xliff:g>\" herzustellen und das Passwort zu teilen"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Scanne diesen QR-Code mit einem anderen Gerät, um dich mit \"<xliff:g id="SSID">%1$s</xliff:g>\" zu verbinden"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Diesen QR-Code scannen, um eine Verbindung mit \"<xliff:g id="SSID">%1$s</xliff:g>\" herzustellen"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Versuche es noch einmal. Falls das Problem weiterhin besteht, wende dich an den Hersteller des Geräts"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Fehler"</string>
@@ -930,8 +931,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"WLAN-Passwort: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Passwort des Hotspots: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Automatische Verbindung"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Zulassen, dass das Smartphone automatisch eine Verbindung herstellt, wenn es in der Nähe dieses Netzwerks ist"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Zulassen, dass das Tablet automatisch eine Verbindung herstellt, wenn es in der Nähe dieses Netzwerks ist"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Verbindung zulassen, wenn dieses Netzwerk in Reichweite ist"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Gerät hinzufügen"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"QR-Code verwenden, um diesem Netzwerk ein Gerät hinzuzufügen"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR-Code ist kein gültiges Format"</string>
@@ -943,7 +943,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Systemzertifikate verwenden"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Nicht bereitstellen"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Nicht validieren"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Kein Zertifikat angegeben. Es wird keine private Verbindung hergestellt."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Der Netzwerkname ist zu lang."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Angabe einer Domain erforderlich."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Zertifikat erforderlich."</string>
@@ -970,6 +969,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Verbinden"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"WLAN ist aktiviert"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Verbunden mit <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Verbindung zu <xliff:g id="NETWORK_NAME">%1$s</xliff:g> wird hergestellt"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Verbinden…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Netzwerkverbindung konnte nicht hergestellt werden."</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Netzwerk außer Reichweite"</string>
@@ -1041,7 +1041,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Es werden Inhalte per App geteilt. Wenn du eine Internetverbindung freigeben möchtest, deaktiviere den Hotspot und aktiviere ihn dann neu."</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Kein Passwort festgelegt"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Name des Hotspots"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> wird aktiviert..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> wird aktiviert…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Andere Geräte können sich mit <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> verbinden"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Passwort des Hotspots"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Band für Zugangspunkt"</string>
@@ -1191,7 +1191,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Setzt die Aktualisierungsrate für einige Inhalte automatisch von 60 auf 90 Hz herauf. Erhöhter Akkuverbrauch."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Aktualisierungsrate von 90 Hz erzwingen"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Höchste Aktualisierungsrate für bessere Touchscreen-Reaktion und flüssigere Animationen. Erhöhter Akkuverbrauch."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Aufmerksamkeitserkennung"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"An / Der Bildschirm wird nicht ausgeschaltet, solange du auf ihn blickst"</string>
@@ -1330,7 +1330,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android-Version"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android-Sicherheitsupdate"</string>
     <string name="model_info" msgid="8997566254717810904">"Modell"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Modell: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Modell und Hardware"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Hardwareversion"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Geräte-ID"</string>
@@ -1605,31 +1604,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Die Netzwerkeinstellungen wurden zurückgesetzt."</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"SIMs können nicht gelöscht werden"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Heruntergeladene SIMs können aufgrund eines Fehlers nicht gelöscht werden.\n\nStarte das Gerät neu und versuche es noch einmal."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Alle Daten löschen (auf Werkseinstellungen zurücksetzen)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Alle Daten löschen"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Hierdurch werden alle Daten aus dem "<b>"internen Speicher"</b>" deines Tablets gelöscht, wie z. B. die Folgenden:\n\n"<li>"Dein Google-Konto"</li>\n<li>"System- und App-Daten sowie entsprechende Einstellungen"</li>\n<li>"Heruntergeladene Apps"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Hierdurch werden alle Daten aus dem "<b>"internen Speicher"</b>" deines Smartphones gelöscht, wie z. B. die Folgenden:\n\n"<li>"Dein Google-Konto"</li>\n<li>"System- und App-Daten sowie entsprechende Einstellungen"</li>\n<li>"Heruntergeladene Apps"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Du bist zurzeit in folgenden Konten angemeldet:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Auf diesem Gerät sind andere Nutzer vorhanden.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Musik"</li>\n<li>"Fotos"</li>\n<li>"Sonstige Nutzerdaten"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM-Elemente"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Dein Mobilfunkvertrag wird dadurch nicht gekündigt."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Um auch Musik, Bilder und sonstige Nutzerdaten zu löschen, muss der "<b>"USB-Speicher"</b>" gelöscht werden."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Um auch Musik, Bilder und sonstige Nutzerdaten zu löschen, muss die "<b>"SD-Karte"</b>" gelöscht werden."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Alle Daten löschen (auf Werkseinstellungen zurücksetzen)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Alle Daten löschen"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Hierdurch werden alle Daten aus dem "<b>"internen Speicher"</b>" deines Tablets gelöscht, wie z. B. die Folgenden:\n\n"<li>"Dein Google-Konto"</li>\n<li>"System- und App-Daten sowie entsprechende Einstellungen"</li>\n<li>"Heruntergeladene Apps"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Hierdurch werden alle Daten aus dem "<b>"internen Speicher"</b>" deines Smartphones gelöscht, wie z. B. die Folgenden:\n\n"<li>"Dein Google-Konto"</li>\n<li>"System- und App-Daten sowie entsprechende Einstellungen"</li>\n<li>"Heruntergeladene Apps"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Du bist zurzeit in folgenden Konten angemeldet:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Auf diesem Gerät sind andere Nutzer vorhanden.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Musik"</li>\n<li>"Fotos"</li>\n<li>"Sonstige Nutzerdaten"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIMs"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Dein Mobilfunkvertrag wird dadurch nicht gekündigt."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Um auch Musik, Bilder und sonstige Nutzerdaten zu löschen, muss der "<b>"USB-Speicher"</b>" gelöscht werden."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Um auch Musik, Bilder und sonstige Nutzerdaten zu löschen, muss die "<b>"SD-Karte"</b>" gelöscht werden."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USB-Speicher löschen"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SD-Karte löschen"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Alle Daten, z. B. Musik und Fotos, aus dem internen USB-Speicher löschen"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Alle Daten, z. B. Musik und Fotos, von der SD-Karte löschen"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Alle Daten löschen"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Alle Daten löschen"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Alle deine personenbezogenen Daten und heruntergeladenen Apps werden gelöscht. Dieser Vorgang kann nicht rückgängig gemacht werden."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Alle deine personenbezogenen Daten, einschließlich heruntergeladener Apps und SIMs, werden gelöscht. Dieser Vorgang kann nicht rückgängig gemacht werden."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Alles löschen"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Die Zurücksetzung konnte nicht durchgeführt werden, weil der Dienst zur Systembereinigung nicht verfügbar ist."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Alle Daten löschen?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Das Zurücksetzen auf Werkseinstellungen ist für diesen Nutzer nicht verfügbar."</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Löschen"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Bitte warten..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Alle Daten löschen"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Alle Daten löschen"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Alle deine personenbezogenen Daten und heruntergeladenen Apps werden gelöscht. Dieser Vorgang kann nicht rückgängig gemacht werden."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Alle deine personenbezogenen Daten, einschließlich heruntergeladener Apps und SIMs, werden gelöscht. Dieser Vorgang kann nicht rückgängig gemacht werden."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Alle Daten löschen?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Das Zurücksetzen auf Werkseinstellungen ist für diesen Nutzer nicht verfügbar."</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Wird gelöscht…"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Bitte warten…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Anrufeinstellungen"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Mailbox, Rufweiterleitung, Anklopfen, Anruferkennung einrichten"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB-Tethering"</string>
@@ -1677,7 +1674,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Tethering nur für maximal <xliff:g id="MAXCONNECTION">%1$d</xliff:g> Geräte möglich"</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Tethering für <xliff:g id="DEVICE_NAME">%1$s</xliff:g> wird deaktiviert."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ethernet-Tethering"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Internetverbindung des Smartphones über USB-Ethernet freigeben"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Internetverbindung des Smartphones über Ethernet freigeben"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Mithilfe der Hotspot- und Tethering-Funktion kannst du deine mobile Datenverbindung für andere Geräte freigeben, damit diese eine Internetverbindung erhalten. Apps können ebenfalls einen Hotspot erstellen und so das Teilen von Inhalten mit Geräten in der Nähe ermöglichen."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Mithilfe der Hotspot- und Tethering-Funktion kannst du anderen Geräten erlauben, deine Internetverbindung (WLAN oder mobile Daten) mitzunutzen. Es gibt auch Apps für das Erstellen eines Hotspots, damit Inhalte mit Geräten in der Nähe geteilt werden können."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Hilfe"</string>
@@ -2118,13 +2115,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Untertitel-Einstellungen"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Vergrößerung"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Vergrößerungsbereich"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Vergrößerung aktivieren"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Wähle die Bereiche aus, die bei der Bildschirmvergrößerung verwendet werden sollen"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Ganzer Bildschirm"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Teil des Bildschirms"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Ganzer Bildschirm und Teil des Bildschirms"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Ganzen Bildschirm vergrößern"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Teil des Bildschirms vergrößern"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Zur Schaltfläche \"Bedienungshilfen\" wechseln?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Wenn du dreimal tippst, um einen Teil des Bildschirms zu vergrößern, verzögern sich die Texteingabe und andere Aktionen.\n\nMöchtest du die Vergrößerung mit der Schaltfläche \"Bedienungshilfen\" trotzdem vornehmen?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Zur Schaltfläche \"Bedienungshilfen\" wechseln"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Mit \"Dreimal tippen\" weiterhin vergrößern"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Vergrößerungseinstellungen"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Dreimal tippen zum Vergrößern"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Mit Tastenkombination vergrößern"</string>
@@ -2178,11 +2178,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Ein/Aus beendet Anruf"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Großer Mauszeiger"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Animationen entfernen"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Mono-Audio"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Kanäle bei Audiowiedergabe kombinieren"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Audiobalance"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Links"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Rechts"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Mono-Audio"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Kanäle bei Audiowiedergabe kombinieren"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Audiobalance"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Links"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Rechts"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Standard"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 Sekunden"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 Sekunden"</string>
@@ -2212,11 +2212,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Vibration bei Benachrichtigungseingang"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Vibration bei Klingeln"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Haptisches Feedback"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> verwenden"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> öffnen"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Farbkorrektur aktivieren"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Untertitel anzeigen"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Nur für unterstützte Apps"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> verwenden"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> öffnen"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Farbkorrektur aktivieren"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Untertitel anzeigen"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Nur für unterstützte Apps"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Untertitelgröße und -stil"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Textgröße: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Weitere Optionen"</string>
@@ -2246,6 +2246,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomalie"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomalie"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomalie"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Graustufen"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Rot-Grün-Sehschwäche"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Rot-Grün-Sehschwäche"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Blau-Gelb-Sehschwäche"</string>
@@ -2375,7 +2376,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Einschränkung der Hintergrundnutzung"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"App darf im Hintergrund ausgeführt werden"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"App darf nicht im Hintergrund ausgeführt werden"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Hintergrundnutzung kann nicht eingeschränkt werden"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Hintergrundnutzung kann nicht eingeschränkt werden"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Hintergrundaktivität einschränken?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Wenn du die Hintergrundaktivität einer App einschränkst, kann dies zu unerwünschtem Verhalten führen"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Da bei dieser App die Akkunutzung nicht optimiert wird, kannst du sie nicht einschränken.\n\nDu musst du zunächst die Akkuoptimierung aktivieren."</string>
@@ -2592,9 +2593,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Zeitplan festlegen"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Akkulaufzeit verlängern"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Bei vollem Akku ausschalten"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Der Energiesparmodus wird deaktiviert, sobald dein Smartphone wieder zu <xliff:g id="PERCENT">%1$s</xliff:g> geladen ist"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Der Energiesparmodus wird deaktiviert, wenn dein Tabletakku bei <xliff:g id="PERCENT">%1$s</xliff:g> steht"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Der Energiesparmodus wird deaktiviert, wenn dein Geräteakku bei <xliff:g id="PERCENT">%1$s</xliff:g> steht"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Der Energiesparmodus wird deaktiviert, wenn dein Smartphone-Akku zu über <xliff:g id="PERCENT">%1$s</xliff:g> geladen ist"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Der Energiesparmodus wird deaktiviert, wenn dein Tablet-Akku zu über <xliff:g id="PERCENT">%1$s</xliff:g> geladen ist"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Der Energiesparmodus wird deaktiviert, wenn dein Geräteakku zu über <xliff:g id="PERCENT">%1$s</xliff:g> geladen ist"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Aktivieren"</string>
@@ -2659,6 +2660,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Zurücksetzen"</string>
     <string name="tts_play" msgid="2945513377250757221">"Wiedergeben"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Automatische Konnektivität"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Verlängert die Akkulaufzeit und optimiert die Leistung des Geräts durch automatisches Verwalten deiner Netzwerkverbindungen"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Anmeldedatenspeicher"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Ein Zertifikat installieren"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Zertifikate von Speicher installieren"</string>
@@ -2670,9 +2673,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Nutzeranmeldedaten"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Gespeicherte Anmeldedaten anzeigen und ändern"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Erweitert"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Speichertyp"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardware-gestützt"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Nur Software"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Anmeldedaten sind für diesen Nutzer nicht verfügbar."</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Installiert für VPN und Apps"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Installiert für WLAN"</string>
@@ -3061,7 +3061,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"An der Kasse bezahlen"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Richte eine Zahlungs-App ein. Halte die Rückseite deines Smartphones an eine beliebige Kasse mit dem Symbol zum kontaktlosen Bezahlen."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Ok"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Mehr…"</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Mehr…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Standard-App für kontaktloses Bezahlen festlegen"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Standard-App für kontaktloses Bezahlen aktualisieren"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"An einem Terminal für kontaktloses Bezahlen <xliff:g id="APP">%1$s</xliff:g> nutzen"</string>
@@ -3145,7 +3145,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Diese SIM für alle Anrufe verwenden"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"SIM-Karte für Daten auswählen"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"SIM-Karte für SMS auswählen"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Wechsel der Daten-SIM. Dies kann bis zu einer Minute dauern."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Daten-SIM wird gewechselt. Dies kann bis zu einer Minute dauern…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Anrufen mit"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"SIM-Karte auswählen"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM-Karte <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3288,6 +3288,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"ablauf, zeitplan, energiesparmodus, stromsparfunktion, akku, automatisch, prozent"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"VoLTE, erweiterte Anruffunktionen, 4G-Anrufe"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"Sprache hinzufügen, eine Sprache hinzufügen"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"Textgröße"</string>
     <string name="default_sound" msgid="6604374495015245195">"Standardton"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Lautstärke bei Klingeln und Benachrichtigungseingang auf <xliff:g id="PERCENTAGE">%1$s</xliff:g> %% eingestellt"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Lautstärke, Vibration, Bitte nicht stören"</string>
@@ -3327,11 +3328,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Töne beim Hochfahren"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Automatische Untertitel"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Medien automatisch untertiteln"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Keine"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> Zeitpläne festgelegt</item>
-      <item quantity="one">1 Zeitplan festgelegt</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Keiner}=1{1 Zeitplan festgelegt}other{# Zeitpläne festgelegt}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Bitte nicht stören"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Benachrichtigungen nur von wichtigen Personen und Apps"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Unterbrechungen einschränken"</string>
@@ -3399,20 +3396,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Nur wichtige Unterbrechungen"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>."</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"An / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Aus / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Aus"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"An"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Jedes Mal fragen"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Bis zur Deaktivierung"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> Stunden</item>
-      <item quantity="one">1 Stunde</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> Minuten"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> Zeitpläne können automatisch aktiviert werden</item>
-      <item quantity="one">1 Zeitplan kann automatisch aktiviert werden</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 Stunde}other{# Stunden}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 Minute}other{# Minuten}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Aus}=1{Aus/1 Zeitplan kann automatisch aktiviert werden}other{Aus/# Zeitpläne können automatisch aktiviert werden}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Was den \"Bitte nicht stören\"-Modus unterbrechen kann"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Personen"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Apps"</string>
@@ -3458,6 +3447,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Benachrichtigungen mit niedriger Priorität automatisch auf \"Stumm\" schalten"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Adaptive Sortierung der Benachrichtigungen"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Benachrichtigungen automatisch nach Relevanz sortieren"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Feedback zu adaptiven Benachrichtigungen"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Änderungen an Benachrichtigungen und die Option für Systemfeedback anzeigen"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Aktions- und Antwortvorschläge"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Es werden automatisch Vorschläge für Aktionen und Antworten angezeigt"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Neue und zurückgestellte Benachrichtigungen anzeigen"</string>
@@ -3654,7 +3645,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Zugriff während \"Bitte nicht stören\""</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"\"Bitte nicht stören\" zulassen"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Keine installierte App hat während \"Bitte nicht stören\" Zugriff angefordert."</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Apps werden geladen..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Apps werden geladen…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Gemäß deinen Einstellungen unterbindet Android die Anzeige von Benachrichtigungen dieser App auf diesem Gerät."</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Gemäß deinen Einstellungen unterbindet Android die Anzeige von Benachrichtigungen dieser Kategorie auf diesem Gerät."</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Gemäß deinen Einstellungen unterbindet Android die Anzeige von Benachrichtigungen dieser Gruppe auf diesem Gerät."</string>
@@ -3746,11 +3737,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Alle Unterhaltungen"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Vorrangige Unterhaltungen"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Keine"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> Unterhaltungen</item>
-      <item quantity="one">1 Unterhaltung</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Keine"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Keine}=1{1 Unterhaltung}other{# Unterhaltungen}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Wer unterbrechen darf"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Anrufe"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Anrufe"</string>
@@ -3759,11 +3746,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Damit sichergestellt ist, dass bei zugelassenen Anrufen auch wirklich ein akustisches Signal ertönt, solltest du prüfen, ob der Klingeltonmodus aktiviert ist"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Im Modus \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" werden eingehende Anrufe blockiert. Du kannst die Einstellungen anpassen, sodass dich Freunde, Familie oder andere Kontakte erreichen können."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Markierte Kontakte"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> weitere Personen</item>
-      <item quantity="one">1 weitere Person</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Keine"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Keiner}=1{{contact_1}}=2{{contact_1} und {contact_2}}=3{{contact_1}, {contact_2} und {contact_3}}other{{contact_1}, {contact_2} und # weitere Kontakte}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Nachrichten"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"Nachrichten"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Nachrichten"</string>
@@ -3772,11 +3755,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Eingehende Nachrichten für \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" werden blockiert. Du kannst die Einstellungen anpassen, sodass dich Freunde, Familie oder andere Kontakte erreichen können."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Alle Nachrichten können dich erreichen"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Alle Anrufe können dich erreichen"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Keine"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> Kontakte</item>
-      <item quantity="one">1 Kontakt</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Keiner}=1{1 Kontakt}other{# Kontakte}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Alle"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Kontakte"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Markierte Kontakte"</string>
@@ -3814,22 +3793,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Alle Benachrichtigungen"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Einige Benachrichtigungen"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Ausgewählte Personen können dich weiterhin erreichen, auch wenn du nicht zulässt, dass Apps dich unterbrechen."</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> können ihn unterbrechen</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> kann ihn unterbrechen</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> weitere"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Keine Apps können ihn unterbrechen}=1{Die App \"{app_1}\" kann ihn unterbrechen}=2{Die Apps \"{app_1}\" und \"{app_2}\" können ihn unterbrechen}=3{Die Apps \"{app_1}\", \"{app_2}\" und \"{app_3}\" können ihn unterbrechen}other{Die App \"{app_1}\", \"{app_2}\" und # weitere können ihn unterbrechen}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Apps"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Alle Benachrichtigungen"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Einige Benachrichtigungen"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Benachrichtigungen, die unterbrechen dürfen"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Alle Benachrichtigungen zulassen"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> können ihn unterbrechen</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> kann ihn unterbrechen</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Nichts kann ihn unterbrechen"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> weitere"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Nichts kann ihn unterbrechen}=1{Geräusche der Kategorie \"{sound_category_1}\" können ihn unterbrechen}=2{Geräusche der Kategorie \"{sound_category_1}\" und \"{sound_category_2}\" können ihn unterbrechen}=3{Geräusche der Kategorie \"{sound_category_1}\", \"{sound_category_2}\" und \"{sound_category_3}\" können ihn unterbrechen}other{Geräusche der Kategorie \"{sound_category_1}\", \"{sound_category_2}\" und # weiteren können ihn unterbrechen}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Nichts kann ihn unterbrechen"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Niemand kann ihn unterbrechen"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Einige Personen können ihn unterbrechen"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Alle Personen können ihn unterbrechen"</string>
@@ -4073,7 +4044,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"Gerät, das die USB-Verbindung steuert"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Verbundenes Gerät"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Dieses Gerät"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Wird gewechselt…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Wird gewechselt…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Wechsel nicht möglich"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Gerät aufladen"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Verbundenes Gerät wird aufgeladen"</string>
@@ -4320,7 +4291,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Details ansehen"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Datensparmodus"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Uneingeschränkter Datenzugriff"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Hintergrunddaten sind deaktiviert"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Hintergrunddaten sind deaktiviert"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"An"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Aus"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Datensparmodus verwenden"</string>
@@ -4343,7 +4314,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Wenn das Gerät gesperrt ist, ist das Schreiben von Antworten oder anderen Texten in Nachrichten nicht möglich"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Standardrechtschreibprüfung"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Rechtschreibprüfung wählen"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Rechtschreibprüfung verwenden"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Rechtschreibprüfung verwenden"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Nicht ausgewählt"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(keine)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4433,7 +4404,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Zur Freigabe von Speicherplatz entfernt der Speichermanager Back-ups von Fotos und Videos von deinem Gerät."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Fotos &amp; Videos entfernen"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Speichermanager"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Speichermanager aktivieren"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Speichermanager verwenden"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automatisch"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Manuell"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Jetzt Speicherplatz freigeben"</string>
@@ -4471,6 +4442,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Beim Doppeltippen Display aktivieren"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Doppeltippen für schnellen Blick auf das Display des Tablets"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Doppeltippen für schnellen Blick auf das Display des Geräts"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Für Benachrichtigungen wischen"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Wische auf dem Bildschirm nach unten, um deine Benachrichtigungen aufzurufen"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Einhandmodus"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Einhandmodus verwenden"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Beim Wechseln zwischen Apps beenden"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Zeitlimit"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 Sekunden"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 Sekunden"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 Sekunden"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"Einhandbedienung"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Wenn du auf den Bildschirm doppeltippst, werden die Uhrzeit, Benachrichtigungen und andere Informationen angezeigt."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Beim Hochheben Display aktivieren"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Tablet hochnehmen, um das Display anzusehen"</string>
@@ -4483,6 +4464,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Beim Tippen Display aktivieren"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Beim Tippen Display aktivieren"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Wenn du auf den Bildschirm tippst, werden die Uhrzeit, Benachrichtigungen und andere Informationen angezeigt."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Paniktaste"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Drücke fünfmal schnell die Ein-/Aus-Taste, um die Aktionen für Notfälle zu starten."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Warnton"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Warnung vor Beginn der Aktionen"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Notfallkontakte"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Benachrichtigungen durch Wischen über Fingerabdrucksensor öffnen"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Fingerabdrucksensor verwenden"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Zum Lesen von Benachrichtigungen von oben nach unten über den Fingerabdrucksensor auf der Rückseite des Smartphones wischen"</string>
@@ -4637,7 +4623,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Für alle Apps aktivieren"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Grafiktreiber auswählen"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Standard"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Game Driver"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Game Driver"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Entwickler-Treiber"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Grafiktreiber des Systems"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4706,6 +4692,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Netzwerke nicht gefunden. Bitte versuch es noch einmal."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(nicht zulässig)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Keine SIM-Karte"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Keine SIM-Karte"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Keine"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Zum Herstellen einer Verbindung ist eine SIM-Karte erforderlich"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Zum Herstellen einer Verbindung ist eine <xliff:g id="WIRELESS_CARRIER">%s</xliff:g>-SIM-Karte erforderlich"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Bevorzugter Netzmodus: WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Bevorzugter Netzmodus: nur GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Bevorzugter Netzmodus: nur WCDMA"</string>
@@ -4759,6 +4750,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobile Daten"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Datenzugriff über Mobilfunknetz"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Telefon wechselt automatisch zu diesem Mobilfunkanbieter, wenn er in Reichweite ist"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Keine SIM-Karte verfügbar"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Anrufeinstellung"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS-Einstellung"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Jedes Mal fragen"</string>
@@ -4941,10 +4933,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Apps dürfen über Einstellungen angezeigt werden"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Apps, die über anderen Apps angezeigt werden dürfen, dürfen auch über den Einstellungen angezeigt werden"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Medien"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Player ausblenden, wenn die Sitzung beendet ist"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Mit dem Player kannst du eine Sitzung aus dem erweiterten Bereich der Schnelleinstellungen fortsetzen."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Mediaplayer in den Schnelleinstellungen"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Mediaplayer für längere Zeit anzeigen, um die Wiedergabe einfach fortsetzen zu können"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Player ausblenden"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Player anzeigen"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Es sind keine Player verfügbar."</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Zugelassene Apps"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"Medien"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth wird aktiviert"</string>
 </resources>
diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml
index e0d0aa7..c8cd362 100644
--- a/res/values-el/arrays.xml
+++ b/res/values-el/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Μεσαίο"</item>
     <item msgid="6740026006576843477">"Παρατεταμένο"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Σύντομο"</item>
+    <item msgid="7397961711906421599">"Μεσαίο"</item>
+    <item msgid="4079132024502041928">"Μεγάλο"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Προεπιλεγμένη"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Παγκόσμιο"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Μόνο TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Παγκόσμιο"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 22b57ab..539b075 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Εμφάνιση πληροφοριών προφίλ στην οθόνη κλειδώματος"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Λογαριασμοί"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Τοποθεσία"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Χρήση τοποθεσίας"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Χρήση τοποθεσίας"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Απενεργοποίηση"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">Ενεργή - <xliff:g id="COUNT_1">%1$d</xliff:g> εφαρμογές έχουν πρόσβαση στην τοποθεσία</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Χρήση προσώπου για έλεγχο ταυτότητας"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Αρχή"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Εάν το Face Unlock στη λειτουργία προσβασιμότητας είναι ανενεργό, ορισμένα βήματα ρύθμισης ενδέχεται να μην λειτουργούν σωστά με το TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Πίσω"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Συνέχιση ρύθμισης"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Χρήση ρύθμισης προσβασιμότητας"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="one">Πρέπει να αποτελείται από λιγότερα από <xliff:g id="NUMBER_0">%d</xliff:g> ψηφίο</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Ο διαχειριστής της συσκευής δεν επιτρέπει τη χρήση πρόσφατου PIN"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Τα συνηθισμένα PIN αποκλείονται από τον διαχειριστή IT. Δοκιμάστε να χρησιμοποιήσετε διαφορετικό PIN."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Δεν μπορεί να περιλαμβάνει μη έγκυρο χαρακτήρα"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Πρέπει να περιλαμβάνει τουλάχιστον ένα γράμμα"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Πρέπει να περιλαμβάνει τουλάχιστον ένα ψηφίο"</string>
@@ -653,7 +655,6 @@
       <item quantity="one">Πρέπει να περιέχει τουλάχιστον 1 μη αριθμητικό χαρακτήρα</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Ο διαχειριστής της συσκευής δεν επιτρέπει τη χρήση πρόσφατου κωδικού πρόσβασης"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Οι συνηθισμένοι κωδικοί πρόσβασης αποκλείονται από τον διαχειριστή IT. Δοκιμάστε να χρησιμοποιήσετε διαφορετικό κωδικό πρόσβασης."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Δεν επιτρέπεται η αύξουσα, φθίνουσα ή επαναλαμβανόμενη ακολουθία ψηφίων"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Επιβεβαίωση"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Ακύρωση"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Ενεργοποίηση Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Χρήση Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Χρήση Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Ρυθμίσεις Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Ορισμός &amp; διαχείριση ασύρματων σημείων πρόσβασης"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Κεντράρετε τον κωδικό QR παρακάτω για να συνδεθείτε στο \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Συνδεθείτε στο Wi‑Fi σαρώνοντας έναν κωδικό QR"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Μοιραστείτε το Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Σαρώστε αυτόν τον κωδικό QR για σύνδεση στο δίκτυο \"<xliff:g id="SSID">%1$s</xliff:g>\" και κοινοποιήστε τον κωδικό πρόσβασης"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Σαρώστε αυτόν τον κωδικό QR με μια άλλη συσκευή για να συνδεθείτε στο δίκτυο \"<xliff:g id="SSID">%1$s</xliff:g>\"."</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Σάρωση αυτού του κωδικού QR για σύνδεση στο δίκτυο \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Δοκιμάστε ξανά. Εάν το πρόβλημα παραμένει, επικοινωνήστε με τον κατασκευαστή της συσκευής"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Παρουσιάστηκε κάποιο πρόβλημα"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Κωδικός πρόσβασης Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Κωδικός πρόσβασης σημείου πρόσβασης Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Αυτόματη σύνδεση"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Επιτρέψτε στο τηλέφωνο να συνδέεται αυτόματα όταν βρίσκεται κοντά σε αυτό το δίκτυο."</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Επιτρέψτε στο tablet να συνδέεται αυτόματα όταν βρίσκεται κοντά σε αυτό το δίκτυο."</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Να επιτρέπεται η σύνδεση σε αυτό το δίκτυο όταν βρίσκεται εντός εμβέλειας"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Προσθήκη συσκευής"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Χρησιμοποιήστε έναν κωδικό QR για να προσθέσετε μια συσκευή σε αυτό το δίκτυο"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"Ο κωδικός QR δεν έχει έγκυρη μορφή"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Χρήση πιστοποιητικών συστήματος"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Να μην παρέχεται"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Να μην επικυρώνεται"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Δεν έχει καθοριστεί πιστοποιητικό. Η σύνδεσή σας δεν θα είναι ιδιωτική."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Το όνομα δικτύου είναι υπερβολικά μεγάλο."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Πρέπει να καθορίσετε έναν τομέα."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Απαιτείται πιστοποιητικό."</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Σύνδεση"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Το Wi-Fi ενεργοποιήθηκε"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Σύνδεση σε <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Σύνδεση στο δίκτυο <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Σύνδεση…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Αποτυχία σύνδεσης στο δίκτυο"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Το δίκτυο δεν βρίσκεται εντός εμβέλειας"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Η εφαρμογή μοιράζεται περιεχόμενο. Για να μοιραστείτε τη σύνδεση στο διαδίκτυο, απενεργοποιήστε το σημείο πρόσβασης Wi-Fi και έπειτα ενεργοποιήστε το."</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Δεν έχει οριστεί κωδικός πρόσβασης"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Όνομα σημείου πρόσβασης Wi-Fi"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Ενεργοποίηση σημείου πρόσβασης Wi-Fi <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Ενεργοποίηση <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Είναι δυνατή η σύνδεση άλλων συσκευών στο σημείο πρόσβασης Wi-Fi <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Κωδικός σημείου πρόσβασης Wi-Fi"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Ζώνη σημείου πρόσβασης"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Αυξάνει αυτόματα τον ρυθμό ανανέωσης από τα 60 στα 90 Hz για ορισμένο περιεχόμενο. Αυξάνει τη χρήση της μπαταρίας."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Επιβολή ρυθμού ανανέωσης 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Ο υψηλότερος δυνατός ρυθμός ανανέωσης για βελτιωμένη απόκριση αφής και ποιότητα κινούμενων εικόνων. Αυξάνει τη χρήση της μπαταρίας."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Παρακολούθηση οθόνης"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Ενεργό/Η οθόνη δεν θα απενεργοποιείται εάν την κοιτάτε"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Έκδοση Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Ενημέρωση ασφαλείας Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Μοντέλο"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Μοντέλο: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Μοντέλο και εξοπλισμός"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Έκδοση εξοπλισμού"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Αναγνωριστικό εξοπλισμού"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Έγινε επαναφορά των ρυθμίσεων δικτύου."</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Δεν είναι δυνατή η διαγραφή των SIM"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Δεν είναι δυνατή η διαγραφή των SIM των οποίων έγινε λήψη λόγω ενός σφάλματος.\n\nΕπανεκκινήστε τη συσκευή σας και δοκιμάστε ξανά."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Διαγραφή δεδομένων (επαναφορά)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Διαγρ. δεδομ. (εργ. επαναφ.)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Με αυτόν τον τρόπο, θα διαγραφούν όλα τα δεδομένα από τον εσωτερικό αποθηκευτικό χώρο "<b>"του tablet"</b>", συμπεριλαμβανομένων:\n\n"<li>"του Λογαριασμού σας Google"</li>\n<li>"των δεδομένων και των ρυθμίσεων συστήματος και εφαρμογών"</li>\n<li>"των ληφθέντων εφαρμογών"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Με αυτόν τον τρόπο, θα διαγραφούν όλα τα δεδομένα από τον εσωτερικό αποθηκευτικό χώρο "<b>"του τηλεφώνου σας"</b>", συμπεριλαμβανομένων:\n\n"<li>"του Λογαριασμού σας Google"</li>\n<li>"των δεδομένων και των ρυθμίσεων συστήματος και εφαρμογών"</li>\n<li>"των ληφθέντων εφαρμογών"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Αυτήν τη στιγμή είστε συνδεδεμένοι στους παρακάτω λογαριασμούς:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Υπάρχουν άλλοι χρήστες σε αυτήν τη συσκευή.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Μουσική"</li>\n<li>"Φωτογραφίες"</li>\n<li>"Άλλα δεδομένα χρήστη"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Με αυτήν την ενέργεια, δεν θα ακυρωθεί το πρόγραμμα υπηρεσίας κινητής τηλεφωνίας που χρησιμοποιείτε."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Πρέπει να γίνει διαγραφή του "<b>"αποθηκευτικού χώρου USB"</b>" για να γίνει, επίσης, διαγραφή της μουσικής, των εικόνων και άλλων δεδομένων."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Πρέπει να γίνει διαγραφή της "<b>"κάρτας SD"</b>" για να γίνει, επίσης, διαγραφή της μουσικής, των εικόνων και άλλων δεδομένων."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Διαγραφή όλων των δεδομένων (επαναφορά εργοστασιακών ρυθμίσεων)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Διαγρ. δεδομ. (εργ. επαναφ.)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Με αυτόν τον τρόπο, θα διαγραφούν όλα τα δεδομένα από τον εσωτερικό αποθηκευτικό χώρο "<b>"του tablet"</b>", συμπεριλαμβανομένων:\n\n"<li>"του Λογαριασμού σας Google"</li>\n<li>"των δεδομένων και των ρυθμίσεων συστήματος και εφαρμογών"</li>\n<li>"των ληφθέντων εφαρμογών"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Με αυτόν τον τρόπο, θα διαγραφούν όλα τα δεδομένα από τον εσωτερικό αποθηκευτικό χώρο "<b>"του τηλεφώνου σας"</b>", συμπεριλαμβανομένων:\n\n"<li>"του Λογαριασμού σας Google"</li>\n<li>"των δεδομένων και των ρυθμίσεων συστήματος και εφαρμογών"</li>\n<li>"των ληφθέντων εφαρμογών"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Αυτήν τη στιγμή είστε συνδεδεμένοι στους παρακάτω λογαριασμούς:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Υπάρχουν άλλοι χρήστες σε αυτήν τη συσκευή.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Μουσική"</li>\n<li>"Φωτογραφίες"</li>\n<li>"Άλλα δεδομένα χρήστη"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Με αυτήν την ενέργεια, δεν θα ακυρωθεί το πρόγραμμα υπηρεσιών κινητής τηλεφωνίας που χρησιμοποιείτε."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Πρέπει να γίνει διαγραφή του "<b>"αποθηκευτικού χώρου USB"</b>" για να γίνει, επίσης, διαγραφή της μουσικής, των φωτογραφιών και άλλων δεδομένων χρήστη."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Πρέπει να γίνει διαγραφή της "<b>"κάρτας SD"</b>" για να γίνει, επίσης, διαγραφή της μουσικής, των φωτογραφιών και άλλων δεδομένων χρήστη."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Διαγρ. αποθ. χώρου USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Διαγραφή κάρτας SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Διαγράψτε όλα τα δεδομένα που υπάρχουν στον εσωτερικό αποθηκευτικό χώρο USB του τηλεφώνου σας, όπως αρχεία μουσικής και φωτογραφίες"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Διαγράψτε όλα τα δεδομένα που υπάρχουν στην κάρτα SD, όπως αρχεία μουσικής και φωτογραφίες"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Διαγραφή όλων των δεδομένων"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Διαγραφή όλων των δεδομένων"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Θα διαγραφούν όλα τα προσωπικά στοιχεία και όλες οι ληφθείσες εφαρμογές σας. Δεν μπορείτε να αναιρέσετε αυτή την ενέργεια."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Θα διαγραφούν όλα τα προσωπικά στοιχεία, μεταξύ άλλων οι όλες οι ληφθείσες εφαρμογές σας και οι SIM σας. Δεν μπορείτε να αναιρέσετε αυτή την ενέργεια."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Διαγραφή όλων"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Δεν πραγματοποιήθηκε επαναφορά επειδή η υπηρεσία Εκκαθάρισης συστήματος δεν είναι διαθέσιμη."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Διαγραφή όλων των δεδομένων;"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Η επαναφορά των εργοστασιακών ρυθμίσεων δεν είναι διαθέσιμη γι\' αυτόν το χρήστη"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Διαγραφή"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Περιμένετε…"</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Διαγραφή όλων των δεδομένων"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Διαγραφή όλων των δεδομένων"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Θα διαγραφούν όλα τα προσωπικά στοιχεία και όλες οι ληφθείσες εφαρμογές σας. Δεν μπορείτε να αναιρέσετε αυτή την ενέργεια."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Θα διαγραφούν όλα τα προσωπικά στοιχεία, μεταξύ άλλων οι ληφθείσες εφαρμογές σας και οι SIM. Δεν μπορείτε να αναιρέσετε αυτή την ενέργεια."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Διαγραφή όλων των δεδομένων;"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Η επαναφορά των εργοστασιακών ρυθμίσεων δεν είναι διαθέσιμη γι\' αυτόν το χρήστη."</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Διαγραφή"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Περιμένετε…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Ρυθμίσεις κλήσης"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Ορισμ.αυτόμ.τηλεφ., προώθ.κλήσης, αναμ.κλήσης, αναγν.κλήσ."</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Σύνδεση με USB"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Αδυναμία σύνδεσης σε περισσότερες από <xliff:g id="MAXCONNECTION">%1$d</xliff:g> συσκευές"</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> θα αποσυνδεθεί."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Σύνδεση Ethernet"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Κοινή χρήση της σύνδεσης του τηλεφώνου στο διαδίκτυο μέσω USB Ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Κοινή χρήση της σύνδεσης του τηλεφώνου στο διαδίκτυο μέσω Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Χρησιμοποιήστε το σημείο πρόσβασης Wi-Fi και τη σύνδεση για να παρέχετε σύνδεση στο διαδίκτυο σε άλλες συσκευές, μέσω της σύνδεσης δεδομένων κινητής τηλεφωνίας που χρησιμοποιείτε. Οι εφαρμογές μπορούν επίσης να δημιουργούν ένα σημείο πρόσβασης Wi-Fi, για να μοιράζονται περιεχόμενο με κοντινές συσκευές."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Χρησιμοποιήστε το σημείο πρόσβασης Wi-Fi και τη σύνδεση, για να παρέχετε σύνδεση στο διαδίκτυο σε άλλες συσκευές, μέσω του δικτύου Wi-Fi ή της σύνδεσης δεδομένων κινητής τηλεφωνίας που χρησιμοποιείτε. Οι εφαρμογές μπορούν επίσης να δημιουργούν ένα σημείο πρόσβασης Wi-Fi, για να μοιράζονται περιεχόμενο με κοντινές συσκευές."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Βοήθεια"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Προτιμήσεις υπότιτλων"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Μεγιστοποίηση"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Περιοχή μεγέθυνσης"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Ενεργοποίηση μεγέθυνσης"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Επιλέξτε τις περιοχές μεγέθυνσης που θέλετε να χρησιμοποιήσετε κατά τη μεγέθυνση της οθόνης"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Πλήρης οθόνη"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Μέρος της οθόνης"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Πλήρης οθόνη και μέρος της οθόνης"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Μεγέθυνση ολόκληρης της οθόνης"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Μεγέθυνση μέρους της οθόνης"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Εναλλαγή σε κουμπί προσβασιμότητας;"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Η χρήση τριπλού πατήματος για τη μεγέθυνση ενός μέρους της οθόνης θα προκαλέσει καθυστέρηση της πληκτρολόγησης και άλλων ενεργειών.\n\nΘέλετε να κάνετε εναλλαγή σε χρήση του κουμπιού προσβασιμότητας για μεγέθυνση;"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Εναλλαγή σε κουμπί προσβασιμότητας"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Συνέχιση χρήσης τριπλού πατήματος για μεγέθυνση"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Ρυθμίσεις μεγέθυνσης"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Μεγέθ. με 3πλό πάτημα"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Συντόμ. μεγέθυνσης"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Τερματ. κλήσης με κουμπί λειτουργίας"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Μεγάλος δείκτης ποντικιού"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Κατάργηση κινούμενων εικόνων"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Μονοφωνικός ήχος"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Συνδυασμός καναλιών κατά την αναπαραγωγή ήχου"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Ισορροπία ήχου"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Αριστερά"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Δεξιά"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Μονοφωνικός ήχος"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Συνδυασμός καναλιών κατά την αναπαραγωγή ήχου."</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Ισορροπία ήχου"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Αριστερά"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Δεξιά"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Προεπιλογή"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 δευτερόλεπτα"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 δευτερόλεπτα"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Δόνηση ειδοποίησης"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Δόνηση κλήσης"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Ανάδραση αφής"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Χρήση <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Άνοιγμα <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Χρήση διόρθωσης χρωμάτων"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Εμφάνιση υποτίτλων"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Μόνο για την υποστηριζόμενη εφαρμογή"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Χρήση <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Άνοιγμα <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Χρήση διόρθωσης χρωμάτων"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Εμφάνιση υποτίτλων"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Μόνο για την υποστηριζόμενη εφαρμογή."</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Μέγεθος και στιλ υποτίτλων"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> μέγεθος κειμένου"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Περισσότερες επιλογές"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Δευτερανοπία"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Πρωτανοπία"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Τριτανοπία"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Κλίμακα του γκρι"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Κόκκινο-πράσινο"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Κόκκινο-πράσινο"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Μπλε-κίτρινο"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Περιορισμός στο παρασκήνιο"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Να επιτρέπεται στην εφαρμογή να εκτελείται στο παρασκήνιο"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Δεν επιτρέπεται η εκτέλεση της εφαρμογής στο παρασκήνιο"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Δεν είναι δυνατός ο περιορισμός της χρήσης στο παρασκήνιο"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Δεν είναι δυνατός ο περιορισμός της χρήσης στο παρασκήνιο."</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Να περιοριστεί η δραστηριότητα στο παρασκήνιο;"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Εάν περιορίσετε τη δραστηριότητα στο παρασκήνιο για μια εφαρμογή, μπορεί να μην λειτουργήσει σωστά"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Εφόσον δεν έχει οριστεί βελτιστοποίηση μπαταρίας, δεν είναι δυνατός ο περιορισμός της εφαρμογής.\n\nΓια περιορισμό, ενεργοποιήστε τη βελτιστοποίηση."</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Ορίστε ένα πρόγραμμα"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Επέκταση διάρκειας ζωής της μπαταρίας"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Απενεργοποίηση όταν είναι φορτισμένη"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Η Εξοικονόμηση μπαταρίας απενεργοποιείται όταν η στάθμη της μπαταρίας του τηλεφώνου σας είναι στο <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Η Εξοικονόμηση μπαταρίας απενεργοποιείται όταν η στάθμη της μπαταρίας του tablet σας είναι στο <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Η Εξοικονόμηση μπαταρίας απενεργοποιείται όταν η στάθμη της μπαταρίας της συσκευής σας είναι στο <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Η Εξοικονόμηση μπαταρίας απενεργοποιείται όταν το επίπεδο φόρτισης της μπαταρίας του τηλεφώνου σας είναι πάνω από <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Η Εξοικονόμηση μπαταρίας απενεργοποιείται όταν το επίπεδο φόρτισης της μπαταρίας του tablet σας είναι πάνω από <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Η Εξοικονόμηση μπαταρίας απενεργοποιείται όταν το επίπεδο φόρτισης της μπαταρίας της συσκευής σας είναι πάνω από <xliff:g id="PERCENT">%1$s</xliff:g>."</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Ενεργοποίηση"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Επαναφορά"</string>
     <string name="tts_play" msgid="2945513377250757221">"Αναπαραγωγή"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Προσαρμοστική συνδεσιμότητα"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Επεκτείνει τη διάρκεια ζωής της μπαταρίας και βελτιώνει την απόδοση της συσκευής με αυτόματη διαχείριση των συνδέσεων δικτύου σας."</string>
     <string name="credentials_title" msgid="7535942196886123656">"Αποθηκ. χώρος διαπιστευτηρίων"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Εγκαταστήστε ένα πιστοποιητικό"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Εγκατάσταση πιστοποιητικών από συσκευή αποθήκευσης"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Διαπιστευτήρια χρήστη"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Προβολή και τροποποίηση αποθηκευμένων διαπιστευτηρίων"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Για προχωρημένους"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Τύπος αποθήκευσης"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Με υποστήριξη εξοπλισμού"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Μόνο λογισμικό"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Τα διαπιστευτήρια δεν είναι διαθέσιμα γι\' αυτόν το χρήστη"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Εγκαταστάθηκε για VPN και εφαρμογές"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Εγκαταστάθηκε για Wi-Fi"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Πληρωμή στο τερματικό"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Ρυθμίστε μια εφαρμογή πληρωμής. Στη συνέχεια, ακουμπήστε απλώς το πίσω μέρος του τηλεφώνου σας, σε οποιοδήποτε τερματικό με το σύμβολο ανεπαφικών πληρωμών."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Το κατάλαβα"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Περισσότερα…"</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Περισσότερα…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Ορισμός προεπιλεγμένης εφαρμογής πληρωμών"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Ενημέρωση προεπιλεγμένης εφαρμογής πληρωμών"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Σε ανεπαφικά τερματικά, πληρωμή με την εφαρμογή <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Να χρησιμοποιείται πάντα για κλήσεις"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Επιλέξτε μια κάρτα SIM για δεδομένα"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Επιλέξτε μια SIM για SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Εναλλαγή κάρτας SIM δεδομένων, αυτό μπορεί να διαρκέσει ένα λεπτό…"</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Εναλλαγή κάρτας SIM δεδομένων. Αυτό μπορεί να διαρκέσει έως και ένα λεπτό…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Κλήση με"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Επιλογή κάρτας SIM"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"ρουτίνα, χρονοδιάγραμμα, εξοικονόμηση μπαταρίας, εξοικονόμηση ενέργειας, μπαταρία, αυτόματα, ποσοστό"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, σύνθετες λειτουργίες κλήσης, κλήσεις 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"προσθήκη γλώσσας, προσθέστε μια γλώσσα"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"μέγεθος κειμένου"</string>
     <string name="default_sound" msgid="6604374495015245195">"Προεπιλεγμένος ήχος"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Ένταση ήχου κουδουνίσματος και ειδοποιήσεων στο <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Ένταση ήχου, δόνηση, λειτουργία \"Μην ενοχλείτε\""</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Ήχοι ενεργοποίησης"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Ζωντανοί υπότιτλοι"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Αυτόματοι υπότιτλοι στο μέσο"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Κανένα"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other">Ορίστηκαν <xliff:g id="ON_COUNT">%d</xliff:g> προγράμματα.</item>
-      <item quantity="one">Ορίστηκε 1 πρόγραμμα.</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Κανένα}=1{Ορίστηκε ένα χρονοδιάγραμμα.}other{Ορίστηκαν # χρονοδιαγράμματα.}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Μην ενοχλείτε"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Λήψη ειδοποιήσεων μόνο από σημαντικά άτομα και εφαρμογές"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Περιορισμός διακοπών"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Μόνο προτεραιότητας"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Ενεργή / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Απενεργοποιημένη / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Απενεργοποιημένη"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Ενεργή"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Ερώτηση κάθε φορά"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Μέχρι την απενεργοποίηση"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> ώρες</item>
-      <item quantity="one">1 ώρα</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> λεπτά"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> πργράμματα μπορούν να ενεργοποιηθούν αυτόματα</item>
-      <item quantity="one">Ένα πρόγραμμα μπορεί να ενεργοποιηθεί αυτόματα</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{Μία ώρα}other{# ώρες}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{Ένα λεπτό}other{# λεπτά}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Ανενεργό}=1{Ανενεργό / Ένα χρονοδιάγραμμα μπορεί να ενεργοποιηθεί αυτόματα.}other{Ανενεργό / # χρονοδιαγράμματα μπορούν να ενεργοποιηθούν αυτόματα.}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Τι μπορεί να διακόπτει τη λειτουργία Μην ενοχλείτε"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Άτομα"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Εφαρμογές"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Αυτόματος ορισμός των ειδοποιήσεων χαμηλότερης προτεραιότητας ως διακριτικών"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Προσαρμοστική ταξινόμηση ειδοποιήσεων"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Αυτόματη ταξινόμηση ειδοποιήσεων κατά συνάφεια"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Σχόλια προσαρμοστικών ειδοποιήσεων"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Να υποδεικνύονται προσαρμογές που πραγματοποιούνται σε ειδοποιήσεις και να εμφανίζεται η επιλογή παροχής σχολίων στο σύστημα."</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Προτεινόμενες ενέργειες και απαντήσεις"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Αυτόματη εμφάνιση προτεινόμενων ενεργειών και απαντήσεων"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Εμφάνιση πρόσφατων ειδοποιήσεων και ειδοποιήσεων που έχουν αναβληθεί"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Πρόσβαση \"Μην ενοχλείτε\""</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Ενεργοποίηση λειτουργίας Μην ενοχλείτε"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Δεν ζητήθηκε πρόσβαση στη λειτουργία \"Μην ενοχλείτε\" από εγκατεστημένες εφαρμογές"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Φόρτωση εφαρμογών…"</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Φόρτωση εφαρμογών…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Μετά από αίτημά σας, το Android αποκλείει την εμφάνιση ειδοποιήσεων αυτής της εφαρμογής σε αυτήν τη συσκευή"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Μετά από αίτημά σας, το Android αποκλείει την εμφάνιση ειδοποιήσεων αυτής της κατηγορίας σε αυτήν τη συσκευή"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Μετά από αίτημά σας, το Android αποκλείει την εμφάνιση ειδοποιήσεων αυτής της ομάδας σε αυτήν τη συσκευή"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Όλες οι συζητήσεις"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Συζητήσεις προτεραιότητας"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Καμία"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> συζητήσεις</item>
-      <item quantity="one">1 συζήτηση</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Καμία"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Καμία}=1{Μία συζήτηση}other{# συζητήσεις}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Ποιος μπορεί να διακόπτει"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Κλήσεις"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Κλήσεις"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Για να είστε σίγουροι ότι θα ακούγεται ήχος για τις επιτρεπόμενες κλήσεις, ελέγξτε ότι η συσκευή έχει ρυθμιστεί έτσι ώστε να ακούγεται το κουδούνισμα"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Οι εισερχόμενες κλήσεις έχουν αποκλειστεί για το \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" Μπορείτε να προσαρμόσετε τις ρυθμίσεις για να επιτρέψετε στους φίλους, στην οικογένεια και σε άλλες επαφές να επικοινωνήσουν μαζί σας."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Επαφές με αστέρι"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> ακόμα</item>
-      <item quantity="one">1 ακόμα</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Καμία"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Καμία}=1{{contact_1}}=2{{contact_1} και {contact_2}}=3{{contact_1}, {contact_2} και {contact_3}}other{{contact_1}, {contact_2}, και # ακόμη}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Μηνύματα"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"μηνύματα"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Messages"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Τα εισερχόμενα μηνύματα έχουν αποκλειστεί για το <xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>. Μπορείτε να προσαρμόσετε τις ρυθμίσεις για να επιτρέψετε στους φίλους, στην οικογένεια και σε άλλες επαφές να επικοινωνήσουν μαζί σας."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Θα λαμβάνετε όλα τα μηνύματα"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Θα λαμβάνετε όλες τις κλήσεις"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Καμία"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> επαφές</item>
-      <item quantity="one">1 επαφή</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Καμία}=1{Μία επαφή}other{# επαφές}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Όλοι"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Επαφές"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Επαφές με αστέρι"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Όλες οι ειδοποιήσεις"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Ορισμένες ειδοποιήσεις"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Επιλεγμένα άτομα θα μπορούν ακόμη να επικοινωνήσουν μαζί σας, ακόμη και αν δεν επιτρέπετε τη διακοπή από τις εφαρμογές"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> εφαρμογές μπορούν να διακόπτουν.</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> εφαρμογή μπορεί να διακόπτει.</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> ακόμη"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Καμία εφαρμογή δεν μπορεί να διακόπτει.}=1{Η εφαρμογή {app_1} μπορεί να διακόπτει.}=2{Οι εφαρμογές {app_1} και {app_2} μπορούν να διακόπτουν.}=3{Οι εφαρμογές {app_1}, {app_2} και {app_3} μπορούν να διακόπτουν.}other{Οι εφαρμογές {app_1}, {app_2} και # ακόμη εφαρμογές μπορούν να διακόπτουν.}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Εφαρμογές"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Όλες οι ειδοποιήσεις"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Ορισμένες ειδοποιήσεις"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Ειδοποιήσεις που μπορούν να διακόπτουν"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Να επιτρέπονται όλες οι ειδοποιήσεις"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> ήχοι μπορούν να διακόπτουν.</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> ήχος μπορεί να διακόπτει.</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Τίποτα δεν μπορεί να διακόπτει."</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> ακόμη"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Τίποτα δεν μπορεί να διακόπτει.}=1{Ο ήχος {sound_category_1} μπορεί να διακόπτει.}=2{Οι ήχοι {sound_category_1} και {sound_category_2} μπορούν να διακόπτουν.}=3{Οι ήχοι {sound_category_1}, {sound_category_2} και {sound_category_3} μπορούν να διακόπτουν.}other{Οι ήχοι {sound_category_1}, {sound_category_2} και # ακόμη ήχοι μπορούν να διακόπτουν.}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Τίποτα δεν μπορεί να διακόπτει."</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Κανείς δεν μπορεί να διακόπτει."</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Ορισμένα άτομα μπορούν να διακόπτουν."</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Όλα τα άτομα μπορούν να διακόπτουν."</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"Έλεγχος USB από"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Συνδεδεμένη συσκευή"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Αυτή η συσκευή"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Εναλλαγή…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Εναλλαγή…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Δεν ήταν δυνατή η εναλλαγή"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Φόρτιση αυτής της συσκευής"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Φόρτιση συνδεδεμένης συσκευής"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Προβολή λεπτομερειών"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Εξοικονόμηση δεδομένων"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Απεριόριστα δεδομένα"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Τα δεδομένα παρασκηνίου είναι απενεργοποιημένα"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Τα δεδομένα παρασκηνίου είναι απενεργοποιημένα."</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Ενεργή"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Απενεργοποιημένη"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Χρήση Εξοικονόμησης δεδομένων"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Αν η συσκευή είναι κλειδωμένη, να αποτρέπεται η πληκτρολόγηση απαντήσεων ή άλλου κειμένου στις ειδοποιήσεις"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Προεπιλ. ορθογραφικός έλεγχος"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Επιλογή ορθογραφικού ελέγχου"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Χρήση ορθογραφικού ελέγχου"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Χρήση ορθογραφικού ελέγχου"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Δεν έχει επιλεγεί"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(κανένας)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Η Διαχείριση αποθηκευτικού χώρου βοηθά στην απελευθέρωση αποθηκευτικού χώρου καταργώντας από τη συσκευή σας φωτογραφίες και βίντεο για τα οποία έχουν δημιουργηθεί αντίγραφα ασφαλείας."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Κατάργηση φωτογραφιών και βίντεο"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Διαχείριση αποθηκευτικού χώρου"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Χρήση Διαχείρισης αποθηκευτικού χώρου"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Χρήση Διαχειριστή αποθηκευτικού χώρου."</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Αυτόματο"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Εγχειρίδιο χρήσης"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Απελευθερώστε χώρο τώρα"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Πατήστε δύο φορές για να ελέγξετε το τηλέφωνο"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Πατήστε δύο φορές για να ελέγξετε το tablet"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Πατήστε δύο φορές για να ελέγξετε τη συσκευή"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Σύρετε για ειδοποιήσεις"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Σύρετε προς τα κάτω στο κάτω μέρος της οθόνης για εμφάνιση των ειδοποιήσεών σας."</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Λειτουργία ενός χεριού"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Χρήση λειτουργίας ενός χεριού"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Έξοδος κατά την εναλλαγή εφαρμογών"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Χρονικό όριο"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 δευτερόλεπτα"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 δευτερόλεπτα"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 δευτερόλεπτα"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"εύκολη πρόσβαση"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Για να ελέγξετε την ώρα, τις ειδοποιήσεις και άλλες πληροφορίες, πατήστε δύο φορές στην οθόνη."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Σηκώστε το για να δείτε"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Σηκώστε το tablet για να το ελέγξετε"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Πατήστε για έλεγχο του tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Πατήστε για έλεγχο της συσκευής"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Πατήστε την οθόνη για να ελέγξετε την ώρα, τις ειδοποιήσεις και άλλες πληροφορίες."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Κουμπί πανικού"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Ξεκινήστε τις ενέργειες SOS έκτακτης ανάγκης, πατώντας γρήγορα το κουμπί λειτουργίας 5 φορές."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Ήχος ειδοποίησης"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Ειδοποίηση πριν από την έναρξη δράσεων"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Επαφές έκτακτης ανάγκης"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Σύρετε στον αισθητήρα δακτυλικών αποτυπωμάτων για ειδοποιήσεις"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Ολίσθηση δακτυλ. αποτυπ."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Για να ελέγξετε τις ειδοποιήσεις σας, σύρετε προς τα κάτω στον αισθητήρα δακτυλικών αποτυπωμάτων στο πίσω μέρος του τηλεφώνου."</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Ενεργοποίηση για όλες τις εφαρμογές"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Επιλογή προγράμματος οδήγησης γραφικών"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Προεπιλογή"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Πρόγραμμα οδήγησης παιχνιδιών"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Πρόγραμμα οδήγησης παιχνιδιών"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Developer Driver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Πρόγραμμα οδήγησης γραφικών συστήματος"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Δεν ήταν δυνατή η εύρεση δικτύων. Δοκιμάστε ξανά."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(απαγορευμένο)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Δεν υπάρχει κάρτα SIM"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Δεν υπάρχει SIM"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Δεν υπάρχει"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Απαιτείται SIM για σύνδεση"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Απαιτείται SIM <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> για σύνδεση"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Προτιμώμενη λειτουργία δικτύου: προτιμώμενο WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Προτιμώμενη λειτουργία δικτύου: μόνο GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Προτιμώμενη λειτουργία δικτύου: μόνο WCDMA"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Δεδομένα κινητής τηλεφωνίας"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Πρόσβαση σε δεδομένα μέσω δικτύου κινητής τηλεφωνίας"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Το τηλέφωνο θα κάνει αυτόματα εναλλαγή σε αυτήν την εταιρεία κινητής τηλεφωνίας όταν βρίσκεται εντός εμβέλειας"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Δεν υπάρχει διαθέσιμη κάρτα SIM"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Προτίμηση κλήσεων"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Προτίμηση SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Ερώτηση κάθε φορά"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Να επιτρέπονται οι επικαλ. οθόνης στις Ρυθμίσεις"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Να επιτρέπονται εφαρμογές που μπορούν να εμφανίζονται πάνω από άλλες εφαρμογές για επικάλυψη των οθονών ρυθμίσεων"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Μέσα"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Απόκρ. προγρ. αναπαραγωγής μετά τη λήξη των μέσων"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Το πρόγραμμα αναπαραγωγής σάς επιτρέπει να συνεχίσετε μια περίοδο λειτουργίας από το εκτεταμένο πλαίσιο Γρήγορων ρυθμίσεων."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Πρόγραμμα αναπαραγωγής μέσων στις Γρήγορες ρυθμίσεις"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Εμφάνιση του προγράμματος αναπαραγωγής μέσων για μεγαλύτερο χρονικό διάστημα για εύκολη συνέχιση της αναπαραγωγής."</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Απόκρυψη προγράμματος αναπαραγωγής"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Εμφάνιση προγράμματος αναπαραγωγής"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Δεν υπάρχουν διαθέσιμα προγράμματα αναπαραγωγής"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Επιτρεπόμενες εφαρμογές"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"μέσα"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Το Bluetooth θα ενεργοποιηθεί."</string>
 </resources>
diff --git a/res/values-en-rAU/arrays.xml b/res/values-en-rAU/arrays.xml
index ec8510a..ef08f35 100644
--- a/res/values-en-rAU/arrays.xml
+++ b/res/values-en-rAU/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Medium"</item>
     <item msgid="6740026006576843477">"Long"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Short"</item>
+    <item msgid="7397961711906421599">"Medium"</item>
+    <item msgid="4079132024502041928">"Long"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Default"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA only"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Global"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index fe3ac40..1a522f0 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Show profile info on lock screen"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Accounts"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Location"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Use location"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Use location"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Off"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">On – <xliff:g id="COUNT_1">%1$d</xliff:g> apps have access to location</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Use your face to authenticate"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Start"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"If accessibility face unlock is turned off, some setup steps may not work properly with TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Go back"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Continue setup"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Use accessibility setup"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="one">Must be fewer than <xliff:g id="NUMBER_0">%d</xliff:g> digit</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Device admin doesn\'t allow using a recent PIN"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Common PINs are blocked by your IT admin. Try a different PIN."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"This can\'t include an invalid character"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Must contain at least one letter"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Must contain at least one digit"</string>
@@ -653,7 +655,6 @@
       <item quantity="one">Must contain at least 1 non-numeric character</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Device admin doesn\'t allow using a recent password"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Common passwords are blocked by your IT admin. Try a different password."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Ascending, descending or repeated sequence of digits isn\'t allowed"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Confirm"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Cancel"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Turn on Wi‑Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Use Wi‑Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Use Wi‑Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wi‑Fi settings"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Set up &amp; manage wireless access points"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Centre the QR code below to connect to \'<xliff:g id="SSID">%1$s</xliff:g>\'"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Join Wi‑Fi by scanning a QR code"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Share Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Scan this QR code to connect to \'<xliff:g id="SSID">%1$s</xliff:g>\' and share the password"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Scan this QR code with another device to join \'<xliff:g id="SSID">%1$s</xliff:g>\'"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Scan this QR code to connect to \'<xliff:g id="SSID">%1$s</xliff:g>\'"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Try again. If the issue continues, contact the device manufacturer"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Something went wrong"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi‑Fi password: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Hotspot password: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Auto‑connect"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Allow phone to automatically connect near this network"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Allow tablet to automatically connect near this network"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Allow connection to this network when in range"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Add device"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Use a QR code to add a device to this network"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR code isn\'t a valid format"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Use system certificates"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Do not provide"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Do not validate"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"No certificate specified. Your connection will not be private."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Network name is too long."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Must specify a domain."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Certificate required."</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Connect"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi‑Fi turned on"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Connected to <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Connecting to <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Connecting…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Failed to connect to network"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Network not in range"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"App is sharing content. To share Internet connection, turn hotspot off, then on"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"No password set"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Hotspot name"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Turning on <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Turning on <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Other devices can connect to <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Hotspot password"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP band"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Automatically raises the refresh rate from 60 to 90 Hz for some content. Increases battery usage."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Force 90 Hz refresh rate"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Highest refresh rate for improved touch responsiveness and animation quality. Increases battery usage."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Screen attention"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"On/Screen won’t turn off if you’re looking at it"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android version"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android security update"</string>
     <string name="model_info" msgid="8997566254717810904">"Model"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Model: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Model and hardware"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Hardware version"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Equipment ID"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Network settings have been reset"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Can’t delete SIMs"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Downloaded SIMs can’t be deleted due to an error.\n\nRestart your device and try again."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Delete all data (factory reset)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Delete all data (factory reset)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"This will erase all data from your tablet’s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google Account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"This will erase all data from your phone’s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google Account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"You are currently signed in to the following accounts:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"There are other users present on this device.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Music"</li>\n<li>"Photos"</li>\n<li>"Other user data"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIMs"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"This will not cancel your mobile service plan."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"To clear music, pictures and other user data, the "<b>"USB storage"</b>" needs to be erased."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"To clear music, pictures and other user data, the "<b>"SD card"</b>" needs to be erased."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Erase all data (factory reset)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Erase all data (factory reset)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"This will erase all data from your tablet’s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google Account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"This will erase all data from your phone’s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google Account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"You are currently signed in to the following accounts:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"There are other users present on this device.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Music"</li>\n<li>"Photos"</li>\n<li>"Other user data"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIMs"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"This will not cancel your mobile service plan."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"To clear music, pictures and other user data, the "<b>"USB storage"</b>" needs to be erased."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"To clear music, pictures and other user data, the "<b>"SD card"</b>" needs to be erased."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Erase USB storage"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Erase SD card"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Erase all the data on the internal USB storage, such as music or photos"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Erase all the data on the SD card, such as music or photos"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Erase all data"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Erase all data"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"All of your personal information and downloaded apps will be deleted. You can\'t undo this action."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"All of your personal information, including downloaded apps &amp; SIMs, will be deleted. You can\'t undo this action."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Erase everything"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"No reset was performed because the System Clear service isn\'t available."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Erase all data?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Factory reset is not available for this user"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Erasing"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Please wait..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Erase all data"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Erase all data"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"All of your personal information and downloaded apps will be deleted. You can’t undo this action."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"All of your personal information, including downloaded apps &amp; SIMs, will be deleted. You can’t undo this action."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Erase all data?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Factory reset is not available for this user"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Erasing"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Please wait…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Call settings"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Set up voicemail, call forwarding, call waiting, caller ID"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB tethering"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Can\'t tether to more than <xliff:g id="MAXCONNECTION">%1$d</xliff:g> devices."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be untethered."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ethernet tethering"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Share phone’s Internet connection via USB Ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Share phone’s Internet connection via Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Use hotspot and tethering to provide Internet to other devices through your mobile data connection. Apps can also create a hotspot to share content with nearby devices."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Use hotspot and tethering to provide Internet to other devices through your Wi‑Fi or mobile data connection. Apps can also create a hotspot to share content with nearby devices."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Help"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Caption preferences"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Magnification"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Magnification area"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Magnification enable"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Choose the magnification area(s) that you want to use when magnifying the screen"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Full screen"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Part of screen"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Full screen &amp; part of screen"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Magnify entire screen"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Magnify part of screen"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Switch to accessibility button?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Using triple tap to magnify part of the screen will cause typing and other actions to be delayed.\n\nDo you want to switch to using accessibility button to magnify?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Switch to accessibility button"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Keep triple tap to magnify"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Magnification settings"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Magnify with triple-tap"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Magnify with shortcut"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Power button ends call"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Large mouse cursor"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Remove animations"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Mono audio"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Combine channels when playing audio"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Audio balance"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Left"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Right"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Mono audio"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Combine channels when playing audio"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Audio balance"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Left"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Right"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Default"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 seconds"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 seconds"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Notification vibration"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Ring vibration"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Touch feedback"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Use <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Open <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Use colour correction"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Show captions"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"For supported app only"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Use <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Open <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Use colour correction"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Show captions"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"For supported app only"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Caption size and style"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> text size"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"More options"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomaly"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomaly"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomaly"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Grayscale"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Red-green"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Red-green"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Blue-yellow"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Background restriction"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Allow the app to run in the background"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"App not allowed to run in background"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Background usage can’t be restricted"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Background usage can’t be restricted"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Limit background activity?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"If you limit background activity for an app, it may misbehave"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Since this app is not set to optimise battery, you can’t restrict it.\n\nTo restrict the app, first turn on battery optimisation."</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Set a schedule"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Extend battery life"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Turn off when charged"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Battery Saver turns off when your phone is at <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Battery Saver turns off when your tablet is at <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Battery Saver turns off when your device is at <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Battery Saver turns off when your phone charges to above <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Battery Saver turns off when your tablet charges to above <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Battery Saver turns off when your device charges to above <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Turn on"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Reset"</string>
     <string name="tts_play" msgid="2945513377250757221">"Play"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Adaptive connectivity"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Extends battery life and improves device performance by automatically managing your network connections"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Credential storage"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Install a certificate"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Install certificates from storage"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"User credentials"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"View and modify stored credentials"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Advanced"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Storage type"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardware-backed"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Software only"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Credentials are not available for this user"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Installed for VPN and apps"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Installed for Wi-Fi"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Paying at the terminal"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Set up a payment app. Then just hold the back of your phone up to any terminal with the contactless symbol."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Got it"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"More..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"More…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Set default payment app"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Update default payment app"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"At a contactless terminal, pay with <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Always use this for calls"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Select a SIM for data"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Select a SIM for SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Switching data SIM, this may take up to a minute..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Switching data SIM, this may take up to a minute…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Call with"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Select a SIM card"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"routine, schedule, battery saver, power saver, battery, automatic, per cent"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"VoLTE, advanced calling, 4G calling"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"add language, add a language"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"text size"</string>
     <string name="default_sound" msgid="6604374495015245195">"Default sound"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Ring and notification volume at <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Volume, vibration, Do Not Disturb"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Power on sounds"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Live Caption"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Automatically caption media"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"None"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> schedules set</item>
-      <item quantity="one">1 schedule set</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{None}=1{1 schedule set}other{# schedules set}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Do Not Disturb"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Only get notified by important people and apps"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limit interruptions"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Priority only"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"On/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Off/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Off"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"On"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Ask every time"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Until you turn off"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> hours</item>
-      <item quantity="one">1 hour</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minutes"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> schedules can turn on automatically</item>
-      <item quantity="one">1 schedule can turn on automatically</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 hour}other{# hours}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minute}other{# minutes}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Off}=1{Off/1 schedule can turn on automatically}other{Off/# schedules can turn on automatically}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"What can interrupt Do Not Disturb"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"People"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Apps"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Automatically set lower priority notifications to Gentle"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Adaptive notification ranking"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Automatically rank notifications by relevance"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Adaptive notification feedback"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Indicate adjustments made to notifications and show the option to provide feedback to the system"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Suggested actions and replies"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Automatically show suggested actions and replies"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Show recent and snoozed notifications"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Do Not Disturb access"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Allow Do Not Disturb"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"No installed apps have requested Do Not Disturb access"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Loading apps..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Loading apps…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"At your request, Android is blocking this app\'s notifications from appearing on this device"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"At your request, Android is blocking this category of notifications from appearing on this device"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"At your request, Android is blocking this group of notifications from appearing on this device"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"All conversations"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Priority conversations"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"None"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> conversations</item>
-      <item quantity="one">1 conversation</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"None"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{None}=1{1 conversation}other{# conversations}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Who can interrupt"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Calls"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Calls"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"To make sure that allowed calls make a sound, check that the device is set to ring"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"For ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’, incoming calls are blocked. You can adjust settings to allow your friends, family or other contacts to reach you."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Starred contacts"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> others</item>
-      <item quantity="one">1 other</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"None"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{None}=1{{contact_1}}=2{{contact_1} and {contact_2}}=3{{contact_1}, {contact_2} and {contact_3}}other{{contact_1}, {contact_2} and # others}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Messages"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"messages"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Messages"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"For ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’, incoming messages are blocked. You can adjust settings to allow your friends, family or other contacts to reach you."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"All messages can reach you"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"All calls can reach you"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"None"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> contacts</item>
-      <item quantity="one">1 contact</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{None}=1{1 contact}other{# contacts}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Anyone"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Contacts"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Starred contacts"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"All notifications"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Some notifications"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Selected people can still reach you, even if you don’t allow apps to interrupt"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> can interrupt</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> can interrupt</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> more"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{No apps can interrupt}=1{{app_1} can interrupt}=2{{app_1} and {app_2} can interrupt}=3{{app_1}, {app_2} and {app_3} can interrupt}other{{app_1}, {app_2} and # more can interrupt}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Apps"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"All notifications"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Some notifications"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Notifications that can interrupt"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Allow all notifications"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> can interrupt</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> can interrupt</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Nothing can interrupt"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> more"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Nothing can interrupt}=1{{sound_category_1} can interrupt}=2{{sound_category_1} and {sound_category_2} can interrupt}=3{{sound_category_1}, {sound_category_2} and {sound_category_3} can interrupt}other{{sound_category_1}, {sound_category_2} and # more can interrupt}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Nothing can interrupt"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"No one can interrupt"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Some people can interrupt"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"All people can interrupt"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB controlled by"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Connected device"</string>
     <string name="usb_control_device" msgid="527916783743021577">"This device"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Switching…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Switching…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Couldn\'t switch"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Charging this device"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Charging connected device"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"View details"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Data Saver"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Unrestricted data"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Background data is turned off"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Background data is turned off"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"On"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Off"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Use Data Saver"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"If device is locked, prevent typing replies or other text in notifications"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Default spell checker"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Choose spell checker"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Use spell checker"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Use spellchecker"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Not selected"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(none)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"To help free up storage space, storage manager removes backed up photos and videos from your device."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Remove photos and videos"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Storage manager"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Use Storage Manager"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Use storage manager"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automatic"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Free up space now"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Double-tap to check phone"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Double-tap to check tablet"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Double-tap to check device"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Swipe for notifications"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Swipe down on the bottom edge of the screen to show your notifications"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"One-handed mode"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Use one-handed mode"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Exit when switching apps"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Timeout"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 seconds"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 seconds"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 seconds"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"reachability"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"To check time, notifications and other info, double-tap your screen."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Lift to check phone"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Lift to check tablet"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Tap to check tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Tap to check device"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"To check time, notifications and other info, tap your screen."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Panic button"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Start the emergency SOS actions by pressing the power button quickly five times."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Warning sound"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Alert before starting the actions"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Emergency contacts"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Swipe fingerprint for notifications"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Swipe fingerprint"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"To check your notifications, swipe down on the fingerprint sensor on the back of your phone."</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Enable for all apps"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Select graphics driver"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Default"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Game driver"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Game driver"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Developer driver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"System graphics driver"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Couldn’t find networks. Try again."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(forbidden)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"No SIM card"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"No SIM"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"None"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Requires SIM to connect"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Requires <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> SIM to connect"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Preferred network mode: WCDMA preferred"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Preferred network mode: GSM only"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Preferred network mode: WCDMA only"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobile data"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Access data using mobile network"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Phone will automatically switch to this mobile operator when in range"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"No SIM card available"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Calls preference"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS preference"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Ask every time"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Allow screen overlays on settings"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Allow apps that can display over other apps to overlay settings screens"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Media"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Hide player when the media session has ended"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"The player allows you to resume a session from the expanded Quick Settings panel."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Media Player in Quick Settings"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Show media player for an extended period to easily resume playback"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Hide player"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Show player"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"No players available"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Allowed apps"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"media"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth will turn on"</string>
 </resources>
diff --git a/res/values-en-rCA/arrays.xml b/res/values-en-rCA/arrays.xml
index 47c9e00..ebf9c10 100644
--- a/res/values-en-rCA/arrays.xml
+++ b/res/values-en-rCA/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Medium"</item>
     <item msgid="6740026006576843477">"Long"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Short"</item>
+    <item msgid="7397961711906421599">"Medium"</item>
+    <item msgid="4079132024502041928">"Long"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Default"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA only"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Global"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index aacd254..d802fab 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Show profile info on lock screen"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Accounts"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Location"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Use location"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Use location"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Off"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">On – <xliff:g id="COUNT_1">%1$d</xliff:g> apps have access to location</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Use your face to authenticate"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Start"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"If accessibility face unlock is turned off, some setup steps may not work properly with TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Go back"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Continue setup"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Use accessibility setup"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="one">Must be fewer than <xliff:g id="NUMBER_0">%d</xliff:g> digit</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Device admin doesn\'t allow using a recent PIN"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Common PINs are blocked by your IT admin. Try a different PIN."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"This can\'t include an invalid character"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Must contain at least one letter"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Must contain at least one digit"</string>
@@ -653,7 +655,6 @@
       <item quantity="one">Must contain at least 1 non-numeric character</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Device admin doesn\'t allow using a recent password"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Common passwords are blocked by your IT admin. Try a different password."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Ascending, descending or repeated sequence of digits isn\'t allowed"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Confirm"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Cancel"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Turn on Wi‑Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Use Wi‑Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Use Wi‑Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wi‑Fi settings"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Set up &amp; manage wireless access points"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Centre the QR code below to connect to \'<xliff:g id="SSID">%1$s</xliff:g>\'"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Join Wi‑Fi by scanning a QR code"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Share Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Scan this QR code to connect to \"<xliff:g id="SSID">%1$s</xliff:g>\" and share the password"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Scan this QR code with another device to join \'<xliff:g id="SSID">%1$s</xliff:g>\'"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Scan this QR code to connect to \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Try again. If the issue continues, contact the device manufacturer"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Something went wrong"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi‑Fi password: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Hotspot password: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Auto‑connect"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Allow phone to automatically connect near this network"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Allow tablet to automatically connect near this network"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Allow connection to this network when in range"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Add device"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Use a QR code to add a device to this network"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR code isn\'t a valid format"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Use system certificates"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Do not provide"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Do not validate"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"No certificate specified. Your connection will not be private."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Network name is too long."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Must specify a domain."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Certificate required."</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Connect"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi‑Fi turned on"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Connected to <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Connecting to <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Connecting…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Failed to connect to network"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Network not in range"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"App is sharing content. To share Internet connection, turn hotspot off, then on"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"No password set"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Hotspot name"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Turning on <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Turning on <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Other devices can connect to <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Hotspot password"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP band"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Automatically raises the refresh rate from 60 to 90 Hz for some content. Increases battery usage."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Force 90 Hz refresh rate"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Highest refresh rate for improved touch responsiveness and animation quality. Increases battery usage."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Screen attention"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"On/Screen won’t turn off if you’re looking at it"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android version"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android security update"</string>
     <string name="model_info" msgid="8997566254717810904">"Model"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Model: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Model and hardware"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Hardware version"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Equipment ID"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Network settings have been reset"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Can’t delete SIMs"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Downloaded SIMs can’t be deleted due to an error.\n\nRestart your device and try again."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Erase all data (factory reset)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Erase all data (factory reset)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"This will erase all data from your tablet’s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google Account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"This will erase all data from your phone\'s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google Account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"You are currently signed in to the following accounts:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"There are other users present on this device.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Music"</li>\n<li>"Photos"</li>\n<li>"Other user data"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIMs"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"This will not cancel your mobile service plan."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"To clear music, pictures and other user data, the "<b>"USB storage"</b>" needs to be erased."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"To clear music, pictures and other user data, the "<b>"SD card"</b>" needs to be erased."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Erase all data (factory reset)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Erase all data (factory reset)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"This will erase all data from your tablet’s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google Account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"This will erase all data from your phone’s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google Account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"You are currently signed in to the following accounts:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"There are other users present on this device.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Music"</li>\n<li>"Photos"</li>\n<li>"Other user data"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIMs"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"This will not cancel your mobile service plan."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"To clear music, pictures and other user data, the "<b>"USB storage"</b>" needs to be erased."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"To clear music, pictures and other user data, the "<b>"SD card"</b>" needs to be erased."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Erase USB storage"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Erase SD card"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Erase all the data on the internal USB storage, such as music or photos"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Erase all the data on the SD card, such as music or photos"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Erase all data"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Erase all data"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"All of your personal information and downloaded apps will be deleted. You can\'t undo this action."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"All of your personal information, including downloaded apps and SIMs, will be deleted. You can\'t undo this action."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Erase everything"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"No reset was performed because the System Clear service isn\'t available."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Erase all data?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Factory reset is not available for this user"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Erasing"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Please wait..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Erase all data"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Erase all data"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"All of your personal information and downloaded apps will be deleted. You can’t undo this action."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"All of your personal information, including downloaded apps &amp; SIMs, will be deleted. You can’t undo this action."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Erase all data?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Factory reset is not available for this user"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Erasing"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Please wait…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Call settings"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Set up voicemail, call forwarding, call waiting, caller ID"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB tethering"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Can\'t tether to more than <xliff:g id="MAXCONNECTION">%1$d</xliff:g> devices."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be untethered."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ethernet tethering"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Share phone’s Internet connection via USB Ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Share phone’s Internet connection via Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Use hotspot and tethering to provide Internet to other devices through your mobile data connection. Apps can also create a hotspot to share content with nearby devices."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Use hotspot and tethering to provide Internet to other devices through your Wi‑Fi or mobile data connection. Apps can also create a hotspot to share content with nearby devices."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Help"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Caption preferences"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Magnification"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Magnification area"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Magnification enable"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Choose the magnification area(s) that you want to use when magnifying the screen"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Full screen"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Part of screen"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Full screen &amp; part of screen"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Magnify entire screen"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Magnify part of screen"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Switch to accessibility button?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Using triple tap to magnify part of the screen will cause typing and other actions to be delayed.\n\nDo you want to switch to using accessibility button to magnify?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Switch to accessibility button"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Keep triple tap to magnify"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Magnification settings"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Magnify with triple-tap"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Magnify with shortcut"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Power button ends call"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Large mouse cursor"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Remove animations"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Mono audio"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Combine channels when playing audio"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Audio balance"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Left"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Right"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Mono audio"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Combine channels when playing audio"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Audio balance"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Left"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Right"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Default"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 seconds"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 seconds"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Notification vibration"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Ring vibration"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Touch feedback"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Use <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Open <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Use colour correction"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Show captions"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"For supported app only"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Use <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Open <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Use colour correction"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Show captions"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"For supported app only"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Caption size and style"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> text size"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"More options"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomaly"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomaly"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomaly"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Grayscale"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Red-green"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Red-green"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Blue-yellow"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Background restriction"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Allow the app to run in the background"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"App not allowed to run in background"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Background usage can’t be restricted"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Background usage can’t be restricted"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Limit background activity?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"If you limit background activity for an app, it may misbehave"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Since this app is not set to optimize battery, you can\'t restrict it.\n\nTo restrict the app, first turn on battery optimization."</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Set a schedule"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Extend battery life"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Turn off when charged"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Battery Saver turns off when your phone is at <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Battery Saver turns off when your tablet is at <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Battery Saver turns off when your device is at <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Battery Saver turns off when your phone charges to above <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Battery Saver turns off when your tablet charges to above <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Battery Saver turns off when your device charges to above <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Turn on"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Reset"</string>
     <string name="tts_play" msgid="2945513377250757221">"Play"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Adaptive connectivity"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Extends battery life and improves device performance by automatically managing your network connections"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Credential storage"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Install a certificate"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Install certificates from storage"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"User credentials"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"View and modify stored credentials"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Advanced"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Storage type"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardware-backed"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Software only"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Credentials are not available for this user"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Installed for VPN and apps"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Installed for Wi-Fi"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Paying at the terminal"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Set up a payment app. Then just hold the back of your phone up to any terminal with the contactless symbol."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Got it"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"More..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"More…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Set default payment app"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Update default payment app"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"At a contactless terminal, pay with <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Always use this for calls"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Select a SIM for data"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Select a SIM for SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Switching data SIM, this may take up to a minute..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Switching data SIM, this may take up to a minute…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Call with"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Select a SIM card"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"routine, schedule, battery saver, power saver, battery, automatic, per cent"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"VoLTE, advanced calling, 4G calling"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"add language, add a language"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"text size"</string>
     <string name="default_sound" msgid="6604374495015245195">"Default sound"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Ring and notification volume at <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Volume, vibration, Do Not Disturb"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Power on sounds"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Live Caption"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Automatically caption media"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"None"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> schedules set</item>
-      <item quantity="one">1 schedule set</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{None}=1{1 schedule set}other{# schedules set}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Do Not Disturb"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Only get notified by important people and apps"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limit interruptions"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Priority only"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"On/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Off/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Off"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"On"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Ask every time"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Until you turn off"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> hours</item>
-      <item quantity="one">1 hour</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minutes"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> schedules can turn on automatically</item>
-      <item quantity="one">1 schedule can turn on automatically</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 hour}other{# hours}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minute}other{# minutes}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Off}=1{Off/1 schedule can turn on automatically}other{Off/# schedules can turn on automatically}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"What can interrupt Do Not Disturb"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"People"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Apps"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Automatically set lower priority notifications to Gentle"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Adaptive notification ranking"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Automatically rank notifications by relevance"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Adaptive notification feedback"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Indicate adjustments made to notifications and show the option to provide feedback to the system"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Suggested actions and replies"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Automatically show suggested actions and replies"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Show recent and snoozed notifications"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Do Not Disturb access"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Allow Do Not Disturb"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"No installed apps have requested Do Not Disturb access"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Loading apps..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Loading apps…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"At your request, Android is blocking this app\'s notifications from appearing on this device"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"At your request, Android is blocking this category of notifications from appearing on this device"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"At your request, Android is blocking this group of notifications from appearing on this device"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"All conversations"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Priority conversations"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"None"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> conversations</item>
-      <item quantity="one">1 conversation</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"None"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{None}=1{1 conversation}other{# conversations}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Who can interrupt"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Calls"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Calls"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"To make sure that allowed calls make a sound, check that the device is set to ring"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"For ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’, incoming calls are blocked. You can adjust settings to allow your friends, family or other contacts to reach you."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Starred contacts"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> others</item>
-      <item quantity="one">1 other</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"None"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{None}=1{{contact_1}}=2{{contact_1} and {contact_2}}=3{{contact_1}, {contact_2} and {contact_3}}other{{contact_1}, {contact_2} and # others}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Messages"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"messages"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Messages"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"For ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’, incoming messages are blocked. You can adjust settings to allow your friends, family or other contacts to reach you."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"All messages can reach you"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"All calls can reach you"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"None"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> contacts</item>
-      <item quantity="one">1 contact</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{None}=1{1 contact}other{# contacts}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Anyone"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Contacts"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Starred contacts"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"All notifications"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Some notifications"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Selected people can still reach you, even if you don’t allow apps to interrupt"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> can interrupt</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> can interrupt</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> more"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{No apps can interrupt}=1{{app_1} can interrupt}=2{{app_1} and {app_2} can interrupt}=3{{app_1}, {app_2} and {app_3} can interrupt}other{{app_1}, {app_2} and # more can interrupt}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Apps"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"All notifications"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Some notifications"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Notifications that can interrupt"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Allow all notifications"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> can interrupt</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> can interrupt</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Nothing can interrupt"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> more"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Nothing can interrupt}=1{{sound_category_1} can interrupt}=2{{sound_category_1} and {sound_category_2} can interrupt}=3{{sound_category_1}, {sound_category_2} and {sound_category_3} can interrupt}other{{sound_category_1}, {sound_category_2} and # more can interrupt}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Nothing can interrupt"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"No one can interrupt"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Some people can interrupt"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"All people can interrupt"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB controlled by"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Connected device"</string>
     <string name="usb_control_device" msgid="527916783743021577">"This device"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Switching…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Switching…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Couldn\'t switch"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Charging this device"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Charging connected device"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"View details"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Data Saver"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Unrestricted data"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Background data is turned off"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Background data is turned off"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"On"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Off"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Use Data Saver"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"If device is locked, prevent typing replies or other text in notifications"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Default spell checker"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Choose spell checker"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Use spell checker"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Use spellchecker"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Not selected"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(none)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"To help free up storage space, storage manager removes backed up photos and videos from your device."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Remove photos and videos"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Storage manager"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Use Storage Manager"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Use storage manager"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automatic"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Free up space now"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Double-tap to check phone"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Double-tap to check tablet"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Double-tap to check device"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Swipe for notifications"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Swipe down on the bottom edge of the screen to show your notifications"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"One-handed mode"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Use one-handed mode"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Exit when switching apps"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Timeout"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 seconds"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 seconds"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 seconds"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"reachability"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"To check time, notifications and other info, double-tap your screen."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Lift to check phone"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Lift to check tablet"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Tap to check tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Tap to check device"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"To check time, notifications and other info, tap your screen."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Panic button"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Start the emergency SOS actions by pressing the power button quickly five times."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Warning sound"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Alert before starting the actions"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Emergency contacts"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Swipe fingerprint for notifications"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Swipe fingerprint"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"To check your notifications, swipe down on the fingerprint sensor on the back of your phone."</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Enable for all apps"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Select graphics driver"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Default"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Game driver"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Game driver"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Developer driver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"System graphics driver"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Couldn’t find networks. Try again."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(forbidden)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"No SIM card"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"No SIM"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"None"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Requires SIM to connect"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Requires <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> SIM to connect"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Preferred network mode: WCDMA preferred"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Preferred network mode: GSM only"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Preferred network mode: WCDMA only"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobile data"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Access data using mobile network"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Phone will automatically switch to this mobile operator when in range"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"No SIM card available"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Calls preference"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS preference"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Ask every time"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Allow screen overlays on settings"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Allow apps that can display over other apps to overlay settings screens"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Media"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Hide player when the media session has ended"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"The player allows you to resume a session from the expanded Quick Settings panel."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Media Player in Quick Settings"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Show media player for an extended period to easily resume playback"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Hide player"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Show player"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"No players available"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Allowed apps"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"media"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth will turn on"</string>
 </resources>
diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml
index ec8510a..ef08f35 100644
--- a/res/values-en-rGB/arrays.xml
+++ b/res/values-en-rGB/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Medium"</item>
     <item msgid="6740026006576843477">"Long"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Short"</item>
+    <item msgid="7397961711906421599">"Medium"</item>
+    <item msgid="4079132024502041928">"Long"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Default"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA only"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Global"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 114e129..2e29cb1 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Show profile info on lock screen"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Accounts"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Location"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Use location"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Use location"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Off"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">On – <xliff:g id="COUNT_1">%1$d</xliff:g> apps have access to location</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Use your face to authenticate"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Start"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"If accessibility face unlock is turned off, some setup steps may not work properly with TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Go back"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Continue setup"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Use accessibility setup"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="one">Must be fewer than <xliff:g id="NUMBER_0">%d</xliff:g> digit</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Device admin doesn\'t allow using a recent PIN"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Common PINs are blocked by your IT admin. Try a different PIN."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"This can\'t include an invalid character"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Must contain at least one letter"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Must contain at least one digit"</string>
@@ -653,7 +655,6 @@
       <item quantity="one">Must contain at least 1 non-numeric character</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Device admin doesn\'t allow using a recent password"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Common passwords are blocked by your IT admin. Try a different password."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Ascending, descending or repeated sequence of digits isn\'t allowed"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Confirm"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Cancel"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Turn on Wi‑Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Use Wi‑Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Use Wi‑Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wi‑Fi settings"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Set up &amp; manage wireless access points"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Centre the QR code below to connect to \'<xliff:g id="SSID">%1$s</xliff:g>\'"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Join Wi‑Fi by scanning a QR code"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Share Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Scan this QR code to connect to \'<xliff:g id="SSID">%1$s</xliff:g>\' and share the password"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Scan this QR code with another device to join \'<xliff:g id="SSID">%1$s</xliff:g>\'"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Scan this QR code to connect to \'<xliff:g id="SSID">%1$s</xliff:g>\'"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Try again. If the issue continues, contact the device manufacturer"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Something went wrong"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi‑Fi password: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Hotspot password: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Auto‑connect"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Allow phone to automatically connect near this network"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Allow tablet to automatically connect near this network"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Allow connection to this network when in range"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Add device"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Use a QR code to add a device to this network"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR code isn\'t a valid format"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Use system certificates"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Do not provide"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Do not validate"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"No certificate specified. Your connection will not be private."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Network name is too long."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Must specify a domain."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Certificate required."</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Connect"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi‑Fi turned on"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Connected to <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Connecting to <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Connecting…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Failed to connect to network"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Network not in range"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"App is sharing content. To share Internet connection, turn hotspot off, then on"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"No password set"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Hotspot name"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Turning on <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Turning on <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Other devices can connect to <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Hotspot password"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP band"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Automatically raises the refresh rate from 60 to 90 Hz for some content. Increases battery usage."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Force 90 Hz refresh rate"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Highest refresh rate for improved touch responsiveness and animation quality. Increases battery usage."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Screen attention"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"On/Screen won’t turn off if you’re looking at it"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android version"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android security update"</string>
     <string name="model_info" msgid="8997566254717810904">"Model"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Model: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Model and hardware"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Hardware version"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Equipment ID"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Network settings have been reset"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Can’t delete SIMs"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Downloaded SIMs can’t be deleted due to an error.\n\nRestart your device and try again."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Delete all data (factory reset)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Delete all data (factory reset)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"This will erase all data from your tablet’s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google Account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"This will erase all data from your phone’s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google Account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"You are currently signed in to the following accounts:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"There are other users present on this device.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Music"</li>\n<li>"Photos"</li>\n<li>"Other user data"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIMs"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"This will not cancel your mobile service plan."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"To clear music, pictures and other user data, the "<b>"USB storage"</b>" needs to be erased."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"To clear music, pictures and other user data, the "<b>"SD card"</b>" needs to be erased."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Erase all data (factory reset)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Erase all data (factory reset)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"This will erase all data from your tablet’s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google Account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"This will erase all data from your phone’s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google Account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"You are currently signed in to the following accounts:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"There are other users present on this device.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Music"</li>\n<li>"Photos"</li>\n<li>"Other user data"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIMs"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"This will not cancel your mobile service plan."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"To clear music, pictures and other user data, the "<b>"USB storage"</b>" needs to be erased."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"To clear music, pictures and other user data, the "<b>"SD card"</b>" needs to be erased."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Erase USB storage"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Erase SD card"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Erase all the data on the internal USB storage, such as music or photos"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Erase all the data on the SD card, such as music or photos"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Erase all data"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Erase all data"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"All of your personal information and downloaded apps will be deleted. You can’t undo this action."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"All of your personal information, including downloaded apps &amp; SIMs, will be deleted. You can’t undo this action."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Erase everything"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"No reset was performed because the System Clear service isn\'t available."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Erase all data?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Factory reset is not available for this user"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Erasing"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Please wait..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Erase all data"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Erase all data"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"All of your personal information and downloaded apps will be deleted. You can’t undo this action."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"All of your personal information, including downloaded apps &amp; SIMs, will be deleted. You can’t undo this action."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Erase all data?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Factory reset is not available for this user"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Erasing"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Please wait…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Call settings"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Set up voicemail, call forwarding, call waiting, caller ID"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB tethering"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Can\'t tether to more than <xliff:g id="MAXCONNECTION">%1$d</xliff:g> devices."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be untethered."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ethernet tethering"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Share phone’s Internet connection via USB Ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Share phone’s Internet connection via Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Use hotspot and tethering to provide Internet to other devices through your mobile data connection. Apps can also create a hotspot to share content with nearby devices."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Use hotspot and tethering to provide Internet to other devices through your Wi‑Fi or mobile data connection. Apps can also create a hotspot to share content with nearby devices."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Help"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Caption preferences"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Magnification"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Magnification area"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Magnification enable"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Choose the magnification area(s) that you want to use when magnifying the screen"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Full screen"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Part of screen"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Full screen &amp; part of screen"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Magnify entire screen"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Magnify part of screen"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Switch to accessibility button?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Using triple tap to magnify part of the screen will cause typing and other actions to be delayed.\n\nDo you want to switch to using accessibility button to magnify?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Switch to accessibility button"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Keep triple tap to magnify"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Magnification settings"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Magnify with triple-tap"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Magnify with shortcut"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Power button ends call"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Large mouse cursor"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Remove animations"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Mono audio"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Combine channels when playing audio"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Audio balance"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Left"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Right"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Mono audio"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Combine channels when playing audio"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Audio balance"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Left"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Right"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Default"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 seconds"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 seconds"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Notification vibration"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Ring vibration"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Touch feedback"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Use <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Open <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Use colour correction"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Show captions"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"For supported app only"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Use <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Open <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Use colour correction"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Show captions"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"For supported app only"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Caption size and style"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> text size"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"More options"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomaly"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomaly"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomaly"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Grayscale"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Red-green"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Red-green"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Blue-yellow"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Background restriction"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Allow the app to run in the background"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"App not allowed to run in background"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Background usage can’t be restricted"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Background usage can’t be restricted"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Limit background activity?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"If you limit background activity for an app, it may misbehave"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Since this app is not set to optimise battery, you can’t restrict it.\n\nTo restrict the app, first turn on battery optimisation."</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Set a schedule"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Extend battery life"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Turn off when charged"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Battery Saver turns off when your phone is at <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Battery Saver turns off when your tablet is at <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Battery Saver turns off when your device is at <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Battery Saver turns off when your phone charges to above <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Battery Saver turns off when your tablet charges to above <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Battery Saver turns off when your device charges to above <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Turn on"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Reset"</string>
     <string name="tts_play" msgid="2945513377250757221">"Play"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Adaptive connectivity"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Extends battery life and improves device performance by automatically managing your network connections"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Credential storage"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Install a certificate"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Install certificates from storage"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"User credentials"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"View and modify stored credentials"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Advanced"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Storage type"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardware-backed"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Software only"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Credentials are not available for this user"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Installed for VPN and apps"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Installed for Wi-Fi"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Paying at the terminal"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Set up a payment app. Then just hold the back of your phone up to any terminal with the contactless symbol."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Got it"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"More..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"More…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Set default payment app"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Update default payment app"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"At a contactless terminal, pay with <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Always use this for calls"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Select a SIM for data"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Select a SIM for SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Switching data SIM, this may take up to a minute..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Switching data SIM, this may take up to a minute…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Call with"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Select a SIM card"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"routine, schedule, battery saver, power saver, battery, automatic, per cent"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"VoLTE, advanced calling, 4G calling"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"add language, add a language"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"text size"</string>
     <string name="default_sound" msgid="6604374495015245195">"Default sound"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Ring and notification volume at <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Volume, vibration, Do Not Disturb"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Power on sounds"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Live Caption"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Automatically caption media"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"None"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> schedules set</item>
-      <item quantity="one">1 schedule set</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{None}=1{1 schedule set}other{# schedules set}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Do Not Disturb"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Only get notified by important people and apps"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limit interruptions"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Priority only"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"On/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Off/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Off"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"On"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Ask every time"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Until you turn off"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> hours</item>
-      <item quantity="one">1 hour</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minutes"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> schedules can turn on automatically</item>
-      <item quantity="one">1 schedule can turn on automatically</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 hour}other{# hours}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minute}other{# minutes}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Off}=1{Off/1 schedule can turn on automatically}other{Off/# schedules can turn on automatically}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"What can interrupt Do Not Disturb"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"People"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Apps"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Automatically set lower priority notifications to Gentle"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Adaptive notification ranking"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Automatically rank notifications by relevance"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Adaptive notification feedback"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Indicate adjustments made to notifications and show the option to provide feedback to the system"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Suggested actions and replies"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Automatically show suggested actions and replies"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Show recent and snoozed notifications"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Do Not Disturb access"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Allow Do Not Disturb"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"No installed apps have requested Do Not Disturb access"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Loading apps..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Loading apps…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"At your request, Android is blocking this app\'s notifications from appearing on this device"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"At your request, Android is blocking this category of notifications from appearing on this device"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"At your request, Android is blocking this group of notifications from appearing on this device"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"All conversations"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Priority conversations"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"None"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> conversations</item>
-      <item quantity="one">1 conversation</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"None"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{None}=1{1 conversation}other{# conversations}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Who can interrupt"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Calls"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Calls"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"To make sure that allowed calls make a sound, check that the device is set to ring"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"For ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’, incoming calls are blocked. You can adjust settings to allow your friends, family or other contacts to reach you."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Starred contacts"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> others</item>
-      <item quantity="one">1 other</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"None"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{None}=1{{contact_1}}=2{{contact_1} and {contact_2}}=3{{contact_1}, {contact_2} and {contact_3}}other{{contact_1}, {contact_2} and # others}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Messages"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"messages"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Messages"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"For ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’, incoming messages are blocked. You can adjust settings to allow your friends, family or other contacts to reach you."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"All messages can reach you"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"All calls can reach you"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"None"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> contacts</item>
-      <item quantity="one">1 contact</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{None}=1{1 contact}other{# contacts}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Anyone"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Contacts"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Starred contacts"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"All notifications"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Some notifications"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Selected people can still reach you, even if you don’t allow apps to interrupt"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> can interrupt</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> can interrupt</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> more"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{No apps can interrupt}=1{{app_1} can interrupt}=2{{app_1} and {app_2} can interrupt}=3{{app_1}, {app_2} and {app_3} can interrupt}other{{app_1}, {app_2} and # more can interrupt}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Apps"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"All notifications"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Some notifications"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Notifications that can interrupt"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Allow all notifications"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> can interrupt</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> can interrupt</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Nothing can interrupt"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> more"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Nothing can interrupt}=1{{sound_category_1} can interrupt}=2{{sound_category_1} and {sound_category_2} can interrupt}=3{{sound_category_1}, {sound_category_2} and {sound_category_3} can interrupt}other{{sound_category_1}, {sound_category_2} and # more can interrupt}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Nothing can interrupt"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"No one can interrupt"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Some people can interrupt"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"All people can interrupt"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB controlled by"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Connected device"</string>
     <string name="usb_control_device" msgid="527916783743021577">"This device"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Switching…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Switching…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Couldn\'t switch"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Charging this device"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Charging connected device"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"View details"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Data Saver"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Unrestricted data"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Background data is turned off"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Background data is turned off"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"On"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Off"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Use Data Saver"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"If device is locked, prevent typing replies or other text in notifications"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Default spell checker"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Choose spell checker"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Use spell checker"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Use spellchecker"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Not selected"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(none)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"To help free up storage space, storage manager removes backed up photos and videos from your device."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Remove photos &amp; videos"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Storage manager"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Use Storage Manager"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Use storage manager"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automatic"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Free up space now"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Double-tap to check phone"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Double-tap to check tablet"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Double-tap to check device"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Swipe for notifications"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Swipe down on the bottom edge of the screen to show your notifications"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"One-handed mode"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Use one-handed mode"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Exit when switching apps"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Timeout"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 seconds"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 seconds"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 seconds"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"reachability"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"To check time, notifications and other info, double-tap your screen."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Lift to check phone"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Lift to check tablet"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Tap to check tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Tap to check device"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"To check time, notifications and other info, tap your screen."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Panic button"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Start the emergency SOS actions by pressing the power button quickly five times."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Warning sound"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Alert before starting the actions"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Emergency contacts"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Swipe fingerprint for notifications"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Swipe fingerprint"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"To check your notifications, swipe down on the fingerprint sensor on the back of your phone."</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Enable for all apps"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Select graphics driver"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Default"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Game driver"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Game driver"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Developer driver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"System graphics driver"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Couldn’t find networks. Try again."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(forbidden)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"No SIM card"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"No SIM"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"None"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Requires SIM to connect"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Requires <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> SIM to connect"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Preferred network mode: WCDMA preferred"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Preferred network mode: GSM only"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Preferred network mode: WCDMA only"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobile data"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Access data using mobile network"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Phone will automatically switch to this mobile operator when in range"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"No SIM card available"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Calls preference"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS preference"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Ask every time"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Allow screen overlays on settings"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Allow apps that can display over other apps to overlay settings screens"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Media"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Hide player when the media session has ended"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"The player allows you to resume a session from the expanded Quick Settings panel."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Media Player in Quick Settings"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Show media player for an extended period to easily resume playback"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Hide player"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Show player"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"No players available"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Allowed apps"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"media"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth will turn on"</string>
 </resources>
diff --git a/res/values-en-rIN/arrays.xml b/res/values-en-rIN/arrays.xml
index ec8510a..ef08f35 100644
--- a/res/values-en-rIN/arrays.xml
+++ b/res/values-en-rIN/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Medium"</item>
     <item msgid="6740026006576843477">"Long"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Short"</item>
+    <item msgid="7397961711906421599">"Medium"</item>
+    <item msgid="4079132024502041928">"Long"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Default"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA only"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Global"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index c9c98f4..ae6101b 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Show profile info on lock screen"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Accounts"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Location"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Use location"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Use location"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Off"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">On – <xliff:g id="COUNT_1">%1$d</xliff:g> apps have access to location</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Use your face to authenticate"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Start"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"If accessibility face unlock is turned off, some setup steps may not work properly with TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Go back"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Continue setup"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Use accessibility setup"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="one">Must be fewer than <xliff:g id="NUMBER_0">%d</xliff:g> digit</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Device admin doesn\'t allow using a recent PIN"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Common PINs are blocked by your IT admin. Try a different PIN."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"This can\'t include an invalid character"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Must contain at least one letter"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Must contain at least one digit"</string>
@@ -653,7 +655,6 @@
       <item quantity="one">Must contain at least 1 non-numeric character</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Device admin doesn\'t allow using a recent password"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Common passwords are blocked by your IT admin. Try a different password."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Ascending, descending or repeated sequence of digits isn\'t allowed"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Confirm"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Cancel"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Turn on Wi‑Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Use Wi‑Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Use Wi‑Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wi‑Fi settings"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Set up &amp; manage wireless access points"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Centre the QR code below to connect to \'<xliff:g id="SSID">%1$s</xliff:g>\'"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Join Wi‑Fi by scanning a QR code"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Share Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Scan this QR code to connect to \'<xliff:g id="SSID">%1$s</xliff:g>\' and share the password"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Scan this QR code with another device to join \'<xliff:g id="SSID">%1$s</xliff:g>\'"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Scan this QR code to connect to \'<xliff:g id="SSID">%1$s</xliff:g>\'"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Try again. If the issue continues, contact the device manufacturer"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Something went wrong"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi‑Fi password: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Hotspot password: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Auto‑connect"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Allow phone to automatically connect near this network"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Allow tablet to automatically connect near this network"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Allow connection to this network when in range"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Add device"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Use a QR code to add a device to this network"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR code isn\'t a valid format"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Use system certificates"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Do not provide"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Do not validate"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"No certificate specified. Your connection will not be private."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Network name is too long."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Must specify a domain."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Certificate required."</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Connect"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi‑Fi turned on"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Connected to <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Connecting to <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Connecting…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Failed to connect to network"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Network not in range"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"App is sharing content. To share Internet connection, turn hotspot off, then on"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"No password set"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Hotspot name"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Turning on <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Turning on <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Other devices can connect to <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Hotspot password"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP band"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Automatically raises the refresh rate from 60 to 90 Hz for some content. Increases battery usage."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Force 90 Hz refresh rate"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Highest refresh rate for improved touch responsiveness and animation quality. Increases battery usage."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Screen attention"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"On/Screen won’t turn off if you’re looking at it"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android version"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android security update"</string>
     <string name="model_info" msgid="8997566254717810904">"Model"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Model: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Model and hardware"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Hardware version"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Equipment ID"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Network settings have been reset"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Can’t delete SIMs"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Downloaded SIMs can’t be deleted due to an error.\n\nRestart your device and try again."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Delete all data (factory reset)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Delete all data (factory reset)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"This will erase all data from your tablet’s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google Account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"This will erase all data from your phone’s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google Account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"You are currently signed in to the following accounts:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"There are other users present on this device.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Music"</li>\n<li>"Photos"</li>\n<li>"Other user data"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIMs"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"This will not cancel your mobile service plan."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"To clear music, pictures and other user data, the "<b>"USB storage"</b>" needs to be erased."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"To clear music, pictures and other user data, the "<b>"SD card"</b>" needs to be erased."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Erase all data (factory reset)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Erase all data (factory reset)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"This will erase all data from your tablet’s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google Account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"This will erase all data from your phone’s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google Account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"You are currently signed in to the following accounts:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"There are other users present on this device.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Music"</li>\n<li>"Photos"</li>\n<li>"Other user data"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIMs"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"This will not cancel your mobile service plan."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"To clear music, pictures and other user data, the "<b>"USB storage"</b>" needs to be erased."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"To clear music, pictures and other user data, the "<b>"SD card"</b>" needs to be erased."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Erase USB storage"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Erase SD card"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Erase all the data on the internal USB storage, such as music or photos"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Erase all the data on the SD card, such as music or photos"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Erase all data"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Erase all data"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"All of your personal information and downloaded apps will be deleted. You can’t undo this action."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"All of your personal information, including downloaded apps &amp; SIMs, will be deleted. You can’t undo this action."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Erase everything"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"No reset was performed because the System Clear service isn\'t available."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Erase all data?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Factory reset is not available for this user"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Erasing"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Please wait..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Erase all data"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Erase all data"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"All of your personal information and downloaded apps will be deleted. You can’t undo this action."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"All of your personal information, including downloaded apps &amp; SIMs, will be deleted. You can’t undo this action."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Erase all data?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Factory reset is not available for this user"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Erasing"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Please wait…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Call settings"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Set up voicemail, call forwarding, call waiting, caller ID"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB tethering"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Can\'t tether to more than <xliff:g id="MAXCONNECTION">%1$d</xliff:g> devices."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be untethered."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ethernet tethering"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Share phone’s Internet connection via USB Ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Share phone’s Internet connection via Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Use hotspot and tethering to provide Internet to other devices through your mobile data connection. Apps can also create a hotspot to share content with nearby devices."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Use hotspot and tethering to provide Internet to other devices through your Wi‑Fi or mobile data connection. Apps can also create a hotspot to share content with nearby devices."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Help"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Caption preferences"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Magnification"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Magnification area"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Magnification enable"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Choose the magnification area(s) that you want to use when magnifying the screen"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Full screen"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Part of screen"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Full screen &amp; part of screen"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Magnify entire screen"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Magnify part of screen"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Switch to accessibility button?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Using triple tap to magnify part of the screen will cause typing and other actions to be delayed.\n\nDo you want to switch to using accessibility button to magnify?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Switch to accessibility button"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Keep triple tap to magnify"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Magnification settings"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Magnify with triple-tap"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Magnify with shortcut"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Power button ends call"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Large mouse cursor"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Remove animations"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Mono audio"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Combine channels when playing audio"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Audio balance"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Left"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Right"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Mono audio"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Combine channels when playing audio"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Audio balance"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Left"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Right"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Default"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 seconds"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 seconds"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Notification vibration"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Ring vibration"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Touch feedback"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Use <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Open <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Use colour correction"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Show captions"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"For supported app only"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Use <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Open <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Use colour correction"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Show captions"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"For supported app only"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Caption size and style"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> text size"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"More options"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomaly"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomaly"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomaly"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Grayscale"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Red-green"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Red-green"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Blue-yellow"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Background restriction"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Allow the app to run in the background"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"App not allowed to run in background"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Background usage can’t be restricted"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Background usage can’t be restricted"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Limit background activity?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"If you limit background activity for an app, it may misbehave"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Since this app is not set to optimise battery, you can’t restrict it.\n\nTo restrict the app, first turn on battery optimisation."</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Set a schedule"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Extend battery life"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Turn off when charged"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Battery Saver turns off when your phone is at <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Battery Saver turns off when your tablet is at <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Battery Saver turns off when your device is at <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Battery Saver turns off when your phone charges to above <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Battery Saver turns off when your tablet charges to above <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Battery Saver turns off when your device charges to above <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Turn on"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Reset"</string>
     <string name="tts_play" msgid="2945513377250757221">"Play"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Adaptive connectivity"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Extends battery life and improves device performance by automatically managing your network connections"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Credential storage"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Install a certificate"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Install certificates from storage"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"User credentials"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"View and modify stored credentials"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Advanced"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Storage type"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardware-backed"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Software only"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Credentials are not available for this user"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Installed for VPN and apps"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Installed for Wi-Fi"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Paying at the terminal"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Set up a payment app. Then just hold the back of your phone up to any terminal with the contactless symbol."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Got it"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"More..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"More…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Set default payment app"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Update default payment app"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"At a contactless terminal, pay with <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Always use this for calls"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Select a SIM for data"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Select a SIM for SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Switching data SIM, this may take up to a minute..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Switching data SIM, this may take up to a minute…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Call with"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Select a SIM card"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"routine, schedule, battery saver, power saver, battery, automatic, per cent"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"VoLTE, advanced calling, 4G calling"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"add language, add a language"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"text size"</string>
     <string name="default_sound" msgid="6604374495015245195">"Default sound"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Ring and notification volume at <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Volume, vibration, Do Not Disturb"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Power on sounds"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Live Caption"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Automatically caption media"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"None"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> schedules set</item>
-      <item quantity="one">1 schedule set</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{None}=1{1 schedule set}other{# schedules set}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Do Not Disturb"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Only get notified by important people and apps"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limit interruptions"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Priority only"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"On/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Off/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Off"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"On"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Ask every time"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Until you turn off"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> hours</item>
-      <item quantity="one">1 hour</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minutes"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> schedules can turn on automatically</item>
-      <item quantity="one">1 schedule can turn on automatically</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 hour}other{# hours}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minute}other{# minutes}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Off}=1{Off/1 schedule can turn on automatically}other{Off/# schedules can turn on automatically}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"What can interrupt Do Not Disturb"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"People"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Apps"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Automatically set lower priority notifications to Gentle"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Adaptive notification ranking"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Automatically rank notifications by relevance"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Adaptive notification feedback"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Indicate adjustments made to notifications and show the option to provide feedback to the system"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Suggested actions and replies"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Automatically show suggested actions and replies"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Show recent and snoozed notifications"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Do Not Disturb access"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Allow Do Not Disturb"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"No installed apps have requested Do Not Disturb access"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Loading apps..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Loading apps…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"At your request, Android is blocking this app\'s notifications from appearing on this device"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"At your request, Android is blocking this category of notifications from appearing on this device"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"At your request, Android is blocking this group of notifications from appearing on this device"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"All conversations"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Priority conversations"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"None"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> conversations</item>
-      <item quantity="one">1 conversation</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"None"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{None}=1{1 conversation}other{# conversations}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Who can interrupt"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Calls"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Calls"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"To make sure that allowed calls make a sound, check that the device is set to ring"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"For ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’, incoming calls are blocked. You can adjust settings to allow your friends, family or other contacts to reach you."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Starred contacts"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> others</item>
-      <item quantity="one">1 other</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"None"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{None}=1{{contact_1}}=2{{contact_1} and {contact_2}}=3{{contact_1}, {contact_2} and {contact_3}}other{{contact_1}, {contact_2} and # others}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Messages"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"messages"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Messages"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"For ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’, incoming messages are blocked. You can adjust settings to allow your friends, family or other contacts to reach you."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"All messages can reach you"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"All calls can reach you"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"None"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> contacts</item>
-      <item quantity="one">1 contact</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{None}=1{1 contact}other{# contacts}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Anyone"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Contacts"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Starred contacts"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"All notifications"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Some notifications"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Selected people can still reach you, even if you don’t allow apps to interrupt"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> can interrupt</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> can interrupt</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> more"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{No apps can interrupt}=1{{app_1} can interrupt}=2{{app_1} and {app_2} can interrupt}=3{{app_1}, {app_2} and {app_3} can interrupt}other{{app_1}, {app_2} and # more can interrupt}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Apps"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"All notifications"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Some notifications"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Notifications that can interrupt"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Allow all notifications"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> can interrupt</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> can interrupt</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Nothing can interrupt"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> more"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Nothing can interrupt}=1{{sound_category_1} can interrupt}=2{{sound_category_1} and {sound_category_2} can interrupt}=3{{sound_category_1}, {sound_category_2} and {sound_category_3} can interrupt}other{{sound_category_1}, {sound_category_2} and # more can interrupt}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Nothing can interrupt"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"No one can interrupt"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Some people can interrupt"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"All people can interrupt"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB controlled by"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Connected device"</string>
     <string name="usb_control_device" msgid="527916783743021577">"This device"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Switching…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Switching…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Couldn\'t switch"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Charging this device"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Charging connected device"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"View details"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Data Saver"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Unrestricted data"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Background data is turned off"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Background data is turned off"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"On"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Off"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Use Data Saver"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"If device is locked, prevent typing replies or other text in notifications"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Default spell checker"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Choose spell checker"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Use spell checker"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Use spellchecker"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Not selected"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(none)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"To help free up storage space, storage manager removes backed up photos and videos from your device."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Remove photos &amp; videos"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Storage manager"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Use Storage Manager"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Use storage manager"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automatic"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Free up space now"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Double-tap to check phone"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Double-tap to check tablet"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Double-tap to check device"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Swipe for notifications"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Swipe down on the bottom edge of the screen to show your notifications"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"One-handed mode"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Use one-handed mode"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Exit when switching apps"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Timeout"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 seconds"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 seconds"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 seconds"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"reachability"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"To check time, notifications and other info, double-tap your screen."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Lift to check phone"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Lift to check tablet"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Tap to check tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Tap to check device"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"To check time, notifications and other info, tap your screen."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Panic button"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Start the emergency SOS actions by pressing the power button quickly five times."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Warning sound"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Alert before starting the actions"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Emergency contacts"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Swipe fingerprint for notifications"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Swipe fingerprint"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"To check your notifications, swipe down on the fingerprint sensor on the back of your phone."</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Enable for all apps"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Select graphics driver"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Default"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Game driver"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Game driver"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Developer driver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"System graphics driver"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Couldn’t find networks. Try again."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(forbidden)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"No SIM card"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"No SIM"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"None"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Requires SIM to connect"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Requires <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> SIM to connect"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Preferred network mode: WCDMA preferred"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Preferred network mode: GSM only"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Preferred network mode: WCDMA only"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobile data"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Access data using mobile network"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Phone will automatically switch to this mobile operator when in range"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"No SIM card available"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Calls preference"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS preference"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Ask every time"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Allow screen overlays on settings"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Allow apps that can display over other apps to overlay settings screens"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Media"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Hide player when the media session has ended"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"The player allows you to resume a session from the expanded Quick Settings panel."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Media Player in Quick Settings"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Show media player for an extended period to easily resume playback"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Hide player"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Show player"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"No players available"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Allowed apps"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"media"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth will turn on"</string>
 </resources>
diff --git a/res/values-en-rXC/arrays.xml b/res/values-en-rXC/arrays.xml
index d900cd1..baa23ba 100644
--- a/res/values-en-rXC/arrays.xml
+++ b/res/values-en-rXC/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‎‎‎‎‏‎‎‏‏‎‏‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‎‎‏‎‎‏‏‎‎‏‏‎‎‏‏‎‏‎‏‏‎‏‏‏‏‎‎‎‎‎Medium‎‏‎‎‏‎"</item>
     <item msgid="6740026006576843477">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‎‎‏‎‎‏‎‏‏‎‎‎‎‏‏‏‏‏‎‎‎‏‎‏‎‏‏‎‏‎‏‏‏‎‏‎‎‎‎‏‎‎‏‎‏‎‏‏‎‏‎‏‎‏‎Long‎‏‎‎‏‎"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‏‏‏‏‎‏‎‎‏‏‎‎‏‎‏‏‏‎‏‏‎‎‏‏‎‏‎‎‏‎‎‏‏‎‏‎‎‎‎‎‏‎‎‏‎‎‏‏‎‎‎‎Short‎‏‎‎‏‎"</item>
+    <item msgid="7397961711906421599">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‎‏‎‏‎‏‏‎‏‎‏‏‎‏‏‏‏‏‎‏‏‎‎‎‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‏‏‏‎‏‏‎‏‎‏‏‏‏‏‎Medium‎‏‎‎‏‎"</item>
+    <item msgid="4079132024502041928">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‏‎‎‏‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‏‎‏‏‎‏‎‎‎‎‎‏‎‏‏‏‎‏‎‎‏‏‏‏‎‏‎‏‎‎‏‎‎‎‎Long‎‏‎‎‏‎"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‎‎‎‏‎‎‎‏‎‎‏‎‎‏‎‎‏‎‎‏‏‎‎‏‏‏‎‎‎‎‎‏‎‎‎‎‎‎‎‏‏‏‎‏‏‏‎‎‏‏‏‏‏‎‏‎‎Default‎‏‎‎‏‎"</item>
     <item msgid="4234707448428002595">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‏‎‎‎‏‎‎‏‎‏‏‎‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‏‏‎‏‎‎‎‎‎‎‎‏‏‏‏‏‎‏‎‎‏‎‎‎‏‏‎Sans-serif‎‏‎‎‏‎"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‎‏‏‏‏‏‎‏‏‎‏‎‏‎‎‎‏‎‎‏‎‏‎‎‎‎‎‎‎‎‎‏‎‏‎‎‎‏‎‎‏‎‏‏‏‏‎‎‎‏‎‏‏‎‏‎‏‏‏‎CDMA/EvDo/GSM/WCDMA‎‏‎‎‏‎"</item>
     <item msgid="2847125869624632806">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‏‎‎‎‎‎‏‏‎‎‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‏‎‎‏‎‎‏‏‏‎‎‏‏‎‏‎‎‏‎‎‏‎‏‏‏‏‎‎‏‏‎‎CDMA + LTE/EvDo‎‏‎‎‏‎"</item>
     <item msgid="2247906254631766720">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‎‎‏‏‎‎‏‎‎‎‏‎‏‎‏‎‏‏‎‏‎‏‎‎‎‎‏‎‎‎‏‏‏‎‏‏‎‏‎‎‏‎‎‎‏‎‏‎‏‏‎‎‎‎‎‎‎GSM/WCDMA/LTE‎‏‎‎‏‎"</item>
-    <item msgid="1091258946200124345">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‎‎‏‎‎‏‎‎‏‏‏‎‏‏‏‎‎‎‏‏‏‎‏‎‏‏‎‏‎‏‏‎‎‎‏‏‏‎‎‏‏‎‏‏‏‎‏‏‏‎‏‏‏‎‎‏‎Global‎‏‎‎‏‎"</item>
+    <item msgid="4147872615520331421">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‏‎‎‏‎‎‎‎‎‎‏‏‎‏‎‎‎‎‏‎‏‎‏‎‏‏‎‏‏‏‎‏‏‎‏‎‏‎‎‎‏‏‏‎‎‏‏‎‏‎‎‏‏‏‎‏‎LTE/CDMA/EvDo/GSM/WCDMA‎‏‎‎‏‎"</item>
     <item msgid="2908834445708457736">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‎‎‏‏‎‎‎‎‏‎‎‎‏‎‎‎‏‏‎‏‏‎‏‏‏‏‏‎‏‏‏‎‏‏‏‎‎‎‎‏‎‎‎‎LTE‎‏‎‎‏‎"</item>
     <item msgid="2947411877551747693">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‏‏‏‎‎‏‏‏‎‏‎‎‏‏‏‏‎‏‏‏‏‏‎‎‏‎‎‏‎‎‎‎‎‎‏‏‏‏‎‏‎‎‏‏‎‎‏‎‎‏‏‎‏‏‎‏‎LTE / WCDMA‎‏‎‎‏‎"</item>
     <item msgid="7723670142495874534">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‏‎‏‎‏‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‎‏‏‏‎‏‏‏‏‎‎‏‏‎‎TDSCDMA only‎‏‎‎‏‎"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎‎‏‏‏‎‎‏‎‎‏‎‎‎‎‏‎‎‎‏‏‏‏‎‏‎‏‏‎‎‎‏‎‎‎‎‏‏‎‎‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‎NR/LTE‎‏‎‎‏‎"</item>
     <item msgid="5237423971422723128">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‏‎‏‏‏‏‎‎‎‏‎‎‎‏‎‏‎‏‏‎‏‎‎‏‎‏‏‎‏‎‏‏‎‎‎‏‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‎‎‎NR/LTE/CDMA/EvDo‎‏‎‎‏‎"</item>
     <item msgid="6856991565745877075">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‏‎‏‎‎‎‏‏‏‎‏‏‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‏‎‎‎‎‏‏‏‏‏‎‎‎‎‎‏‎‏‎‎‏‏‎NR/LTE/GSM/WCDMA‎‏‎‎‏‎"</item>
-    <item msgid="473436147270962091">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‏‎‎‏‎‎‎‏‏‏‏‏‏‎‏‏‏‎‏‎‏‎‏‎‏‏‏‎‎‏‎‏‏‏‏‎‏‎‏‎‎‏‎‎‏‎‏‏‏‎‏‎‏‎‏‏‎NR/LTE/CDMA/EvDo/GSM/WCDMA‎‏‎‎‏‎"</item>
+    <item msgid="8908263949185004366">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‎‎‎‏‎‎‎‎‎‏‎‏‏‎‏‏‏‎‏‎‎‏‎‎‎‎‎‏‎‎‏‎‏‏‏‎‎‏‏‎‎‏‏‎‏‎‎‏‏‏‎‎Global‎‏‎‎‏‎"</item>
     <item msgid="6692179237956480280">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‏‎‎‎‏‏‏‏‎‏‏‎‏‎‏‏‏‎‏‎‎‎‏‏‏‏‏‎‏‏‎‏‎‎‎‏‏‎‎‎‎NR/LTE/WCDMA‎‏‎‎‏‎"</item>
     <item msgid="8160757136163231885">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‎‎‎‎‏‏‎‏‎‏‎‏‎‏‏‎‎‎‎‎‏‎‏‏‎‏‏‏‎‎‏‏‏‏‏‎‎‏‎‏‏‎‎‎‏‎‎‎‏‏‎‏‎NR/LTE/TDSCDMA‎‏‎‎‏‎"</item>
     <item msgid="2207530656708814396">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‏‎‏‎‎‎‏‎‏‎‏‏‏‎‎‏‎‏‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‎‏‏‎‎‎‏‏‏‏‎‎‎NR/LTE/TDSCDMA/GSM‎‏‎‎‏‎"</item>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index 3146501..7eacadf 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‎‏‎‏‎‏‏‏‏‎‎‎‏‎‏‏‎‎‎‎‎‏‏‏‏‎‎‎‏‎‏‏‎‎‏‏‏‎‎‏‎‏‎‏‎‏‏‎‏‏‎‏‎‏‎Show profile info on lock screen‎‏‎‎‏‎"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‏‏‎‎‏‎‎‎‎‏‎‏‏‎‏‎‏‏‎‏‏‏‎‎‏‏‏‏‎‎‏‏‎‏‏‎‎‏‎‎‏‏‎‏‏‏‏‏‎‏‎‎‎Accounts‎‏‎‎‏‎"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‏‏‎‏‎‎‎‏‏‏‏‎‏‏‏‏‎‎‏‎‎‎‏‎‏‏‎‏‎‏‏‏‎‏‎‏‏‏‎‎‏‏‏‎‏‏‎‎‎‏‎‏‎‎Location‎‏‎‎‏‎"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‎‏‏‏‏‎‏‏‏‏‏‎‏‏‎‏‎‏‏‎‎‎‏‏‎‎‏‎‏‎‎‏‎‏‏‎‎‏‏‏‎‏‏‎‏‏‎‎‎‏‏‎‎‎‎‎Use location‎‏‎‎‏‎"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‏‏‎‎‏‎‎‎‎‎‎‏‏‏‏‏‎‏‏‎‏‏‏‏‎‎‏‎‎‏‏‏‏‏‎‎‎‎‏‏‎‎‏‎‏‎‎‎‏‏‏‎Use location‎‏‎‎‏‎"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‎‎‏‎‏‎‏‏‎‏‎‏‏‏‎‎‏‏‎‏‎‏‏‎‏‏‏‏‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‎‏‎‎‎‎‏‎‏‏‎‎Off‎‏‎‎‏‎"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‎‎‏‎‎‏‏‏‏‎‎‏‏‏‏‏‎‏‎‏‎‏‏‏‎‏‏‏‎‎‎‎‎‏‎‏‎‎‏‏‎‏‎‎‏‏‏‎‏‏‎‎‏‏‎‎‎On - ‎‏‎‎‏‏‎<xliff:g id="COUNT_1">%1$d</xliff:g>‎‏‎‎‏‏‏‎ apps have access to location‎‏‎‎‏‎</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‏‏‎‏‏‎‎‏‏‎‎‎‎‏‏‎‎‎‏‏‎‎‎‎‎‎‎‏‎‎‏‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‏‎‏‎‎Use your face to authenticate‎‏‎‎‏‎"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‏‎‏‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‎‎‏‎‏‎‎‏‎‎‏‏‎‎‏‏‏‎‎‎‏‎‏‎‎‏‏‎‎‎‏‏‎‎Start‎‏‎‎‏‎"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‏‏‏‎‎‎‎‎‎‎‎‎‏‏‎‏‎‏‏‏‎‎‎‏‏‎‎‎‏‎‎‏‏‎‏‎‏‏‏‎‎‎‎‏‎‏‎‏‏‎‏‎‎‎‎If accessibility face unlock is turned off, some setup steps may not work properly with TalkBack.‎‏‎‎‏‎"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‏‎‎‎‎‎‏‎‏‎‎‎‎‏‏‎‎‎‏‎‎‎‎‎‎‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‎‏‎‏‎‏‏‎‎‎‏‎‏‎‏‎Go back‎‏‎‎‏‎"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‏‎‏‏‎‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‎‏‎‎‏‏‏‎‎‎‏‏‎‏‏‏‎‏‏‏‏‏‎‎‎‎‏‎‎Continue setup‎‏‎‎‏‎"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‎‎‎‏‎‏‏‏‎‎‏‎‎‎‏‎‏‏‎‏‎‎‏‏‏‏‏‏‎‎‏‏‎‎‏‏‏‏‎‏‏‏‏‏‎‎‏‎‏‏‏‏‏‏‎Use accessibility setup‎‏‎‎‏‎"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‏‎‏‎‏‏‏‎‎‏‏‎‏‏‎‎‏‏‎‏‎‎‎‎‎‏‏‎‏‏‏‏‎‎‎‏‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎Must be fewer than ‎‏‎‎‏‏‎<xliff:g id="NUMBER_0">%d</xliff:g>‎‏‎‎‏‏‏‎ digit‎‏‎‎‏‎</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‎‎‏‎‏‎‏‎‎‎‎‏‏‏‏‏‎‎‎‎‎‎‏‎‎‏‎‏‏‎‏‏‎‎‎‏‎‏‎‎‎‎‎‏‎‎‏‏‎‎‏‎‎‏‎Device admin doesn\'t allow using a recent PIN‎‏‎‎‏‎"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‏‎‎‏‏‏‎‎‎‎‎‏‏‎‎‎‎‎‏‎‏‏‎‏‏‎‏‎‏‏‏‎‎‎‏‏‎‏‏‏‎‎‎‏‏‏‏‎‎‎‎‏‏‎‎‎‎Common PINs are blocked by your IT admin. Try a different PIN.‎‏‎‎‏‎"</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‎‏‎‎‎‎‏‎‎‏‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‏‏‏‎‏‏‎‏‏‎‎‎‏‎‎‏‏‎‎‎‎‏‎This can\'t include an invalid character‎‏‎‎‏‎"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‎‎‎‎‎‎‎‏‏‏‎‎‏‏‏‎‎‎‏‎‏‎‏‏‎‏‎‏‏‎‏‎‏‏‎‎‎‎‏‏‏‎‎‎‎‏‏‎‏‎‎‏‏‎‏‎‎Must contain at least one letter‎‏‎‎‏‎"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‎‏‎‏‎‏‏‎‎‏‎‎‏‎‎‏‏‏‏‏‏‎‏‏‎‎‏‏‏‏‏‏‎‎‎‏‎‎‏‏‎‏‏‎‏‎‎‏‎‎‎‏‎‎‏‏‎Must contain at least one digit‎‏‎‎‏‎"</string>
@@ -653,7 +655,6 @@
       <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‎‏‎‏‏‎‏‎‎‏‎‏‎‎‏‏‏‎‏‏‎‏‎‎‏‏‏‎‏‏‏‎‏‎‏‎‎‎‏‏‎‏‎‎‏‏‏‏‏‎‏‏‎‏‏‎Must contain at least 1 non-numerical character‎‏‎‎‏‎</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‎‎‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‎‏‎‏‏‎‏‏‎‎‏‏‎‎‎‏‏‎‏‎‏‏‏‏‎‏‏‎‏‏‎‎‏‎‏‏‏‎Device admin doesn\'t allow using a recent password‎‏‎‎‏‎"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‏‎‎‏‏‏‏‏‏‎‏‏‎‏‎‏‏‎‎‏‏‏‎‏‎‏‏‏‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‏‎‎‎‎‎‏‎Common passwords are blocked by your IT admin. Try a different password.‎‏‎‎‏‎"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‎‏‏‎‎‎‏‏‎‎‎‏‏‎‏‏‏‏‎‎‎‏‎‏‏‏‏‏‎‎‎‏‎‎‏‏‎‎‏‎‎‏‏‎‎‏‎‎‏‎‏‎‎‎‎Ascending, descending, or repeated sequence of digits isn\'t allowed‎‏‎‎‏‎"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‏‏‎‏‎‏‎‏‎‏‎‎‏‎‏‏‎‏‏‏‎‎‎‎‏‎‏‏‎‏‏‏‏‎‎‎‎‏‎‎‏‏‏‎‎‏‎Confirm‎‏‎‎‏‎"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‎‎‎‏‎‏‎‏‎‏‎‎‏‎‎‎‎‎‎‎‎‎‎‎‏‎‎‎‏‎‏‎‎‎‎‎‎‎‏‏‏‎‏‏‏‏‎‏‏‎‎‎‎‎Cancel‎‏‎‎‏‎"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‏‏‏‎‏‏‎‏‎‏‏‎‎‏‏‏‎‏‏‏‏‎‎‎‏‏‎‎‎‎‏‎‏‎‎‏‎‏‎‏‏‏‎Wi‑Fi‎‏‎‎‏‎"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‎‎‏‎‏‏‏‏‎‎‎‎‎‎‏‎‎‎‎‎‎‏‏‎‏‎‎‎‎‎‎‎‎‏‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‎‏‎‎‏‎Turn on Wi‑Fi‎‏‎‎‏‎"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‏‏‏‎‏‏‎‎‏‎‎‎‎‎‎‏‎‎‏‏‎‎‎‏‎‎‎‏‎‏‎‏‏‎‏‎‎‎‎‎‎‎‏‎‏‎‎‏‎‏‎‎‎Wi‑Fi‎‏‎‎‏‎"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‎‏‎‏‏‎‏‎‏‎‏‏‏‏‎‎‎‏‎‎‏‎‏‎‏‎‎‏‎‏‏‎‎‎‎‏‎‎‎‎‎‏‏‎‎‎‏‎‎‎‎‏‏‏‎‎‎‎Use Wi‑Fi‎‏‎‎‏‎"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‎‏‏‏‎‎‎‎‏‏‎‎‎‏‎‏‏‎‎‏‏‏‎‎‏‏‎‎‏‏‏‏‏‎‏‎‏‎‎‎‏‏‏‏‎‎‏‏‎‏‏‏‎‏‎‎Use Wi‑Fi‎‏‎‎‏‎"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‏‏‏‎‎‏‎‏‏‏‎‏‏‏‎‎‏‎‎‎‏‏‎‎‏‏‎‎‎‎‎‎‎‎‎‏‏‎‏‎‏‎‎‎‏‎‏‏‎‎‎‏‎‎‎‏‎Wi‑Fi settings‎‏‎‎‏‎"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‏‏‎‏‎‏‏‏‎‏‎‎‏‎‎‎‏‏‎‏‏‏‏‎‏‎‏‎‎‎‏‏‎‎‎‏‏‏‎‏‎‎‏‏‏‎‎‏‏‏‎‏‏‏‏‏‎Wi‑Fi‎‏‎‎‏‎"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‏‏‏‎‎‎‎‏‏‎‎‏‎‏‏‏‏‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‏‎‏‏‎‎‎‏‏‏‏‎‎‏‎‎‏‎‏‏‎Set up &amp; manage wireless access points‎‏‎‎‏‎"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‏‏‏‎‏‏‎‎‎‎‏‎‏‎‎‎‎‏‏‏‏‎‎‏‎‏‎‎‎‎‎‎‎‏‏‎‏‏‎‏‏‎‎‏‎‏‎‎‎‏‏‏‏‎‏‎Center the QR code below to connect to “‎‏‎‎‏‏‎<xliff:g id="SSID">%1$s</xliff:g>‎‏‎‎‏‏‏‎”‎‏‎‎‏‎"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‎‎‏‎‎‎‎‏‏‎‏‏‎‎‏‏‏‎‏‏‏‎‏‏‏‎‎‎‎‎‎‎‎‏‎‏‎‏‎‏‎‏‎‏‏‎‎‏‎‏‎‎‎‎‎‏‎Join Wi‑Fi by scanning a QR code‎‏‎‎‏‎"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‏‎‏‏‏‏‏‏‎‏‎‎‏‎‏‎‏‎‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‏‏‎‎‏‎‎‎‏‏‎‎‎‎‎‎‎‎‎‏‎‏‎‎Share Wi‑Fi‎‏‎‎‏‎"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‎‏‎‎‎‏‎‏‏‎‏‎‎‏‏‏‎‏‏‏‎‏‏‏‎‏‏‎‏‏‎‎‏‏‎‎‎‏‏‏‎‎‎‏‎‏‏‏‏‏‏‎‎‎‏‎Scan this QR code to connect to “‎‏‎‎‏‏‎<xliff:g id="SSID">%1$s</xliff:g>‎‏‎‎‏‏‏‎” and share the password‎‏‎‎‏‎"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎‏‏‎‎‎‏‎‎‎‎‏‏‎‎‏‎‏‏‎‏‏‏‎‏‎‏‏‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‎‏‏‏‎‎‎‏‏‎‎‎‎Scan this QR code with another device to join “‎‏‎‎‏‏‎<xliff:g id="SSID">%1$s</xliff:g>‎‏‎‎‏‏‏‎”‎‏‎‎‏‎"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‏‎‏‎‏‏‏‏‎‎‎‎‎‎‎‎‎‎‎‎‏‏‎‎‎‏‏‎‏‎‏‎‏‎‏‎‎‏‏‏‎‏‎‏‏‎‎‎‎‏‎‏‏‏‎Scan this QR code to connect to “‎‏‎‎‏‏‎<xliff:g id="SSID">%1$s</xliff:g>‎‏‎‎‏‏‏‎”‎‏‎‎‏‎"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‏‏‎‎‎‎‏‏‎‎‎‏‏‎‏‏‏‎‏‏‎‏‏‎‏‏‎‎‏‏‏‎‎‎‎‎‏‏‎‎‏‏‏‏‏‎‏‎‏‏‏‎‏‏‎‎‎Try again. If the issue continues, contact the device manufacturer‎‏‎‎‏‎"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‏‎‎‏‏‏‎‏‏‏‏‏‏‎‏‏‎‎‎‎‏‎‎‎‏‎‏‎‏‏‎‎‎‎‏‎‏‏‎‎‎‏‏‎‏‏‎‎‎‎‎‎‎‎‏‎Something went wrong‎‏‎‎‏‎"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‏‎‎‏‎‏‎‏‎‏‎‎‏‏‎‏‎‎‏‏‎‏‎‏‎‎‏‏‎‎‎‎‏‏‏‏‎‏‎‎‎‏‎‏‏‎‏‎‏‏‎‏‏‎‏‎Wi‑Fi password: ‎‏‎‎‏‏‎<xliff:g id="PASSWORD">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‏‎‎‎‏‏‎‏‏‏‏‎‏‎‏‎‏‎‏‎‏‏‎‎‎‎‎‎‏‎‎‎‎‎‏‏‏‎‎‏‏‎‎‏‎‏‏‏‎‏‎‎‎‏‎‎‎Hotspot password: ‎‏‎‎‏‏‎<xliff:g id="PASSWORD">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‎‎‏‏‏‎‏‏‏‏‎‏‏‎‎‎‎‎‎‏‎‏‎‎‏‎‎‏‏‏‏‎‎‎‎‎‏‏‎‏‎‎‎‏‎‏‎‎‎‏‏‎‎‏‎‎‎Auto‑connect‎‏‎‎‏‎"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‏‏‎‏‏‎‏‏‏‎‏‎‏‏‏‎‎‏‎‎‎‎‎‎‏‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‎‎‏‎‎‎‎‏‏‎‏‏‏‎‎Allow phone to automatically connect near this network‎‏‎‎‏‎"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‎‎‏‏‎‎‏‏‏‎‏‏‎‎‏‏‎‎‎‎‏‏‏‎‏‎‏‏‏‏‎‏‎‎‏‎‎‏‎‎‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎Allow tablet to automatically connect near this network‎‏‎‎‏‎"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‏‎‏‏‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎‎‎‎‎‎‎‎‏‏‏‎‎‎‎‏‏‎‏‎‎‎‏‎‏‏‎‎‏‏‏‎‎‎‏‎‎Allow connection to this network when in range‎‏‎‎‏‎"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‎‏‏‎‏‎‎‏‎‏‏‎‏‎‎‏‎‏‎‏‏‏‏‏‎‎‏‏‏‏‎‎‏‏‎‎‏‎‏‎‎‎‏‏‎‎‎‏‏‎‏‏‏‎Add device‎‏‎‎‏‎"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‏‎‎‏‏‎‏‎‎‎‏‏‎‎‎‎‎‏‏‎‎‏‏‏‎‎‏‏‎‏‏‏‎‎‎‎‎‏‏‏‎‎‎‏‏‎‏‎‏‎‏‏‎‎‏‎Use a QR code to add a device to this network‎‏‎‎‏‎"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‎‎‎‏‎‎‏‏‎‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‎‏‏‏‎‎‎‏‏‎‎‎‏‎‏‏‏‎QR code isn\'t a valid format‎‏‎‎‏‎"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‏‎‎‎‏‏‎‎‎‎‎‏‎‏‏‏‎‎‏‎‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‎‏‎‏‎‏‏‎‏‏‏‏‎‎‏‎‎‎‎‏‏‎Use system certificates‎‏‎‎‏‎"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‎‎‎‏‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‎‏‏‏‎‎‎‎‎‏‎‎‎‎‏‎‏‎‏‏‏‎‎‏‎Do not provide‎‏‎‎‏‎"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‎‏‏‏‎‎‏‏‏‎‏‎‎‏‎‏‎‏‏‎‎‎‎‏‎‏‏‎‏‎‎‏‏‏‏‏‎‎‎‎‎‏‏‏‏‎‎‏‎‎‎‏‎‎‎Do not validate‎‏‎‎‏‎"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‏‎‏‏‏‎‏‎‏‏‎‏‏‏‎‎‏‏‎‎‏‏‎‏‎‏‏‏‎‎‏‏‏‏‏‎‏‏‏‏‎‎‏‎‏‏‎‏‎‎‏‏‏‏‎No certificate specified. Your connection will not be private.‎‏‎‎‏‎"</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‏‏‏‏‎‎‎‏‎‎‎‏‏‏‏‏‏‎‎‏‎‏‏‎‏‏‏‎‎‎‏‏‎‎‏‎‎‏‏‏‎‏‏‏‎‎‎‏‏‏‎‎‏‏‎Network name is too long.‎‏‎‎‏‎"</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‎‏‎‎‏‏‏‎‎‎‎‎‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‎‎‏‏‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‏‎‏‎‎‎Must specify a domain.‎‏‎‎‏‎"</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‏‏‏‏‎‏‎‎‏‏‏‎‎‏‏‏‏‎‎‏‏‎‏‏‎‏‏‎‏‏‎‏‏‏‏‎‏‏‎‏‏‏‏‏‏‎‎‏‏‏‏‎‎‎Certificate required.‎‏‎‎‏‎"</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‎‎‏‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‏‎‎‏‎‏‎‎‏‎‎‎‎‏‎‎‏‏‏‏‏‎‏‏‏‎‎‏‏‏‎‎‎‏‎‏‎Connect‎‏‎‎‏‎"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‏‎‏‎‏‏‏‏‎‎‏‎‎‏‏‎‎‎‏‏‎‎‎‏‏‎‎‏‎‏‏‏‎‏‏‏‏‎‎‎‎‏‎Wi‑Fi turned on‎‏‎‎‏‎"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‎‎‎‏‎‏‎‏‎‏‎‎‏‎‏‎‏‎‎‎‏‏‎‏‏‎‎‏‎‏‏‎‏‏‎‎‎‏‏‏‏‎‎‏‎‏‎‎‎‎‎‎‎Connected to ‎‏‎‎‏‏‎<xliff:g id="NETWORK_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‏‏‎‎‎‎‏‎‎‏‏‎‏‏‏‏‎‏‎‎‎‎‏‏‎‏‎‏‎‎‏‏‎‎‎‏‎‎‏‏‏‏‎‎‎‎‏‏‎‎‏‎‎‏‏‏‎Connecting to ‎‏‎‎‏‏‎<xliff:g id="NETWORK_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‏‏‎‎‏‎‎‏‎‏‏‎‏‎‎‎‎‏‏‎‏‏‏‎‏‎‏‏‎‎‎‏‏‏‏‏‏‎‏‏‎‎‏‏‏‎‎‏‏‎‎‏‏‎‎‎Connecting…‎‏‎‎‏‎"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‏‏‏‎‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‏‎‏‏‎‎‏‎‎‎‎‏‏‏‎‎‎‏‎‏‏‏‎‎‎‏‏‏‏‏‎‏‏‎‎Failed to connect to network‎‏‎‎‏‎"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‏‏‏‎‏‎‏‏‎‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‎‏‎‎‎‎‏‎‎‎‎‎‎‏‏‏‎‏‏‎‏‎‎‎‎‏‎‏‎‎‏‏‎Network not in range‎‏‎‎‏‎"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‏‏‎‎‏‎‎‏‎‎‎‏‏‎‎‏‏‎‏‏‎‎‎‎‎‎‏‎‎‎‎‏‎‏‎‎‎‏‎‎‏‏‎‎‏‎‏‏‎‎‏‎‏‎‎‎App is sharing content. To share internet connection, turn hotspot off, then on‎‏‎‎‏‎"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‎‎‏‎‎‏‏‎‎‎‏‏‎‎‏‎‏‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‏‎‎‎‏‎‏‏‎‏‎‏‏‏‏‏‏‎No password set‎‏‎‎‏‎"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‎‎‎‎‏‏‏‎‏‏‎‏‏‎‏‏‎‎‎‏‎‏‏‎‎‏‎‎‏‏‏‎‎‏‏‎‎‏‎‏‏‎‏‏‎‎‎‎‎‎‏‏‎‏‏‎‎Hotspot name‎‏‎‎‏‎"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‏‎‏‏‏‏‏‏‎‎‏‏‏‎‎‏‎‎‎‎‏‎‎‏‎‎‎‎‎‏‎‎‎‎‎‎‏‏‎‎‎‏‏‏‎‎‎‎‏‏‎‏‎‎‎‎‎Turning on ‎‏‎‎‏‏‎<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎...‎‏‎‎‏‎"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‏‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‎‎‎‏‎‎‏‏‏‏‎‎‎‏‎‎‏‏‎‏‎‎‎‎‎‎‏‏‎‏‎‎‎‏‏‏‎‎‎Turning on ‎‏‎‎‏‏‎<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎…‎‏‎‎‏‎"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‎‎‎‎‎‏‏‎‎‎‏‏‏‏‎‏‎‎‎‏‎‎‎‎‎‏‏‎‏‎‎‏‏‏‏‏‎‎‏‎Other devices can connect to ‎‏‎‎‏‏‎<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‎‏‎‏‏‎‎‎‏‏‏‎‏‏‏‏‏‎‎‏‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‏‎‏‎‏‎‏‏‎‏‎‎‏‎‎Hotspot password‎‏‎‎‏‎"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‏‏‎‎‏‏‏‎‏‏‏‎‎‏‏‏‏‏‎‎‏‎‏‎‎‎‎‏‎‏‏‎‏‎‏‎‎‎‎‎‏‎‎‎‏‎‎AP Band‎‏‎‎‏‎"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‎‎‎‏‎‎‏‎‏‎‏‏‏‏‎‎‏‎‏‎‎‏‎‏‎‏‎‏‎‏‏‏‏‏‏‎‎‏‎‎‏‎‎‏‎‎‎‎‏‎‏‎‎‏‏‏‎Smooth Display‎‏‎‎‏‎"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‎‏‏‎‎‎‏‎‏‎‎‏‏‏‎‎‏‎‏‏‎‏‎‎‎‎‎‎‏‎‏‎‏‎‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‎‎‎‏‎‎Automatically raises the refresh rate from 60 to 90 Hz for some content. Increases battery usage.‎‏‎‎‏‎"</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‎‎‎‎‎‏‎‎‎‏‎‏‏‏‏‎‎‎‎‎‏‎‎‎‏‎‏‎‏‎‎‏‏‏‎‏‏‏‎‎‎‏‏‏‏‏‏‏‎‎‏‎‏‏‎Smooth Display‎‏‎‎‏‎"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‎‏‏‎‎‎‎‏‎‎‏‎‎‎‏‎‎‎‎‏‎‏‏‏‏‏‏‎‎‎‎‎‎‏‎‏‏‏‎‏‏‎‎‎‏‎‎‎‏‏‏‏‎‎‎Force 90 Hz refresh rate‎‏‎‎‏‎"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‏‎‏‎‏‏‏‏‎‏‏‏‎‎‏‏‎‏‏‏‎‎‏‏‎‎‎‏‏‎‎‏‎‏‏‏‏‏‎‎‏‎‎‎‏‏‎‏‎‏‏‎‏‏‎Highest refresh rate for improved touch responsiveness &amp; animation quality. Increases battery usage.‎‏‎‎‏‎"</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎‏‏‏‎‏‏‏‎‏‎‏‏‏‏‏‏‎‎‏‏‎‎‏‏‎‏‎‏‏‎‏‎‎‏‎‏‎‏‏‎‎‏‏‏‎‎‎‎‎‏‎‎‎‎‏‎Screen attention‎‏‎‎‏‎"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‎‏‎‏‏‎‎‎‏‎‏‎‏‎‏‎‏‏‎‎‏‏‎‏‎‎‎‎‎‏‎‏‎‎‎‎‎‎‎‏‎‏‏‎‎‎‏‎‎‎‎‏‏‎‎‎‎On / Screen won’t turn off if you’re looking at it‎‏‎‎‏‎"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‎‏‎‎‏‏‎‎‏‏‎‏‏‏‎‎‎‏‏‏‏‎‏‎‏‎‏‎‏‏‎‎‎‏‏‎‏‏‏‎‎‎‏‎‏‏‏‎‎‏‏‎‏‎‏‏‎Android version‎‏‎‎‏‎"</string>
     <string name="security_patch" msgid="4071756145347865382">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‏‎‎‎‎‎‎‏‏‏‎‎‏‎‎‎‏‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‏‏‏‎‎‏‎‎‏‎‏‎‏‏‎‎‏‎‎‏‏‎‎Android security update‎‏‎‎‏‎"</string>
     <string name="model_info" msgid="8997566254717810904">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‏‏‎‏‏‏‎‎‎‏‏‎‏‏‎‏‎‏‏‎‎‏‏‎‎‏‏‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‎‎‏‏‎‏‏‎‎‎‎Model‎‏‎‎‏‎"</string>
-    <string name="model_summary" msgid="2246651782442466213">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‎‎‏‎‏‏‎‏‏‎‏‏‎‏‎‏‏‏‏‎‎‏‎‎‏‎‎‏‎‎‏‎‎‏‏‏‏‎‏‏‎‎‏‏‏‎‏‏‏‎‏‎‎‏‎‏‎Model: %1$s‎‏‎‎‏‎"</string>
     <string name="hardware_info" msgid="7035211991066637019">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎‏‎‎‎‏‎‎‎‎‏‏‎‎‎‎‎‎‎‏‎‎‎‎‎‎‏‏‏‏‏‎‎‎‏‏‎‎‎‎‏‏‏‎‎‏‎‏‏‎‏‏‎‏‏‎Model &amp; hardware‎‏‎‎‏‎"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‎‎‏‏‎‏‏‏‏‎‎‎‏‏‏‎‏‏‏‎‎‎‏‎‏‏‏‎‎‎‎‏‎Hardware version‎‏‎‎‏‎"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‎‎‏‏‎‎‎‎‎‏‎‎‏‎‏‏‏‎‎‎‎‏‏‎‎‎‎‏‏‎‏‎‎‏‎‎‏‎‏‏‎‏‏‎‎‎‎‎‏‏‎‎‎‏‎Equipment ID‎‏‎‎‏‎"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‎‎‎‏‏‎‎‎‏‎‎‏‎‎‏‎‏‏‎‏‎‎‏‎‏‏‏‎‎‏‎‎‎‏‎‏‎‏‏‏‎‏‏‎Network settings have been reset‎‏‎‎‏‎"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‎‎‏‏‏‏‎‏‏‎‏‏‏‏‎‎‏‏‎‏‎‎‏‏‎‎‎‎‎‎‏‎‏‎‏‎‏‏‏‏‎‎‏‎‎‎‎‎‏‎‏‏‎‏‎Can’t erase SIMs‎‏‎‎‏‎"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‎‏‎‎‎‏‏‎‏‏‎‎‏‎‎‏‏‎‎‏‎‎‎‏‎‏‏‎‎‏‏‎‏‏‏‎‎‏‎‏‎‎‎‏‏‏‏‏‎‏‎‏‎‏‎‎Downloaded SIMs can’t be erased due to an error.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Restart your device and try again.‎‏‎‎‏‎"</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‏‎‏‎‏‏‏‎‎‎‏‏‏‏‏‎‎‎‎‏‏‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‎‎‏‎‏‎‏‏‏‎Erase all data (factory reset)‎‏‎‎‏‎"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‎‏‎‎‏‎‎‏‏‎‎‎‏‎‏‎‎‎‎‏‏‏‏‏‎‎‎‏‏‎‎‏‏‎‎‏‏‎‎‎‎‎‎Erase all data (factory reset)‎‏‎‎‏‎"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‎‎‏‏‏‎‎‎‏‏‎‏‎‎‎‎‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‎‎‎‏‎‎‎‎‏‏‎‏‎‏‎‏‏‏‏‏‎‏‎This will erase all data from your tablet’s ‎‏‎‎‏‏‎"<b>"‎‏‎‎‏‏‏‎internal storage‎‏‎‎‏‏‎"</b>"‎‏‎‎‏‏‏‎, including:‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Your Google Account‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎System and app data and settings‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Downloaded apps‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‏‏‎‎‎‎‎‎‏‎‎‏‏‏‎‏‎‎‎‏‏‎‎‎‏‏‏‏‎‎‏‎‏‎‎‏‎‎‎‏‎‎‏‎‏‎‎‎‎‎‏‏‎This will erase all data from your phone’s ‎‏‎‎‏‏‎"<b>"‎‏‎‎‏‏‏‎internal storage‎‏‎‎‏‏‎"</b>"‎‏‎‎‏‏‏‎, including:‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Your Google Account‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎System and app data and settings‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Downloaded apps‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‏‏‏‏‏‎‎‏‎‏‎‎‎‏‎‏‎‎‏‏‏‎‏‎‎‏‎‏‎‎‏‎‏‏‎‏‏‎‏‎‏‎‎‏‎‏‎‎‏‏‎‏‎‎‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎You are currently signed into the following accounts:‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‎‎‏‏‎‏‏‎‏‏‏‏‎‎‏‎‎‏‎‏‎‏‏‎‏‏‏‎‏‏‎‎‏‏‎‎‏‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎There are other users present on this device.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‎‎‎‎‏‏‎‎‎‏‏‎‏‏‏‏‎‎‏‏‏‎‎‎‏‏‎‎‏‏‎‎‎‎‎‎‎‎‏‎‏‏‏‎‏‏‏‎‏‎‎‎‎‎‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Music‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Photos‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Other user data‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‎‎‎‏‎‎‎‏‏‏‏‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‎‎‏‎‎‎‏‎‎‏‎‎‏‎‎‏‎‏‏‏‎‎‎‏‎‎‏‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎eSIMs‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‎‎‏‏‎‎‏‎‎‎‏‏‏‎‏‎‏‏‎‎‏‎‏‎‏‏‏‏‎‎‏‎‏‎‏‎‏‎‎‎‏‎‎‎‎‏‎‎‏‎‏‏‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎This will not cancel your mobile service plan.‎‏‎‎‏‎"</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‏‎‏‎‎‏‎‏‎‏‎‏‎‎‏‎‏‏‎‎‏‎‎‎‎‏‏‎‎‎‎‎‎‏‎‎‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎To clear music, pictures, and other user data, the ‎‏‎‎‏‏‎"<b>"‎‏‎‎‏‏‏‎USB storage‎‏‎‎‏‏‎"</b>"‎‏‎‎‏‏‏‎ needs to be erased.‎‏‎‎‏‎"</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‏‎‎‎‏‎‎‎‎‎‎‎‎‎‏‎‏‏‎‎‏‎‎‎‏‎‏‎‎‎‎‎‏‏‏‎‎‏‎‏‏‏‎‏‏‏‏‏‏‎‏‎‏‎‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎To clear music, pictures, and other user data, the ‎‏‎‎‏‏‎"<b>"‎‏‎‎‏‏‏‎SD card‎‏‎‎‏‏‎"</b>"‎‏‎‎‏‏‏‎ needs to be erased.‎‏‎‎‏‎"</string>
+    <string name="main_clear_title" msgid="277664302144837723">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‏‏‎‏‏‎‏‎‎‏‏‏‎‏‏‎‎‎‏‏‎‏‏‎‎‎‏‏‎‎‎‎‎‎‏‎‎‏‏‎‎‏‎‏‏‎‎‎‎‏‎‏‏‎‏‏‎Erase all data (factory reset)‎‏‎‎‏‎"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‏‏‎‎‏‎‏‏‎‏‎‏‎‏‎‎‎‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‏‎‏‏‎‏‏‎‎‎‎‏‎‎‎‎‏‏‎‎‎‎Erase all data (factory reset)‎‏‎‎‏‎"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‏‏‏‎‏‎‏‎‎‎‏‎‏‎‏‎‎‏‏‏‎‎‎‏‏‎‎‏‎‎‏‏‏‎‎‎‏‏‏‏‏‏‎‏‏‎‎‎‎‎‎‏‎‎‎‏‎This will erase all data from your tablet’s ‎‏‎‎‏‏‎"<b>"‎‏‎‎‏‏‏‎internal storage‎‏‎‎‏‏‎"</b>"‎‏‎‎‏‏‏‎, including:‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Your Google Account‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎System and app data and settings‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Downloaded apps‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‎‏‏‎‏‎‏‏‎‎‏‎‎‎‎‏‏‏‏‎‏‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‎‏‎‏‎‎‎‏‎‏‏‏‎This will erase all data from your phone’s ‎‏‎‎‏‏‎"<b>"‎‏‎‎‏‏‏‎internal storage‎‏‎‎‏‏‎"</b>"‎‏‎‎‏‏‏‎, including:‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Your Google Account‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎System and app data and settings‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Downloaded apps‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‎‎‏‏‎‎‎‏‎‎‎‎‏‎‎‏‏‎‎‏‎‎‏‎‏‏‏‎‏‏‏‏‏‏‎‎‏‏‎‏‏‏‏‎‏‎‏‎‎‏‎‎‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎You are currently signed into the following accounts:‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‎‎‎‏‏‎‎‎‎‏‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‎‏‎‎‎‏‏‏‏‎‏‏‎‏‎‎‎‏‎‎‎‎‎‎‏‎‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎There are other users present on this device.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‏‏‏‎‎‏‎‏‏‎‎‏‎‎‏‎‎‎‎‏‎‏‏‏‎‎‏‎‏‏‎‎‎‎‎‏‎‏‎‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Music‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Photos‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Other user data‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‏‎‎‎‏‎‎‏‎‏‏‎‎‏‎‏‏‏‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎‎‎‎‎‎‏‎‏‎‏‏‎‏‏‎‎‎‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎eSIMs‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‎‎‏‎‎‎‏‎‎‎‎‏‎‏‏‏‎‎‏‎‎‏‎‏‎‎‏‏‏‎‏‎‎‏‏‎‏‎‏‏‎‎‎‏‎‏‎‎‏‏‏‏‏‎‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎This will not cancel your mobile service plan.‎‏‎‎‏‎"</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‎‏‎‎‎‏‏‏‎‏‏‏‏‏‏‎‏‏‏‏‎‎‏‎‎‏‎‏‎‏‏‏‏‎‎‎‎‎‎‏‏‏‎‏‎‎‏‏‎‎‎‏‏‏‎‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎To clear music, pictures, and other user data, the ‎‏‎‎‏‏‎"<b>"‎‏‎‎‏‏‏‎USB storage‎‏‎‎‏‏‎"</b>"‎‏‎‎‏‏‏‎ needs to be erased.‎‏‎‎‏‎"</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‏‏‎‎‏‎‏‏‏‏‎‎‏‎‏‏‎‏‏‎‏‏‎‏‎‎‏‎‎‎‏‎‎‏‎‎‏‏‎‏‏‎‏‏‏‏‎‏‎‎‏‏‎‎‎‎‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎To clear music, pictures, and other user data, the ‎‏‎‎‏‏‎"<b>"‎‏‎‎‏‏‏‎SD card‎‏‎‎‏‏‎"</b>"‎‏‎‎‏‏‏‎ needs to be erased.‎‏‎‎‏‎"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‎‏‎‎‏‎‎‎‏‎‏‎‏‎‏‎‏‏‎‏‎‎‏‏‏‏‎‎‏‏‎‏‏‏‎‎‏‏‎‏‏‎‏‏‏‏‏‎‏‎‎‏‎‎‏‏‎Erase USB storage‎‏‎‎‏‎"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‎‏‏‏‎‎‎‏‏‎‎‏‎‎‎‏‏‏‎‎‎‎‏‏‎‎‎‎‏‏‎‏‎‎‏‏‎‏‎‎‏‎‏‎‏‎‎‏‏‏‎‎‎‏‏‎Erase SD card‎‏‎‎‏‎"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‏‏‏‏‏‎‏‎‏‎‎‎‏‏‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‎‎‏‎‏‏‎Erase all the data on the internal USB storage, such as music or photos‎‏‎‎‏‎"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‎‏‏‏‏‎‎‏‏‎‎‎‎‎‏‏‏‏‎‏‏‏‎‎‏‎‎‏‎‎‏‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‎‏‏‏‎‏‏‎‎‎Erase all the data on the SD card, such as music or photos‎‏‎‎‏‎"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‎‏‎‏‎‎‏‎‏‎‏‎‎‏‏‎‎‏‏‎‎‎‎‏‎‏‎‏‎‎‎‏‎‎‎‏‎‎‏‏‏‎‏‏‎‏‏‎‏‎‏‏‎‎‎‏‎Erase all data‎‏‎‎‏‎"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‎‏‎‏‎‎‏‎‏‎‏‎‎‏‏‎‎‏‏‎‎‎‎‏‎‏‎‏‎‎‎‏‎‎‎‏‎‎‏‏‏‎‏‏‎‏‏‎‏‎‏‏‎‎‎‏‎Erase all data‎‏‎‎‏‎"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‏‎‏‎‏‎‎‎‎‏‎‏‎‎‏‎‏‏‎‏‏‎‎‏‏‎‎‎‎‎‏‎‏‎‏‏‏‏‏‏‎‎‏‏‏‏‎‏‎‏‎‏‎‎‎All of your personal information and downloaded apps will be deleted. You can’t undo this action.‎‏‎‎‏‎"</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‏‎‎‎‏‎‏‏‏‎‏‎‏‏‏‎‏‏‎‏‏‎‎‏‏‎‎‏‏‏‏‎‏‎‎‏‎‏‎‎‏‎‏‏‏‎‎‏‏‏‎‎‏‏‏‎‎All of your personal information, including downloaded apps &amp; SIMs, will be deleted. You can’t undo this action.‎‏‎‎‏‎"</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‏‏‏‎‎‎‏‎‏‏‎‎‏‏‏‎‎‎‏‎‏‏‎‏‎‎‏‎‎‏‏‏‏‎‎‎‎‎‏‏‎‏‎‏‎‏‎‎‏‎‏‏‏‏‎‎‎Erase everything‎‏‎‎‏‎"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‏‎‎‎‎‏‏‏‎‏‎‏‏‎‎‎‏‏‎‏‎‏‎‎‏‎‎‎‎‏‏‎‏‏‏‏‎‎‏‎‎‏‎‎‎‎‎‏‎‏‏‏‏‎‎No reset was performed because the System Clear service isn’t available.‎‏‎‎‏‎"</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‏‎‎‎‏‏‏‎‎‎‎‎‏‏‏‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‏‏‎‏‏‎‏‏‏‏‏‎‎‏‎‎‎‎‏‏‏‏‎‏‎‎Erase all data?‎‏‎‎‏‎"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‏‏‏‎‎‏‏‏‏‏‏‎‏‎‎‏‏‎‏‎‎‎‏‏‏‎‎‏‏‏‏‎‏‏‏‏‏‏‎‎‎‎‏‏‎‎‎‏‏‏‏‎‎‎‏‎Factory reset is not available for this user‎‏‎‎‏‎"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‏‎‏‎‏‎‎‏‎‏‏‎‏‎‏‏‎‎‏‏‏‏‎‏‏‎‏‎‏‎‎‎‎‎‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‏‎‏‎‎‎‎‎Erasing‎‏‎‎‏‎"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‏‏‎‏‎‎‏‏‎‏‎‏‏‏‎‎‏‎‎‏‎‎‎‎‎‎‎‎‏‏‎‎‎‎‎‎‎‏‏‎‎‏‎‏‏‏‏‎‏‎‎‎Please wait...‎‏‎‎‏‎"</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‏‎‏‏‏‎‏‎‎‎‏‏‏‏‎‏‏‏‎‏‏‏‎‏‎‎‎‎‎‏‎‏‎‏‏‎‎‎‎‏‎‎‎‏‎‎‏‏‎‏‏‏‏‏‎Erase all data‎‏‎‎‏‎"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‏‎‏‏‏‎‏‎‎‎‏‏‏‏‎‏‏‏‎‏‏‏‎‏‎‎‎‎‎‏‎‏‎‏‏‎‎‎‎‏‎‎‎‏‎‎‏‏‎‏‏‏‏‏‎Erase all data‎‏‎‎‏‎"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‎‎‎‎‎‎‏‏‎‏‏‎‏‏‏‎‏‏‏‏‎‏‏‏‎‏‏‏‎‏‏‏‎‎‎‎‏‎‏‏‏‎‏‎‏‎‏‏‎‏‏‏‎‎‎All of your personal information and downloaded apps will be deleted. You can’t undo this action.‎‏‎‎‏‎"</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‎‎‎‏‏‏‎‎‏‎‏‎‎‎‏‏‏‎‏‎‏‏‏‏‎‏‎‎‎‏‏‏‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‎‎‏‎‎‏‎All of your personal information, including downloaded apps &amp; SIMs, will be deleted. You can’t undo this action.‎‏‎‎‏‎"</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‎‏‎‎‎‏‏‎‎‏‏‏‎‎‏‏‏‏‏‏‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‎‎‎‎‎‏‏‏‎‏‏‎‎‎‏‎‎‎‏‎Erase all data?‎‏‎‎‏‎"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‎‏‎‎‏‎‏‎‏‎‏‎‏‎‎‎‎‎‏‏‎‎‎‏‏‏‏‏‏‎‎‏‎‏‏‏‎‎‎‏‏‎‎‏‏‎‏‏‎Factory reset is not available for this user‎‏‎‎‏‎"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‏‏‏‎‎‎‏‎‏‏‏‎‏‎‎‎‏‏‎‎‏‏‏‎‏‎‎‏‏‏‏‎‎‏‎‎‏‏‎‏‎‎‎‏‏‎‏‎‏‏‎‏‏‏‎Erasing‎‏‎‎‏‎"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎‏‎‏‏‎‎‎‏‏‎‏‏‎‎‏‏‎‏‎‎‏‎‎‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‏‏‏‎‏‏‎‎‏‎‎‏‎‎‎Please wait…‎‏‎‎‏‎"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‎‎‏‎‎‎‎‎‎‎‏‎‏‏‎‎‏‎‎‏‏‏‎‏‎‎‏‎‏‏‏‎‎‎‎‏‏‎‏‎‎‏‏‏‏‏‎‎‏‎‏‏‎‏‎‎‎Call settings‎‏‎‎‏‎"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‏‎‏‎‎‏‏‎‎‏‏‏‎‏‏‎‎‎‎‎‏‏‎‎‎‎‏‏‎‎‎‏‏‎‏‏‏‏‏‎‎‎‏‏‏‏‏‎‏‎‎‏‎‏‎Set up voicemail, call forwarding, call waiting, caller ID‎‏‎‎‏‎"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‏‏‏‏‏‏‎‎‎‏‎‎‎‎‏‎‏‏‏‏‏‎‎‏‎‏‎‎‎‏‎‏‏‎‎‏‏‏‎‎‏‎‏‏‎‏‏‎‎‎‏‎‏‏‎USB tethering‎‏‎‎‏‎"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‎‏‏‏‎‎‏‎‎‎‏‏‏‏‎‎‎‎‏‎‏‏‎‎‎‎‎‏‏‎‏‎‏‏‎‏‎‏‎‏‎‎‏‏‎‎‏‏‎‎‎‏‏‏‏‎‎Can’t tether to more than ‎‏‎‎‏‏‎<xliff:g id="MAXCONNECTION">%1$d</xliff:g>‎‏‎‎‏‏‏‎ devices.‎‏‎‎‏‎"</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‎‏‏‎‏‎‏‎‎‏‏‎‏‎‏‏‎‎‏‏‏‏‏‎‏‎‎‏‏‏‏‎‎‎‎‏‎‎‎‎‏‎‏‏‏‏‏‎‎‎‎‏‎‎‎‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ will be untethered.‎‏‎‎‏‎"</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‏‎‏‎‎‎‏‏‎‏‏‎‎‎‏‎‏‎‎‎‏‏‎‎‎‏‏‏‏‎‎‎‏‎‎‏‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‏‎‎‎Ethernet tethering‎‏‎‎‏‎"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‏‏‎‏‎‏‏‎‎‏‎‎‏‏‎‎‏‏‏‎‎‎‏‎‎‏‏‏‎‏‏‏‎‎‎‎‏‏‏‎‎‏‏‎‎‎‏‎‎‎‏‏‏‎Share phone’s internet connection via USB Ethernet‎‏‎‎‏‎"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‏‏‏‏‎‏‏‎‎‎‏‎‎‎‏‏‎‎‏‏‎‏‎‎‏‎‎‎‏‎‎‎‏‎‏‏‎‎‎‎‎‎‎‎‏‏‎‏‎‎‏‏‏‎‎Share phone’s internet connection via Ethernet‎‏‎‎‏‎"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‏‎‎‏‎‏‏‎‏‎‎‎‎‏‎‏‏‎‏‏‏‎‎‏‏‏‏‎‏‎‏‎‎‏‎‎‎‏‎Use hotspot and tethering to provide internet to other devices through your mobile data connection. Apps can also create a hotspot to share content with nearby devices.‎‏‎‎‏‎"</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‏‎‏‏‎‏‎‎‎‏‏‏‎‏‏‎‎‎‎‎‏‏‎‏‎‎‏‎‏‏‏‏‏‎‎‏‏‎‎‎‎‎‎‎‎‏‏‏‎‏‎‏‏‎‎‎Use hotspot and tethering to provide internet to other devices through your Wi‑Fi or mobile data connection. Apps can also create a hotspot to share content with nearby devices.‎‏‎‎‏‎"</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‎‏‎‎‎‏‎‏‏‏‎‎‏‎‎‏‎‏‎‏‏‏‎‎‎‎‎‎‎‏‎‎‎‎‎‎‎‎‎‏‎Help‎‏‎‎‏‎"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‎‎‎‎‏‏‎‎‏‏‎‎‎‎‎‎‏‏‏‏‎‎‎‏‎‎‎‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‎‏‎‎‏‎Caption preferences‎‏‎‎‏‎"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‏‏‎‎‏‏‏‎‏‏‏‏‎‎‎‎‏‎‏‎‏‏‎‏‎‎‎‏‏‏‏‎‏‎‏‏‏‎‎‎‎‎‎‎‏‏‎‏‎‏‎‏‏‏‏‏‎Magnification‎‏‎‎‏‎"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‎‎‏‏‎‎‏‏‏‎‏‏‏‎‏‎‎‎‎‎‎‎‎‏‎‎‏‏‎‏‎‎‎‏‏‎‏‎‎‎‏‏‏‎‏‏‎‎‎‎‎‎‏‎‎‏‎Magnification area‎‏‎‎‏‎"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‎‏‏‏‎‎‎‏‎‎‏‎‏‏‎‎‏‏‎‏‏‎‎‎‎‎‎‎‎‏‏‎‏‎‎‏‏‎‏‏‎‎‎‏‎‏‏‎‏‎‏‎‎‎Magnification enable‎‏‎‎‏‎"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‎‏‎‎‏‎‏‎‎‎‎‏‏‎‎‏‎‏‏‎‏‏‏‎‏‎‏‏‏‏‎‏‏‏‎‏‎‏‏‏‏‏‏‎‏‏‏‎‏‎‏‏‎‎Choose the magnification area(s) you want to use when magnifying the screen‎‏‎‎‏‎"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‏‏‎‏‏‏‏‏‎‎‏‏‏‎‎‏‎‎‏‏‎‎‎‏‏‎‎‎‏‎‎‎‎‏‎‏‏‎‏‏‏‏‎‏‏‏‏‏‎‏‏‏‎‎‏‎‎Full screen‎‏‎‎‏‎"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‎‎‏‎‎‎‎‏‏‏‏‎‎‏‎‎‏‏‎‏‎‎‎‏‎‎‏‏‎‏‎‏‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‎‎‏‎Part of screen‎‏‎‎‏‎"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‎‏‎‏‎‎‏‏‎‎‏‎‎‏‎‏‎‏‏‏‏‏‏‎‎‎‏‎‎‎‏‎‎‎‏‏‏‎‎‎‎‏‏‎‏‏‏‏‏‎‏‏‎‏‎Full screen &amp; part of screen‎‏‎‎‏‎"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‎‏‎‎‏‎‎‎‏‎‏‏‎‏‏‏‎‎‎‏‏‏‏‎‎‏‏‏‎‏‎‎‏‏‎‎‎‏‏‎‎‏‎‏‏‏‎‎‏‎‎‎‎‎‎‎Magnify entire screen‎‏‎‎‏‎"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‎‎‎‎‏‏‎‏‎‎‏‎‎‏‎‏‏‏‎‎‏‎‎‏‏‎‎‎‏‏‎‏‎‏‎‏‏‎‎‏‎‎‎‎‏‏‏‎‏‎‎‎‎‎Magnify part of screen‎‏‎‎‏‎"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‏‏‏‎‎‏‏‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‎‎‎‏‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎Switch to accessibility button?‎‏‎‎‏‎"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‎‏‏‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‎‎‎‏‎‎‏‏‏‏‏‏‎‎‎‎‎‏‎‎‏‎‏‏‎‎‎‎‏‏‎‎Using triple tap to magnify part of the screen will cause typing and other actions to be delayed.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Do you want to switch to using accessibility button to magnify?‎‏‎‎‏‎"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‏‏‏‏‎‏‎‏‎‏‎‎‏‎‎‎‏‏‏‏‎‏‎‏‎‏‎‎‏‏‎‏‏‏‏‎‏‏‎‎‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‏‎Switch to accessibility button‎‏‎‎‏‎"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‎‎‏‏‏‏‎‏‎‏‎‏‏‎‏‏‏‎‎‏‎‎‏‏‎‎‎‏‎‎‎‎‎‏‎‎‎‎‎‎‏‏‏‏‎‏‏‎‎‏‏‏‏‎‎Keep triple tap to magnify‎‏‎‎‏‎"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‎‎‎‎‎‎‎‏‏‏‏‎‎‎‎‎‏‏‎‎‎‎‎‏‏‎‎‎‎‏‏‎‏‏‏‎‏‏‏‏‎‏‎‎‎‎‎‎‎‏‏‏‎‎‎‏‎Magnification settings‎‏‎‎‏‎"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‎‏‎‏‎‎‏‎‏‎‎‎‏‏‏‎‎‏‏‏‎‎‏‏‎‏‏‏‏‏‎‎‎‏‏‏‏‎‎‏‎‏‎‎‏‎‏‏‎‎‏‏‎‏‏‏‎Magnify with triple-tap‎‏‎‎‏‎"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‏‎‏‎‏‏‎‎‎‏‎‏‎‏‎‏‏‎‎‎‏‏‏‎‎‎‎‎‎‏‎‎‎‎‏‎‏‎‏‏‏‎‎‏‏‏‎‎‏‏‏‏‎‎‎‎‎Magnify with shortcut‎‏‎‎‏‎"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‏‏‏‏‎‎‏‎‎‏‏‏‏‎‎‎‏‏‎‎‏‎‎‎‎‎‎‎‎‎‎‎‎‏‎‏‏‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎Power button ends call‎‏‎‎‏‎"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‏‏‎‎‎‏‏‎‎‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‎‎‏‎‎‏‏‏‎‏‎‏‎‎‏‏‏‎‏‏‏‎‏‎‎‎‎‎‏‎Large mouse pointer‎‏‎‎‏‎"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‏‎‎‎‏‎‏‏‎‎‏‎‎‏‏‏‏‎‎‎‎‏‎‎‏‏‏‏‏‏‎‏‎‏‎‏‎‏‎‎‏‎‏‏‎‎‎‏‏‎‏‏‎‎‏‎‎Remove animations‎‏‎‎‏‎"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‏‎‎‎‎‎‎‏‎‏‎‎‏‎‎‎‏‎‏‎‏‏‏‏‎‎‎‎‏‎‎‏‏‎‏‏‏‏‎‏‏‎‏‎‎‎‎‏‏‏‎‏‎‏‎Mono audio‎‏‎‎‏‎"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‏‏‏‏‏‎‎‎‏‏‏‏‎‏‎‏‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‏‎‎‏‏‏‏‎Combine channels when playing audio‎‏‎‎‏‎"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‎‏‏‎‏‏‎‏‏‏‎‎‎‎‎‏‎‎‏‏‎‎‏‏‏‏‏‎‏‎‎‏‎‎‎‎‎‎‎‏‏‏‏‏‏‎‎‏‎‏‎‎‎‏‏‏‎Audio balance‎‏‎‎‏‎"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‎‎‎‎‏‎‏‎‎‏‎‎‏‎‎‏‎‎‏‎‎‏‏‎‎‎‏‎‎‏‎‏‎‎‎‏‎‎‏‏‏‏‎‎‏‏‎‎‎‏‏‎‎‎‎‏‎Left‎‏‎‎‏‎"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‏‏‎‎‏‎‎‎‏‏‏‎‎‏‎‎‎‎‏‏‎‎‎‏‏‏‏‎‏‏‏‎‎‎‎‏‎‏‎‏‎‏‏‏‏‎‎‏‏‎‎‎‎‏‏‎‎Right‎‏‎‎‏‎"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‎‏‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‎‎‏‎‏‏‎‏‎‎‎‏‏‏‏‏‎‎‎‏‏‎‏‏‎‏‎‏‏‎‎‎‏‎‏‏‎Mono audio‎‏‎‎‏‎"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‏‏‎‏‏‎‏‏‏‎‎‎‎‎‏‎‎‏‏‏‏‎‏‎‎‏‏‏‎‎‏‏‎‏‏‎‎‏‎‏‎‏‏‎‏‎‏‎‏‏‎‎‎‏‏‏‎Combine channels when playing audio‎‏‎‎‏‎"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‏‎‎‏‎‎‏‎‎‏‏‎‎‏‎‎‎‏‏‎‎‎‎‏‏‎‎‎‎‏‎‏‏‏‎‏‎‎Audio balance‎‏‎‎‏‎"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‎‎‎‎‏‎‎‏‎‏‎‏‎‎‏‎‏‎‏‎‎‏‎‎‎‏‏‏‏‎‎‎‏‎‎‏‏‏‎‏‎‏‏‏‎‏‏‏‎‏‎‏‏‏‏‎‎Left‎‏‎‎‏‎"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎‏‏‏‎‏‎‏‏‎‎‎‏‎‎‎‎‎‎‎‎‏‏‏‏‏‏‎‏‎‎‏‎‏‎‎‎‏‏‏‎‏‎‎‏‏‎‏‎‏‏‎‎‏‏‏‎Right‎‏‎‎‏‎"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‎‏‎‏‏‎‎‎‎‏‏‏‎‎‏‏‎‎‏‎‏‎‏‎‎‎‏‎‎‏‏‏‏‏‏‎‎‏‏‏‏‎‏‎‏‎‎‎‎‏‎‎‏‎‎‎‎Default‎‏‎‎‏‎"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‏‎‎‏‎‏‎‏‏‎‏‎‏‎‎‏‎‏‎‎‎‏‏‎‏‏‏‎‎‎‎‏‏‎‎‏‎‎‏‏‎‎‏‎‎‎‏‏‏‏‎‎‏‎‎10 seconds‎‏‎‎‏‎"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‏‎‎‏‏‎‏‎‎‏‏‎‎‎‎‏‎‎‏‎‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‏‎‏‎‎‎‎‏‏‎‏‏‎‎‎30 seconds‎‏‎‎‏‎"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‎‏‏‏‏‏‎‎‎‎‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‏‏‏‏‎‏‎‎‎‏‏‎‎‏‏‏‎‏‎‏‏‏‏‎‎Notification vibration‎‏‎‎‏‎"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‎‏‎‏‎‏‏‎‎‎‏‏‏‎‏‎‎‎‎‏‏‏‎‎‎‎‏‏‎‎‎‏‎‎‏‏‎‎‏‎‏‎‏‏‏‎‏‏‏‏‎‏‎‏‎Ring vibration‎‏‎‎‏‎"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎‏‏‎‏‎‎‎‏‏‏‎‎‏‏‏‏‏‎‏‎‎‏‏‎‏‏‏‏‎‏‎‎‏‎‎‏‎‎‎‏‏‎‎‏‏‎‎‎‏‎‏‎‏‎‏‎Touch feedback‎‏‎‎‏‎"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‏‎‏‎‏‎‎‎‎‎‎‏‎‎‎‎‎‎‏‎‎‎‏‏‏‏‎‎‏‏‎‎‏‎‎‏‏‎‏‏‏‏‎‎‏‎‏‏‏‎‏‎‏‎‎‎‎Use ‎‏‎‎‏‏‎<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‏‏‎‎‎‏‏‏‎‏‏‏‎‎‏‎‎‎‎‎‏‏‎‏‏‎‎‏‏‏‎‏‏‎‏‎‎‎‎‎‏‏‎‎‏‎‏‎‎‎‎‎‏‎Open ‎‏‎‎‏‏‎<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‏‎‏‏‎‎‎‎‏‎‏‏‎‏‏‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‎‎‏‏‏‎‏‎‏‏‏‏‎‎‎‎‏‎‏‎‎Use color correction‎‏‎‎‏‎"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‎‎‎‎‎‏‏‏‎‏‎‏‏‏‎‏‎‎‎‏‏‎‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‏‏‏‎‏‎‎‏‏‏‎‏‏‏‏‎Show captions‎‏‎‎‏‎"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‏‏‏‎‎‎‎‏‎‎‎‏‏‎‎‏‎‏‏‏‎‎‏‎‎‏‏‎‏‏‎‎‎‎‏‎‏‏‏‎‏‎‏‏‎‎‎For supported app only‎‏‎‎‏‎"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‎‎‎‏‎‎‏‎‏‎‏‏‎‏‎‎‏‏‎‎‎‎‎‎‏‎‏‎‏‎‏‏‎‏‏‏‏‏‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎Use ‎‏‎‎‏‏‎<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‏‎‏‎‎‎‏‏‏‏‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎‎‎‎‎‎‏‏‏‏‎‏‎‏‏‏‏‎‎‏‎‏‎‎‏‎‎Open ‎‏‎‎‏‏‎<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‎‏‏‏‏‏‏‎‎‎‏‏‏‏‎‏‎‏‎‏‎‏‏‎‎‎‏‏‏‎‎‎‏‎‎‎‎‏‎‎‎‎‎‏‏‏‏‏‎‎‏‏‏‎‎‏‏‎‎‎Use color correction‎‏‎‎‏‎"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‎‏‏‏‎‎‏‏‏‏‎‎‎‎‏‎‎‏‏‎‏‎‏‏‏‎‏‏‏‎‎‏‎‏‏‏‎‏‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎Show captions‎‏‎‎‏‎"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‎‎‏‏‏‎‎‎‎‏‏‎‏‏‎‏‏‎‎‏‎‎‏‎‎‎‎‏‏‎‏‎‎‏‏‎‎‏‏‏‏‎‏‏‏‏‏‎‎‏‏‎‏‎‏‎‎For supported app only‎‏‎‎‏‎"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎‏‏‏‎‏‏‏‏‏‏‎‎‎‎‎‏‏‎‏‎‎‏‎‏‏‎‎‏‎‏‏‎‏‏‏‏‎‏‎‏‎‏‏‎‎‏‎‏‎‏‎‏‏‏‏‎Caption size and style‎‏‎‎‏‎"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‏‏‏‏‏‏‎‎‎‏‏‎‏‎‎‏‏‎‏‎‏‎‏‏‏‏‎‏‏‎‏‎‏‏‎‎‎‏‎‎‎‏‎‏‏‎‏‎‎‎‎‎‎‎‎‏‎‎‏‏‎<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>‎‏‎‎‏‏‏‎ text size‎‏‎‎‏‎"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‎‏‎‏‏‎‏‏‎‏‏‎‏‎‏‏‎‏‏‏‎‏‎‎‎‎‎‏‎‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‏‏‎‎‎‎‏‎‎‎More options‎‏‎‎‏‎"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎‎‏‏‎‏‏‎‎‎‎‎‏‎‎‎‏‎‏‎‎‎‏‏‎‎‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‎‏‎‏‏‎Deuteranomaly‎‏‎‎‏‎"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‏‏‎‎‏‎‎‏‏‎‎‎‎‏‎‎‎‏‎‎‎‏‏‎‎‏‏‏‏‎‎‏‏‎‎‎‎‎‏‎‎‎‏‎‎‏‏‏‎‎‎‎‏‎‎Protanomaly‎‏‎‎‏‎"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‏‏‏‏‎‎‏‏‎‎‎‏‏‎‏‎‏‎‎‎‏‎‎‏‎‏‏‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‏‏‎‏‎‏‎‏‎‎‏‎Tritanomaly‎‏‎‎‏‎"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‎‎‎‏‏‏‎‎‎‎‎‎‏‎‎‎‎‎‎‏‏‎‎‏‎‎‎‏‏‏‎‏‏‎‎‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‎‎‏‏‎‎‎Grayscale‎‏‎‎‏‎"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‏‏‏‏‏‏‎‏‏‎‎‎‎‏‎‎‏‏‏‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‏‏‎‎‏‏‏‏‎‎Red-green‎‏‎‎‏‎"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‏‎‏‏‎‎‏‏‎‏‎‏‏‏‏‏‎‎‏‎‎‏‏‏‎‎‏‏‎‎‏‏‎‎‏‎‎‏‎‎‎‎‎‏‎‏‏‎‏‎‏‏‏‎‎‏‎Red-green‎‏‎‎‏‎"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‎‏‎‏‏‏‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‏‏‏‎‎‎‎‏‏‎‎‎‎‏‎‏‎‎‎‏‏‎‏‎‎‎‎‎‏‏‎‎‎‏‏‎Blue-yellow‎‏‎‎‏‎"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‎‏‏‏‎‎‏‎‏‏‎‎‏‎‎‏‎‏‎‎‎‎‎‎‏‎‎‎‏‏‏‎‏‎‎‏‎‏‎‎‎Background restriction‎‏‎‎‏‎"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‏‏‏‏‏‎‏‎‎‎‎‎‏‏‎‎‎‎‎‎‏‎‎‏‎‏‎‏‏‏‎‎‏‎‎‎‏‏‏‏‎‎‏‏‏‎‏‎‎‎‎‎‎‎‎‎‎Allow the app to run in the background‎‏‎‎‏‎"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‎‏‏‏‏‏‏‎‎‏‏‎‏‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‎‎‏‏‏‎‏‏‎‏‏‎‏‎‎‎‏‏‏‎‎‏‎‏‏‎‏‎‎‎App not allowed to run in background‎‏‎‎‏‎"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‏‏‏‎‎‎‏‎‎‎‏‎‏‎‏‏‎‏‏‎‎‎‏‏‎‎‏‏‏‎‏‏‎‏‏‎‎‏‎‎‎‎‎‎‎‏‏‏‎‏‎‏‎Background usage can’t be restricted‎‏‎‎‏‎"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‎‏‏‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‎‏‏‏‏‎‏‎‎‏‏‎‏‏‎‎‎‏‎‎‎‎‏‎‎‏‎‎‎‏‏‏‎‏‏‎Background usage can’t be restricted‎‏‎‎‏‎"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‎‏‏‎‏‏‏‏‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎Limit background activity?‎‏‎‎‏‎"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‎‏‏‎‎‎‎‏‏‏‏‎‎‎‏‏‎‏‎‏‎‏‎‏‏‎‎‎‎‏‏‎‏‏‏‎‏‏‏‎‏‎‏‎‎‏‏‎‎‏‏‏‎If you limit background activity for an app, it may misbehave‎‏‎‎‏‎"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‏‎‏‎‎‏‎‎‏‎‏‎‏‎‎‏‎‎‎‏‏‎‎‎‎‎‏‏‎‎‎‏‏‏‏‏‏‎‎Since this app is not set to optimize battery, you can’t restrict it.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎To restrict the app, first turn on battery optimization.‎‏‎‎‏‎"</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‎‎‏‎‏‏‏‎‎‏‏‏‏‎‏‎‏‎‏‎‎‎‎‏‏‎‏‏‏‏‎‏‎‏‏‏‎‏‏‏‏‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‎Set a schedule‎‏‎‎‏‎"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‏‏‏‎‎‏‏‎‎‏‎‎‏‏‏‎‎‎‎‏‏‏‎‎‏‏‏‏‎‎‎‏‏‏‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‎Extend battery life‎‏‎‎‏‎"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‏‏‏‎‎‏‎‎‎‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‎‏‎‎‏‎‎‎‎‏‏‏‎‎‎‏‏‏‏‎‏‏‏‎Turn off when charged‎‏‎‎‏‎"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‏‏‏‎‏‏‎‏‎‏‎‎‎‏‏‎‎‎‏‎‎‏‎‎‎‏‏‏‏‏‏‎‏‏‏‎‏‏‏‎‎‏‎‎‏‏‎‏‎‏‎‏‎‏‎Battery Saver turns off when your phone is at ‎‏‎‎‏‏‎<xliff:g id="PERCENT">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‎‎‏‎‏‏‎‏‎‎‎‎‎‏‏‎‎‏‎‏‎‎‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‎‎‎‎‎‎‏‎‏‏‏‎‎‎‎Battery Saver turns off when your tablet is at ‎‏‎‎‏‏‎<xliff:g id="PERCENT">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‎‎‎‏‎‎‎‏‎‎‏‏‏‎‎‏‏‏‏‏‏‎‏‏‏‎‎‎‏‎‎‏‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‏‏‏‎‏‎Battery Saver turns off when your device is at ‎‏‎‎‏‏‎<xliff:g id="PERCENT">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‏‏‎‏‏‏‎‎‏‏‏‏‏‎‎‎‎‎‎‎‏‎‎‏‎‎‏‏‎‎‏‎‏‏‎‎‎‎‎‏‏‎‎‎‏‏‏‎‎‎‎‎‎‏‎Battery Saver turns off when your phone charges above ‎‏‎‎‏‏‎<xliff:g id="PERCENT">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‎‎‎‏‏‎‎‏‎‏‎‏‏‏‎‎‎‎‎‏‏‎‎‏‏‎‏‏‎‎‏‎‏‏‎‏‎‎‎‎‎‎‏‎‏‏‎‎‎‏‏‎‎‏‎Battery Saver turns off when your tablet charges above ‎‏‎‎‏‏‎<xliff:g id="PERCENT">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‎‏‏‎‎‎‎‎‏‏‏‎‏‎‏‏‎‎‏‏‏‏‎‏‏‏‎‎‏‏‎‎‎‎‎‏‏‏‏‏‎‎‏‎‎‏‏‎‎‎‎‏‏‏‎Battery Saver turns off when your device charges above ‎‏‎‎‏‏‎<xliff:g id="PERCENT">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‎‏‏‎‏‎‏‏‎‏‏‏‏‎‎‏‎‏‏‎‏‏‎‎‏‏‏‎‎‏‏‎‏‏‎‎‎‏‏‏‎‏‎‎‎‎‏‎‏‏‎‏‎‎‎Turn on‎‏‎‎‏‎"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‏‏‏‏‎‏‎‎‎‏‏‏‏‏‏‎‏‎‏‎‏‎‎‎‏‎‏‏‎‎‏‏‎‎‏‎‏‏‎‏‏‎‎‏‏‎‏‏‏‏‎Reset‎‏‎‎‏‎"</string>
     <string name="tts_play" msgid="2945513377250757221">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‎‎‏‏‏‏‏‎‎‎‎‏‎‎‎‎‏‏‎‎‎‏‎‏‎‎‏‎‏‎‎‏‏‎‎‏‎‏‎Play‎‏‎‎‏‎"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‎‏‏‏‏‎‎‏‏‎‎‏‏‎‏‎‏‏‎‏‎‎‎‏‏‏‏‏‎‎‏‏‎‎‎‎‎‎‎‏‏‎‏‏‏‏‎‎‎‎VPN‎‏‎‎‏‎"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‎‏‏‎‎‎‏‏‎‏‏‏‎‏‎‎‏‏‏‏‎‏‏‏‎‏‏‏‎‏‎‎‎‏‎‏‎‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‎‎‎Adaptive connectivity‎‏‎‎‏‎"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‎‏‎‎‎‏‎‏‏‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‏‎‎‎‏‎‎‎‏‎‎‎‏‏‏‎‏‏‎‏‏‎‎‏‎‏‎Extends battery life and improves device performance by automatically managing your network connections‎‏‎‎‏‎"</string>
     <string name="credentials_title" msgid="7535942196886123656">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‏‎‏‎‏‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‎‎‎‏‏‏‏‎‏‎‏‎‎‎‏‏‎‎‎‏‏‎‏‎‎‏‎‎‎‏‎‎‎‎Credential storage‎‏‎‎‏‎"</string>
     <string name="credentials_install" msgid="3933218407598415827">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‎‎‏‎‏‎‏‏‎‎‏‏‎‎‏‎‏‎‎‏‏‎‏‎‏‏‏‏‎‎‎‏‏‏‎‏‏‏‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎Install a certificate‎‏‎‎‏‎"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‎‎‏‏‎‏‎‎‏‎‏‎‎‏‎‎‏‏‎‎‎‎‎‏‎‎‏‏‎‎‎‎‏‏‏‎‏‎‎‏‎‎‏‎‎‏‏‏‎‏‏‏‎‏‏‏‎Install certificates from storage‎‏‎‎‏‎"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‎‏‎‎‎‎‎‏‎‎‏‏‏‎‏‎‏‎‎‏‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‏‏‎‏‏‎‎‏‎‏‏‏‎User credentials‎‏‎‎‏‎"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‏‎‎‎‎‏‏‎‏‏‎‏‎‏‏‎‎‏‎‏‎‎‎‏‎‎‏‏‏‏‎‏‎‎‏‎‎‏‏‏‎‏‏‏‏‎‏‎‏‎‏‏‎‎‎‎‎View and modify stored credentials‎‏‎‎‏‎"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‎‎‏‏‎‏‎‏‏‏‎‏‏‎‎‎‏‏‎‎‎‏‎‏‏‎‎‏‏‏‏‏‎‎‎‏‎‎‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‎Advanced‎‏‎‎‏‎"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‏‏‏‎‏‎‏‏‎‎‎‏‎‏‎‏‎‏‏‏‎‏‎‎‎‎‏‏‏‏‎‏‎‏‎‏‎‏‏‎‏‎‏‎‏‏‏‎‎‎‏‏‎‎‎‎‎Storage type‎‏‎‎‏‎"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‏‎‏‎‏‎‏‎‎‎‎‎‏‎‎‎‎‏‎‏‏‏‏‎‎‎‏‏‏‏‎‎‎‎‎‎‏‎‎‎Hardware-backed‎‏‎‎‏‎"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‏‎‏‏‏‎‏‏‎‏‎‎‏‏‏‎‎‎‏‎‎‏‎‏‎‎‎‏‎‏‎‏‎‏‎‎‎‎‎‏‏‎‏‎‏‏‏‏‏‎‎‎‏‎‎Software only‎‏‎‎‏‎"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‎‎‏‏‏‏‎‏‎‎‎‏‎‏‎‎‎‎‏‏‎‏‎‏‎‎‏‎‏‎‎‎‏‏‎‎‎‎‎‎‏‎‏‏‎‎‏‏‎‎‎‎‎‎Credentials are not available for this user‎‏‎‎‏‎"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎‏‎‎‏‏‎‏‎‏‎‎‏‏‎‏‎‎‏‎‏‏‏‎‎‏‎‏‏‏‎‎‎‏‎‎‏‏‎‎‎‏‏‏‏‎‎‎‎‎‎Installed for VPN and apps‎‏‎‎‏‎"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‎‎‏‏‏‏‏‏‎‎‏‎‏‎‏‏‎‎‎‎‎‏‎‏‎‎‎‎‏‏‏‎‏‏‎‏‎‏‏‎‏‎‏‎‎‏‏‏‎‏‎‎‎‏‏‎‎Installed for Wi-Fi‎‏‎‎‏‎"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‏‏‏‎‏‏‎‏‎‎‏‎‏‎‎‎‏‏‏‎‏‎‎‎‏‎‎‏‏‎‎‎‏‏‏‎‎‏‎‎‏‎‎‏‏‏‎‎‎‏‎‎‏‏‎‎‎Paying at the terminal‎‏‎‎‏‎"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‏‏‎‏‎‏‏‏‎‎‎‎‎‎‎‏‏‎‎‎‎‎‎‏‎‎‏‎‎‏‏‏‏‎‎‏‎‏‎‏‎‎‏‏‏‏‎‎‎‏‎‏‎‏‎‎‎Set up a payment app. Then just hold the back of your phone up to any terminal with the contactless symbol.‎‏‎‎‏‎"</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‏‏‏‎‎‏‎‏‏‎‏‏‏‎‏‏‏‏‎‎‏‏‏‎‏‏‎‎‏‏‎‏‏‎‎‎‎‏‎‏‏‎‏‏‎‎Got it‎‏‎‎‏‎"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‏‎‏‎‎‎‏‏‏‏‏‎‎‎‏‎‏‏‎‎‏‏‎‎‏‏‎‎‏‏‏‎‎‏‏‎‏‎‎‏‏‏‏‎‏‎‏‎‎‎‏‎‎‎‎‎More...‎‏‎‎‏‎"</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‎‏‏‏‎‎‏‎‏‎‏‏‎‏‎‏‏‎‏‏‎‎‏‏‎‎‎‏‏‏‎‏‎‎‎‎‏‏‎‏‏‎‏‏‎‎‏‏‎‏‏‏‎‎‏‎‎More…‎‏‎‎‏‎"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‎‎‎‏‏‏‎‏‎‎‏‏‏‏‎‎‏‏‎‎‎‏‏‎‎‏‎‏‏‏‎‏‎‏‎‎‏‎‏‏‎‎‏‎‏‎‎‎‏‎‏‎‏‎Set default payment app‎‏‎‎‏‎"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‎‎‏‏‎‏‎‎‎‏‎‏‏‎‏‎‎‎‏‏‎‏‎‏‏‏‏‎‎‏‏‎‎‎‎‏‎‎‏‏‏‎‏‎‎‏‏‏‏‏‏‎‎Update default payment app‎‏‎‎‏‎"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‏‏‏‎‏‎‏‏‎‏‏‎‎‏‏‎‏‎‏‎‏‎‏‎‎‏‏‏‎‎‎‎‏‎‏‏‎‏‎‏‎‎‏‏‎‎‏‎‏‎‎‎‏‎‏‏‎At a contactless terminal, pay with ‎‏‎‎‏‏‎<xliff:g id="APP">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‏‏‎‏‏‏‎‏‎‎‎‎‏‎‏‎‎‎‎‎‏‎‏‏‏‎‏‎‏‎‏‏‏‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‏‎Always use this for calls‎‏‎‎‏‎"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‏‏‏‎‎‎‏‎‏‏‏‏‎‏‎‏‏‎‎‎‏‎‎‎‎‎‎‎‏‏‏‎‏‎‏‏‏‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‎‎‏‎Select a SIM for data‎‏‎‎‏‎"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‎‏‎‎‏‎‏‎‏‎‎‏‎‎‎‎‏‎‏‏‎‎‎‏‎‎‏‏‎‎‏‎‏‎‏‏‎‎‏‎Select a SIM for SMS‎‏‎‎‏‎"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‎‏‏‏‏‎‎‏‏‎‎‎‎‏‏‎‎‎‎‎‎‏‏‏‎‏‎‎‏‏‏‎‎‎Switching data SIM, this may take up to a minute...‎‏‎‎‏‎"</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‎‏‎‏‎‎‎‏‎‏‏‏‏‏‏‎‏‏‏‏‎‎‏‏‎‏‎‏‎‎‏‏‏‏‎‏‎‎‏‎‏‎‏‎‏‎‎‏‏‏‎‎‎‎‎Switching data SIM, this may take up to a minute…‎‏‎‎‏‎"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‏‏‎‎‎‎‏‎‏‎‎‎‎‎‏‎‎‎‏‏‎‏‎‏‏‎‎‏‎‎‏‎‎‏‏‏‏‎‏‎‎‎‎‎‎‎‏‏‎‏‏‎‎‎Call with‎‏‎‎‏‎"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‎‎‎‎‎‏‎‎‎‏‎‎‎‏‏‎‎‏‏‏‎‎‏‎‎‎‎‎‎‏‏‏‎‎‎‎‏‎‎‏‏‏‎‏‎‏‏‏‎‏‎‎‎‏‎‏‎Select a SIM card‎‏‎‎‏‎"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‎‏‎‎‎‎‎‎‎‎‎‎‎‎‎‏‏‎‎‎‎‏‎‏‎‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‏‎‏‎SIM ‎‏‎‎‏‏‎<xliff:g id="CARD_NUMBER">%1$d</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‎‎‎‏‏‏‏‎‏‎‎‏‏‏‎‏‎‏‎‏‎‏‏‎‎‎‎‏‎‏‏‏‎‎‏‏‏‏‏‎‏‎‎routine, schedule, battery saver, power saver, battery, automatic, percent‎‏‎‎‏‎"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‎‎‏‎‎‏‎‎‏‏‎‏‏‎‎‎‎‏‏‎‎‎‎‏‏‏‏‎‎‏‏‎‎‎‎‏‏‎‎‏‏‎‎‏‏‏‏‎‎‏‎‏‎‎‏‎‎volte, advanced calling, 4g calling‎‏‎‎‏‎"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‎‎‏‎‎‎‎‎‏‏‏‎‎‎‎‎‎‏‎‏‎‏‎‏‎‎‎‏‏‎‏‎‎‏‎‏‏‎‏‏‏‏‏‎‎‏‎‏‎‏‏‎‏‏‎‎‎add language, add a language‎‏‎‎‏‎"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‏‎‏‎‏‏‎‎‏‎‎‏‎‎‎‎‏‎‏‎‏‎‏‏‎‎‎‎‏‎‏‏‎‏‏‎‏‎‎‎‏‏‎‎‎‎‎‎‎‏‎‏‏‎‏‎‎text size‎‏‎‎‏‎"</string>
     <string name="default_sound" msgid="6604374495015245195">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‏‎‎‏‏‏‎‏‏‏‎‎‏‏‏‎‎‏‏‏‎‎‏‎‎‏‏‎‏‏‎‎‎‎‏‎‎‎‏‎‎‏‎‏‎‏‏‎‎‎‏‎‏‏‎Default sound‎‏‎‎‏‎"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‎‎‏‏‏‎‎‎‏‏‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‎‎‏‏‎‎‎‎‏‎‎‏‎‎‏‏‎‎‏‎‎‎‎‎‏‎‎‏‎‏‎Ring &amp; notification volume at ‎‏‎‎‏‏‎<xliff:g id="PERCENTAGE">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‏‏‏‏‎‏‎‎‎‏‏‏‏‎‏‎‏‏‏‎‎‎‏‏‏‎‏‎‎‎‎‏‏‎‎‏‏‎‏‎‎‎‏‏‏‎‏‏‏‏‎‎‎‎‎Volume, vibration, Do Not Disturb‎‏‎‎‏‎"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‏‏‎‏‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‏‏‏‏‎‏‎‎‎‎‎‏‎‏‎‎‏‎‏‎‎‎‏‏‏‏‎Power on sounds‎‏‎‎‏‎"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‎‏‏‎‎‎‎‎‏‎‏‎‏‏‎‏‎‎‎‎‎‎‎‎‏‏‎‏‎‏‎‎‏‏‏‎‏‎‏‎‏‎‎‎‏‏‏‏‎‏‏‏‎Live Caption‎‏‎‎‏‎"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‎‏‏‏‎‎‏‎‏‎‏‏‏‏‎‏‎‎‏‏‏‎‏‏‏‏‎‏‏‏‎‏‎‎‏‎‎‏‏‏‏‎‎‎‎‎‎‏‏‎‏‎‎‎‏‎Automatically caption media‎‏‎‎‏‎"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‎‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‎‎‏‏‎‎‎‎‎‏‎‎‏‏‎‏‎‎‎‎‏‏‏‎‎‏‎‎‏‎‎‏‏‏‎‏‎None‎‏‎‎‏‎"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‏‎‎‎‏‎‎‎‏‏‎‏‏‏‎‎‎‏‏‎‎‎‎‏‏‏‏‎‏‎‏‎‎‏‎‎‏‏‎‏‏‏‏‎‏‏‎‏‎‏‏‏‏‏‎‎‎‏‎‎‏‏‎<xliff:g id="ON_COUNT">%d</xliff:g>‎‏‎‎‏‏‏‎ schedules set‎‏‎‎‏‎</item>
-      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‏‎‎‎‏‎‎‎‏‏‎‏‏‏‎‎‎‏‏‎‎‎‎‏‏‏‏‎‏‎‏‎‎‏‎‎‏‏‎‏‏‏‏‎‏‏‎‏‎‏‏‏‏‏‎‎1 schedule set‎‏‎‎‏‎</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‏‏‎‏‎‏‎‏‏‎‏‏‎‎‏‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‎‎‎‎‏‏‏‏‏‎‏‎‎‏‏‏‏‏‏‎‎‎‎‏‎None‎‏‎‎‏‎}=1{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‏‏‎‏‎‏‎‏‏‎‏‏‎‎‏‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‎‎‎‎‏‏‏‏‏‎‏‎‎‏‏‏‏‏‏‎‎‎‎‏‎1 schedule set‎‏‎‎‏‎}other{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‏‏‎‏‎‏‎‏‏‎‏‏‎‎‏‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‎‎‎‎‏‏‏‏‏‎‏‎‎‏‏‏‏‏‏‎‎‎‎‏‎# schedules set‎‏‎‎‏‎}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‎‏‏‏‏‎‎‏‎‏‎‏‏‎‏‎‏‏‏‎‎‏‎‎‏‏‏‎‏‏‎‎‏‎‎‏‎‎‎‏‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‏‎Do Not Disturb‎‏‎‎‏‎"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‏‎‏‎‏‎‏‏‏‎‏‎‎‏‎‏‏‎‎‎‎‎‎‏‏‏‏‏‏‎‏‏‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‏‏‏‎Only get notified by important people and apps‎‏‎‎‏‎"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‎‎‏‏‎‏‏‏‎‏‏‎‏‏‏‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‎‏‏‏‏‎‎‏‎‏‎‎‎‎‎‎‎‎‎‎Limit interruptions‎‏‎‎‏‎"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‎‏‎‏‏‏‎‏‎‏‎‎‏‏‏‏‏‎‎‏‏‎‏‏‎‏‏‎‏‏‏‎‎‎‏‏‎‏‏‎‏‎‎‏‏‏‏‎‏‎‎‎‏‎‎‎‎Priority only‎‏‎‎‏‎"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‎‏‎‏‎‏‏‏‏‎‎‎‎‎‏‏‏‎‏‏‏‎‏‏‎‎‏‏‏‏‏‏‎‏‎‎‏‏‎‏‏‎‏‎‎‎‎‏‏‏‏‏‎‎‏‎‎‏‏‎<xliff:g id="ZEN_MODE">%1$s</xliff:g>‎‏‎‎‏‏‏‎. ‎‏‎‎‏‏‎<xliff:g id="EXIT_CONDITION">%2$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‎‏‎‏‎‎‏‏‏‎‏‎‏‏‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‎‏‏‏‎‏‎‎‏‎‏‎‎‎‏‎‏‏‎‎‏‏‎‎‏‏‎On / ‎‏‎‎‏‏‎<xliff:g id="ID_1">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‎‏‏‎‏‎‎‎‎‎‎‏‏‏‏‎‎‎‏‎‎‏‎‏‎‎‎‎‏‏‎‏‎‏‏‏‎‏‏‎‏‎‎‏‎‎‎‏‎‎‏‏‎‎‎‎Off / ‎‏‎‎‏‏‎<xliff:g id="ID_1">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‏‎‎‏‎‏‏‎‏‎‏‎‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‏‏‎‎‏‏‎‏‏‎‏‎‎‎‎‏‎‎‎‎‏‏‏‏‎‎‎‎‏‎Off‎‏‎‎‏‎"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‎‏‎‎‏‎‏‎‎‏‎‏‏‎‎‏‏‎‏‎‎‏‎‏‏‎‏‏‎‎‏‎‎‏‎‎‏‎‎‎‏‎‎‏‏‎‎‏‎‏‏‎On‎‏‎‎‏‎"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‎‎‏‏‏‎‏‎‎‏‎‏‏‏‎‏‎‎‎‏‎‏‎‏‎‏‏‎‎‏‏‎‏‎‏‏‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‎‏‎Ask every time‎‏‎‎‏‎"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‎‎‏‏‎‎‏‎‏‎‎‏‎‎‎‎‏‎‏‏‏‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‎‏‎‏‎‏‏‎‎‎‎‏‏‏‎‎Until you turn off‎‏‎‎‏‎"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‏‏‏‏‏‎‎‏‏‏‏‎‎‏‎‎‏‎‏‎‏‎‎‏‏‎‏‏‏‎‏‎‏‏‏‏‎‎‏‎‏‎‎‏‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‎‎‏‏‎<xliff:g id="NUM_HOURS">%d</xliff:g>‎‏‎‎‏‏‏‎ hours‎‏‎‎‏‎</item>
-      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‏‏‏‏‏‎‎‏‏‏‏‎‎‏‎‎‏‎‏‎‏‎‎‏‏‎‏‏‏‎‏‎‏‏‏‏‎‎‏‎‏‎‎‏‏‎‏‏‏‎‎‎‏‎‎‎‎1 hour‎‏‎‎‏‎</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‎‎‏‏‏‎‏‎‏‏‏‎‏‏‏‏‎‏‏‏‏‎‎‏‏‏‏‎‎‏‏‏‏‏‏‎‏‎‏‎‏‎‎‏‏‎‎‎‏‏‏‏‏‎‎‎‎‎‏‎‎‏‏‎<xliff:g id="NUM_MINUTES">%d</xliff:g>‎‏‎‎‏‏‏‎ minutes‎‏‎‎‏‎"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‏‏‏‎‏‎‎‏‎‎‏‏‎‎‎‏‏‏‎‏‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‏‏‎‏‏‎‎‎‏‎‎‏‎‏‎‏‏‎‏‎‎‎‎‏‎‎‏‏‎<xliff:g id="ON_COUNT">%d</xliff:g>‎‏‎‎‏‏‏‎ schedules can turn on automatically‎‏‎‎‏‎</item>
-      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‏‏‏‎‏‎‎‏‎‎‏‏‎‎‎‏‏‏‎‏‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‏‏‎‏‏‎‎‎‏‎‎‏‎‏‎‏‏‎‏‎‎‎1 schedule can turn on automatically‎‏‎‎‏‎</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‎‏‏‏‏‏‎‏‏‎‎‏‏‏‎‏‎‏‏‎‏‏‏‎‎‏‎‎‏‎‏‎‎‏‎‏‎‏‏‎‎‎‎‏‎‏‎‎‎1 hour‎‏‎‎‏‎}other{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‎‏‏‏‏‏‎‏‏‎‎‏‏‏‎‏‎‏‏‎‏‏‏‎‎‏‎‎‏‎‏‎‎‏‎‏‎‏‏‎‎‎‎‏‎‏‎‎‎# hours‎‏‎‎‏‎}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‏‏‎‏‏‎‏‎1 minute‎‏‎‎‏‎}other{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‏‏‎‏‏‎‏‎# minutes‎‏‎‎‏‎}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‎‎‎‎‏‎‎‎‎‎‎‎‎‎‎‏‏‎‎‏‎‏‏‎‎‎‎‏‎‎‏‎‏‏‎‎‎‏‎‏‏‎‎‏‎‎‏‎‏‎‏‏‎‎‎Off‎‏‎‎‏‎}=1{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‎‎‎‎‏‎‎‎‎‎‎‎‎‎‎‏‏‎‎‏‎‏‏‎‎‎‎‏‎‎‏‎‏‏‎‎‎‏‎‏‏‎‎‏‎‎‏‎‏‎‏‏‎‎‎Off / 1 schedule can turn on automatically‎‏‎‎‏‎}other{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‎‎‎‎‏‎‎‎‎‎‎‎‎‎‎‏‏‎‎‏‎‏‏‎‎‎‎‏‎‎‏‎‏‏‎‎‎‏‎‏‏‎‎‏‎‎‏‎‏‎‏‏‎‎‎Off / # schedules can turn on automatically‎‏‎‎‏‎}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‎‎‏‏‎‏‎‏‎‎‏‏‏‏‏‎‏‎‏‎‏‎‏‏‎‎‏‎‎‎‏‏‎‏‎‏‎‏‎‏‎‎‎‎‏‏‎‎‎‎‎‏‎‏‏‎What can interrupt Do Not Disturb‎‏‎‎‏‎"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‎‏‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‏‏‎‏‎‎‏‎‏‎‎‎‎‎‎‎‎‎‏‎‏‎‎‎‏‏‎‏‏‏‎People‎‏‎‎‏‎"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‎‎‏‏‎‎‏‏‎‏‎‏‏‎‎‎‏‏‏‏‎‏‏‎‏‏‎‏‎‏‏‏‎‏‏‎‏‎‏‏‏‎‏‏‏‏‎‏‏‏‎‏‎‏‎‏‎Apps‎‏‎‎‏‎"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‏‎‎‎‎‎‎‏‏‎‎‏‏‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‎‏‎‏‏‎‎‏‎‏‏‎‏‏‎‏‏‎‏‎‎‏‎‎‎‎‏‎Automatically set lower priority notifications to Gentle‎‏‎‎‏‎"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‎‏‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‏‏‏‎‎‏‏‎‎‎‎‎‎‎‎‏‎‏‎‎‎‎‏‎‎‏‏‎‏‏‎‏‎Adaptive notification ranking‎‏‎‎‏‎"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‏‏‏‏‎‎‏‎‎‎‏‎‏‎‏‏‎‏‎‎‎‎‏‏‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‎‎‏‏‎‏‎‎Automatically rank notifications by relevance‎‏‎‎‏‎"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‏‏‏‏‏‎‏‏‎‏‎‎‏‏‎‏‏‎‏‎‎‎‏‏‏‎‎‏‎‏‏‎‏‏‏‏‎‏‏‏‏‎‎‏‏‎‎‏‎‏‏‎‏‎‎Adaptive notification feedback‎‏‎‎‏‎"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‎‏‏‎‏‎‎‏‎‎‏‏‎‏‎‏‎‎‏‎‎‏‎‏‎‎‎‏‎‏‏‎‏‏‎‎‎‏‎‎‎‏‏‎‏‎‏‏‏‏‏‏‎‎‎Indicate adjustments made to notifications and show the option to provide feedback to the system‎‏‎‎‏‎"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‏‎‏‎‏‎‎‏‏‎‎‎‎‏‎‎‏‏‏‎‏‏‎‏‏‏‏‏‏‎‎‏‏‏‏‏‏‎‏‏‏‏‎‏‏‏‎‏‏‎‎‎‏‎Suggested actions and replies‎‏‎‎‏‎"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‏‏‎‎‎‏‏‎‏‏‎‎‎‎‏‎‏‏‏‎‏‎‎‏‎‏‏‎‏‎‏‏‏‎‎‎‏‎‎‎‏‏‎‎‏‏‏‎‎‎‏‎‏‏‏‏‎Automatically show suggested actions &amp; replies‎‏‎‎‏‎"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‏‎‏‏‎‎‎‎‎‏‎‏‎‎‏‎‎‏‏‏‎‏‎‏‎‏‎‏‎‏‏‎‎‏‎‏‏‎‏‎‏‏‎‏‎‎‎‎‎‎‏‏‎‎‎Show recent and snoozed notifications‎‏‎‎‏‎"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‏‎‏‎‏‏‏‎‎‏‏‏‏‏‎‎‎‏‏‎‎‏‏‎‎‏‏‏‏‎‏‏‎‎‏‏‏‎‏‎‏‏‏‎‏‎‎‎‎‎‎‎‎‏‎‏‎Do Not Disturb access‎‏‎‎‏‎"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‎‎‎‏‏‏‏‎‏‏‎‏‏‎‎‎‏‏‎‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‎‏‎‏‎‏‏‎‎‎‏‎‏‏‏‎‎‎‏‎Allow Do Not Disturb‎‏‎‎‏‎"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‎‏‏‏‎‏‎‎‏‏‏‏‏‎‏‎‏‏‏‎‎‏‏‎‎‎‎‎‏‏‏‏‏‎‏‎‎‎‎‎‏‎‎‏‎‏‎‏‎‏‎‏‏‎‎‎‎No installed apps have requested Do Not Disturb access‎‏‎‎‏‎"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‎‏‏‏‏‎‏‎‏‎‏‎‎‏‏‏‎‎‏‎‏‏‎‏‏‎‎‏‏‎‎‎‎‎‎‎‏‎‎‎‏‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎Loading apps...‎‏‎‎‏‎"</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‎‏‎‎‏‏‎‎‎‏‎‎‏‎‎‏‏‎‎‏‏‎‎‎‎‎‏‏‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‏‎‏‎‎‎‏‎‎‏‎Loading apps…‎‏‎‎‏‎"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‏‏‎‎‎‏‏‎‏‏‎‎‎‎‏‏‏‏‏‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‏‏‎‎‎‏‏‏‎‏‏‏‏‎‏‎At your request, Android is blocking this app\'s notifications from appearing on this device‎‏‎‎‏‎"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‎‏‎‎‏‎‎‎‎‏‎‏‎‎‏‎‎‎‎‏‏‏‎‎‎‎‏‏‎‏‎‏‏‏‎‏‏‎‏‏‏‏‎‎‎‎‏‏‎‏‎‎‎‎‎At your request, Android is blocking this category of notifications from appearing on this device‎‏‎‎‏‎"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‎‏‏‏‏‎‏‏‏‏‎‏‏‎‏‏‎‎‎‎‎‎‎‏‏‏‏‎‎‎‎‎‎‎‎‏‏‎‎‏‎‏‏‏‎‎‎‎‎‎At your request, Android is blocking this group of notifications from appearing on this device‎‏‎‎‏‎"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‏‎‏‎‏‏‎‎‎‏‏‎‏‎‎‏‎‏‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‎‎‎‏‎‎‏‎‏‎All conversations‎‏‎‎‏‎"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎‏‎‏‎‏‎‎‎‎‎‎‎‎‏‏‎‏‏‏‏‎‎‎‏‎‏‏‏‎‏‎‎‎‏‏‎‏‎‏‏‎‏‎‏‏‎‎‏‎‎‎‎‏‎‏‎Priority conversations‎‏‎‎‏‎"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‎‏‏‏‎‏‏‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‎‏‏‏‎‏‎‏‎‏‏‎‎‏‎‏‏‏‎‎‏‎‎‏‎‎‏‏‏‏‎‏‎None‎‏‎‎‏‎"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‏‏‎‏‎‏‏‎‏‎‎‏‎‎‎‏‎‏‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‎‏‎‎‎‏‏‏‎‏‎‏‎‎‎‎‎‏‎‎‏‎‎‏‏‎<xliff:g id="CONVERSATIONS">%d</xliff:g>‎‏‎‎‏‏‏‎ conversations‎‏‎‎‏‎</item>
-      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‏‏‎‏‎‏‏‎‏‎‎‏‎‎‎‏‎‏‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‎‏‎‎‎‏‏‏‎‏‎‏‎‎‎‎‎‏‎1 conversation‎‏‎‎‏‎</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‎‏‏‎‎‏‏‎‏‏‎‏‎‎‏‏‎‎‏‏‎‎‎‎‎‎‎‏‏‎‏‏‏‏‏‎‏‏‎‎‏‏‏‎‏‎‎‎‏‎‏‏‏‏‎None‎‏‎‎‏‎"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‎‏‏‎‎‏‏‎‎‎‏‏‏‏‎‎‎‎‏‎‎‏‏‎‏‏‏‎‎‏‏‎‏‏‏‎‏‎‎‎‎‎‎‎‏‏‎‎‏‎‎‏‎‎‎‏‎None‎‏‎‎‏‎}=1{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‎‏‏‎‎‏‏‎‎‎‏‏‏‏‎‎‎‎‏‎‎‏‏‎‏‏‏‎‎‏‏‎‏‏‏‎‏‎‎‎‎‎‎‎‏‏‎‎‏‎‎‏‎‎‎‏‎1 conversation‎‏‎‎‏‎}other{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‎‏‏‎‎‏‏‎‎‎‏‏‏‏‎‎‎‎‏‎‎‏‏‎‏‏‏‎‎‏‏‎‏‏‏‎‏‎‎‎‎‎‎‎‏‏‎‎‏‎‎‏‎‎‎‏‎# conversations‎‏‎‎‏‎}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‏‎‎‏‎‏‎‎‎‏‏‏‎‏‏‎‎‎‏‏‎‏‏‎‎‏‏‏‎‏‏‎‏‏‏‎‏‎‏‎‎‎‎‎‎‎‏‎‏‎‎‏‏‏‏‎‎Who can interrupt‎‏‎‎‏‎"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‏‎‏‏‎‎‎‏‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‏‏‎‎‏‎‏‏‎‏‎‎‏‎‏‏‏‏‎‏‎‏‎‎‏‎‏‎‏‏‎‎‎Calls‎‏‎‎‏‎"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‏‎‏‎‏‏‏‎‎‏‎‏‎‏‎‎‎‏‏‏‎‎‏‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‏‏‎‎‎‏‎‎‏‏‏‎‏‏‏‎Calls‎‏‎‎‏‎"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‏‏‎‏‏‏‏‎‎‎‏‎‎‎‎‏‏‏‎‏‏‎‏‏‏‎‏‎‎‎‏‏‏‏‎‏‎‎‎‎‎‎‏‎‎‎‏‏‏‏‏‏‏‎‏‏‎To make sure allowed calls make sound, check that device is set to ring‎‏‎‎‏‎"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‏‎‎‎‎‎‎‎‎‏‎‎‎‎‎‎‏‎‎‎‎‏‎‏‏‏‏‏‏‎‎‎‏‎‎‎‏‏‏‏‎‎‏‏‎‏‎‏‎‎‎‏‏‏‎‏‎For ‘‎‏‎‎‏‏‎<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎’ incoming calls are blocked. You can adjust settings to allow your friends, family, or other contacts to reach you.‎‏‎‎‏‎"</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‎‏‎‏‏‎‎‏‏‏‎‏‏‏‏‎‎‏‎‎‎‎‎‏‏‏‎‏‎‎‏‎‎‏‎‎‏‎‏‎Starred contacts‎‏‎‎‏‎"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‎‏‎‏‏‎‎‎‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‎‏‎‏‏‎‏‏‎‏‏‎‏‎‏‎‏‎‎‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‏‎<xliff:g id="NUM_PEOPLE">%d</xliff:g>‎‏‎‎‏‏‏‎ others‎‏‎‎‏‎</item>
-      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‎‏‎‏‏‎‎‎‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‎‏‎‏‏‎‏‏‎‏‏‎‏‎‏‎‏‎‎‎‏‏‏‏‏‏‏‏‎‏‎1 other‎‏‎‎‏‎</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‏‏‎‏‏‏‏‏‏‎‏‎‎‏‎‎‏‏‏‎‏‏‏‎‏‎‎‎‏‎‎‏‎‏‏‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‎‎None‎‏‎‎‏‎"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‏‎‎‏‏‏‎‏‎‎‎‎‎‏‏‏‏‏‎‎‎‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‎‏‏‎‏‏‎‎‏‏‎‏‏‏‎‏‏‎‎None‎‏‎‎‏‎}=1{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‏‎‎‏‏‏‎‏‎‎‎‎‎‏‏‏‏‏‎‎‎‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‎‏‏‎‏‏‎‎‏‏‎‏‏‏‎‏‏‎‎‎‏‎‎‏‏‎{contact_1}‎‏‎‎‏‏‏‎‎‏‎‎‏‎}=2{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‏‎‎‏‏‏‎‏‎‎‎‎‎‏‏‏‏‏‎‎‎‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‎‏‏‎‏‏‎‎‏‏‎‏‏‏‎‏‏‎‎‎‏‎‎‏‏‎{contact_1}‎‏‎‎‏‏‏‎ and ‎‏‎‎‏‏‎{contact_2}‎‏‎‎‏‏‏‎‎‏‎‎‏‎}=3{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‏‎‎‏‏‏‎‏‎‎‎‎‎‏‏‏‏‏‎‎‎‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‎‏‏‎‏‏‎‎‏‏‎‏‏‏‎‏‏‎‎‎‏‎‎‏‏‎{contact_1}‎‏‎‎‏‏‏‎, ‎‏‎‎‏‏‎{contact_2}‎‏‎‎‏‏‏‎, and ‎‏‎‎‏‏‎{contact_3}‎‏‎‎‏‏‏‎‎‏‎‎‏‎}other{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‏‎‎‏‏‏‎‏‎‎‎‎‎‏‏‏‏‏‎‎‎‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‎‏‏‎‏‏‎‎‏‏‎‏‏‏‎‏‏‎‎‎‏‎‎‏‏‎{contact_1}‎‏‎‎‏‏‏‎, ‎‏‎‎‏‏‎{contact_2}‎‏‎‎‏‏‏‎, and # others‎‏‎‎‏‎}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‎‎‎‏‎‎‎‏‏‎‎‏‏‎‏‏‎‏‎‎‏‎‎‏‏‏‎‏‏‏‎‎‏‎‏‏‎‏‏‎‎‏‏‎‎‏‏‎‎‏‏‎‎‏‎Messages‎‏‎‎‏‎"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‎‏‏‏‏‎‏‏‎‏‎‏‏‎‏‎‎‎‏‏‎‎‏‏‏‎‏‎‎‎‏‎‏‎‎‏‏‎‎‎‎‏‏‎‎‏‎‎‎‏‏‎‏‎‎messages‎‏‎‎‏‎"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‏‎‏‎‏‎‏‏‎‏‎‎‏‏‎‎‎‏‏‏‎‎‎‎‎‏‏‎‎‎‎‏‏‎‎‏‏‎‏‎‎‎‏‎‏‎‏‏‏‎‎‎‎‏‎‏‎Messages‎‏‎‎‏‎"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‏‎‏‎‏‏‏‎‏‏‏‎‏‎‏‎‎‎‏‎‎‎‏‏‏‏‏‎‎‏‎‏‏‏‏‏‏‎‎‏‎‎‏‏‎‏‏‏‎‏‏‏‎‎For ‘‎‏‎‎‏‏‎<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎’ incoming messages are blocked. You can adjust settings to allow your friends, family, or other contacts to reach you.‎‏‎‎‏‎"</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‎‎‏‎‎‎‎‎‏‏‏‏‎‎‎‏‏‎‏‏‎‏‏‏‎‎‏‏‎‎‎‏‏‏‎‎‎‎‏‎‎‎‎‏‎‎‎‎‎‎‏‎‏‎‏‎‎All messages can reach you‎‏‎‎‏‎"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‏‎‏‎‏‎‏‏‏‏‏‎‎‎‏‎‎‏‏‏‏‏‎‎‏‎‎‏‏‎‎‏‏‎‎‎‏‎‎‏‎‏‎‏‎‎‎‏‏‏‎‏‎‎All calls can reach you‎‏‎‎‏‎"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‎‎‎‏‏‏‏‏‏‎‏‎‏‎‎‎‏‎‏‏‎‎‏‏‎‎‏‏‎‏‏‏‎‎‎‎‎‎‏‎‏‎‎‏‎‎‏‏‏‏‏‏‎‏‎None‎‏‎‎‏‎"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‏‎‏‏‎‎‎‏‏‎‎‏‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‎‎‎‏‎‎‎‎‏‏‎‏‏‎‏‏‏‎‏‎‎‏‎‎‏‏‎<xliff:g id="NUM_CONTACTS">%d</xliff:g>‎‏‎‎‏‏‏‎ contacts‎‏‎‎‏‎</item>
-      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‏‎‏‏‎‎‎‏‏‎‎‏‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‎‎‎‏‎‎‎‎‏‏‎‏‏‎‏‏‏‎‏‎1 contact‎‏‎‎‏‎</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‏‎‏‎‎‎‎‏‏‏‎‏‏‏‎‏‎‏‎‏‎‎‎‏‏‏‎‎‏‏‏‎‎‏‎‎‏‎‎‏‎‏‎‎‏‎‎‏‎‏‎‏‏‏‎None‎‏‎‎‏‎}=1{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‏‎‏‎‎‎‎‏‏‏‎‏‏‏‎‏‎‏‎‏‎‎‎‏‏‏‎‎‏‏‏‎‎‏‎‎‏‎‎‏‎‏‎‎‏‎‎‏‎‏‎‏‏‏‎1 contact‎‏‎‎‏‎}other{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‏‎‏‎‎‎‎‏‏‏‎‏‏‏‎‏‎‏‎‏‎‎‎‏‏‏‎‎‏‏‏‎‎‏‎‎‏‎‎‏‎‏‎‎‏‎‎‏‎‏‎‏‏‏‎# contacts‎‏‎‎‏‎}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‏‎‎‏‎‎‎‎‏‏‏‎‎‎‎‏‏‏‎‎‎‏‏‏‎‏‏‏‏‎‏‎‏‎‏‎‎‏‏‏‎‎‎‏‎‏‎‎‎‏‏‏‏‎‎Anyone‎‏‎‎‏‎"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎‏‏‏‏‏‏‎‎‏‏‎‎‎‎‎‏‎‎‎‎‎‎‎‎‎‏‏‎‎‎‏‎‎‏‎‎‎‏‏‎‏‎‎‏‎‏‎‎‏‏‏‎‎‏‎‎Contacts‎‏‎‎‏‎"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‎‏‎‎‎‎‎‎‎‏‎‎‎‎‏‏‏‏‎‎‎‏‎‏‎‏‎‏‎‏‎‎‎‎‏‏‏‎‏‏‏‎‏‎‎‎‏‏‏‏‏‏‎Starred contacts‎‏‎‎‏‎"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‎‎‎‎‏‎‏‏‎‏‏‎‎‎‏‎‎‏‎‏‏‏‎‎‏‏‏‏‏‎‎‎‎‎‏‏‏‎‏‏‎‎‏‏‎‎‏‎‏‎‎‎‎‎‎All notifications‎‏‎‎‏‎"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‏‏‎‎‎‏‎‏‎‏‎‏‎‏‏‏‎‎‏‏‎‏‏‎‏‎‎‎‎‎‏‏‏‎‏‏‎‏‏‎‎‏‏‎‎‏‏‎‏‏‎‏‎‏‏‎‎Some notifications‎‏‎‎‏‎"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‎‏‏‎‎‎‎‏‎‏‏‎‏‏‎‎‎‏‎‏‏‏‎‎‎‏‏‏‏‎‎‏‎‎‎‎‏‎‎‏‏‎‏‏‎‎‎‎‎‏‏‏‏‎‎‎Selected people can still reach you, even if you don’t allow apps to interrupt‎‏‎‎‏‎"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‏‎‎‎‎‎‏‎‎‏‏‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‎‎‎‎‎‏‏‏‏‎‎‎‎‏‎‎‏‏‎<xliff:g id="APP_NAMES">%s</xliff:g>‎‏‎‎‏‏‏‎ can interrupt‎‏‎‎‏‎</item>
-      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‏‎‎‎‎‎‏‎‎‏‏‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‎‎‎‎‎‏‏‏‏‎‎‎‎‏‎‎‏‏‎<xliff:g id="APP_NAME_0">%s</xliff:g>‎‏‎‎‏‏‏‎ can interrupt‎‏‎‎‏‎</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‏‏‏‏‎‎‏‎‎‎‏‏‎‏‎‏‎‎‏‏‎‏‎‏‏‏‎‎‏‏‏‎‏‏‎‏‎‎‎‏‎‏‎‎‎‏‎‎‏‏‏‏‏‏‎‏‎‎‏‎‎‏‏‎<xliff:g id="NUMBER">%d</xliff:g>‎‏‎‎‏‏‏‎ more‎‏‎‎‏‎"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‏‏‏‏‎‏‎‎‏‏‏‏‏‎‎‎‏‏‏‎‏‏‏‎‏‎‏‏‎‎‎‎‎‎‏‏‏‏‎‏‏‎‏‎‎‏‎‎‎‎‏‎‏‏‎‎No apps can interrupt‎‏‎‎‏‎}=1{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‏‏‏‏‎‏‎‎‏‏‏‏‏‎‎‎‏‏‏‎‏‏‏‎‏‎‏‏‎‎‎‎‎‎‏‏‏‏‎‏‏‎‏‎‎‏‎‎‎‎‏‎‏‏‎‎‎‏‎‎‏‏‎{app_1}‎‏‎‎‏‏‏‎ can interrupt‎‏‎‎‏‎}=2{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‏‏‏‏‎‏‎‎‏‏‏‏‏‎‎‎‏‏‏‎‏‏‏‎‏‎‏‏‎‎‎‎‎‎‏‏‏‏‎‏‏‎‏‎‎‏‎‎‎‎‏‎‏‏‎‎‎‏‎‎‏‏‎{app_1}‎‏‎‎‏‏‏‎ and ‎‏‎‎‏‏‎{app_2}‎‏‎‎‏‏‏‎ can interrupt‎‏‎‎‏‎}=3{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‏‏‏‏‎‏‎‎‏‏‏‏‏‎‎‎‏‏‏‎‏‏‏‎‏‎‏‏‎‎‎‎‎‎‏‏‏‏‎‏‏‎‏‎‎‏‎‎‎‎‏‎‏‏‎‎‎‏‎‎‏‏‎{app_1}‎‏‎‎‏‏‏‎, ‎‏‎‎‏‏‎{app_2}‎‏‎‎‏‏‏‎, and ‎‏‎‎‏‏‎{app_3}‎‏‎‎‏‏‏‎ can interrupt‎‏‎‎‏‎}other{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‏‏‏‏‎‏‎‎‏‏‏‏‏‎‎‎‏‏‏‎‏‏‏‎‏‎‏‏‎‎‎‎‎‎‏‏‏‏‎‏‏‎‏‎‎‏‎‎‎‎‏‎‏‏‎‎‎‏‎‎‏‏‎{app_1}‎‏‎‎‏‏‏‎, ‎‏‎‎‏‏‎{app_2}‎‏‎‎‏‏‏‎, and # more can interrupt‎‏‎‎‏‎}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‎‎‏‎‎‏‏‎‎‎‏‏‏‏‎‎‎‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‏‎‎‏‏‎‏‏‎Apps‎‏‎‎‏‎"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‏‎‎‎‎‏‎‏‏‏‎‏‏‎‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‎‏‎‏‏‎‏‏‎‏‎‎‎‎‏‏‏‎‏‎‏‏‏‎‎‎All notifications‎‏‎‎‏‎"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‎‎‎‎‏‎‎‏‏‎‏‎‏‏‏‎‏‎‎‎‏‏‎‎‎‎‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‎‎‏‏‏‏‏‎‏‎‏‎Some notifications‎‏‎‎‏‎"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‏‎‏‎‏‎‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‏‏‎‎‏‎‎‎‎‎‎‎‏‎‎‎‎‏‏‏‎‏‎‎‎‏‏‎‏‏‎‏‎Notifications that can interrupt‎‏‎‎‏‎"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‎‏‎‎‏‏‎‏‏‎‎‏‏‏‎‏‏‎‏‏‎‏‏‎‎‏‏‏‏‏‏‎‏‎‏‏‎‏‏‎‎‎Allow all notifications‎‏‎‎‏‎"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‎‎‏‏‏‎‏‏‏‎‏‎‏‏‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‏‏‏‏‏‎‏‎‏‏‎‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‏‎<xliff:g id="SOUND_CATEGORIES">%s</xliff:g>‎‏‎‎‏‏‏‎ can interrupt‎‏‎‎‏‎</item>
-      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‎‎‏‏‏‎‏‏‏‎‏‎‏‏‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‏‏‏‏‏‎‏‎‏‏‎‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‏‎<xliff:g id="SOUND_CATEGORY">%s</xliff:g>‎‏‎‎‏‏‏‎ can interrupt‎‏‎‎‏‎</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‎‏‎‎‎‎‏‎‏‎‏‏‏‎‏‏‏‎‎‏‎‏‎‏‏‎‏‎‏‎‏‎‏‏‎‏‎‎‏‏‎‏‏‎‎‏‏‎‎‎‏‏‏‎‎Nothing can interrupt‎‏‎‎‏‎"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‎‎‎‎‏‏‏‎‎‎‎‎‎‏‏‏‏‎‎‎‎‎‏‎‎‏‎‏‏‏‏‎‏‎‏‏‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‎‎‏‎‎‏‏‎<xliff:g id="NUMBER">%d</xliff:g>‎‏‎‎‏‏‏‎ more‎‏‎‎‏‎"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‎‎‎‎‏‏‏‎‏‎‏‏‏‏‎‎‏‎‎‏‎‎‎‎‎‏‎‏‏‎‏‏‏‏‏‏‎‎‏‎‏‏‏‎‎‏‎‏‎‎‎‎Nothing can interrupt‎‏‎‎‏‎}=1{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‎‎‎‎‏‏‏‎‏‎‏‏‏‏‎‎‏‎‎‏‎‎‎‎‎‏‎‏‏‎‏‏‏‏‏‏‎‎‏‎‏‏‏‎‎‏‎‏‎‎‎‎‎‏‎‎‏‏‎{sound_category_1}‎‏‎‎‏‏‏‎ can interrupt‎‏‎‎‏‎}=2{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‎‎‎‎‏‏‏‎‏‎‏‏‏‏‎‎‏‎‎‏‎‎‎‎‎‏‎‏‏‎‏‏‏‏‏‏‎‎‏‎‏‏‏‎‎‏‎‏‎‎‎‎‎‏‎‎‏‏‎{sound_category_1}‎‏‎‎‏‏‏‎ and ‎‏‎‎‏‏‎{sound_category_2}‎‏‎‎‏‏‏‎ can interrupt‎‏‎‎‏‎}=3{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‎‎‎‎‏‏‏‎‏‎‏‏‏‏‎‎‏‎‎‏‎‎‎‎‎‏‎‏‏‎‏‏‏‏‏‏‎‎‏‎‏‏‏‎‎‏‎‏‎‎‎‎‎‏‎‎‏‏‎{sound_category_1}‎‏‎‎‏‏‏‎, ‎‏‎‎‏‏‎{sound_category_2}‎‏‎‎‏‏‏‎, and ‎‏‎‎‏‏‎{sound_category_3}‎‏‎‎‏‏‏‎ can interrupt‎‏‎‎‏‎}other{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‎‎‎‎‏‏‏‎‏‎‏‏‏‏‎‎‏‎‎‏‎‎‎‎‎‏‎‏‏‎‏‏‏‏‏‏‎‎‏‎‏‏‏‎‎‏‎‏‎‎‎‎‎‏‎‎‏‏‎{sound_category_1}‎‏‎‎‏‏‏‎, ‎‏‎‎‏‏‎{sound_category_2}‎‏‎‎‏‏‏‎, and # more can interrupt‎‏‎‎‏‎}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‎‎‎‎‎‎‏‏‎‏‎‏‎‎‎‎‏‏‎‎‎‎‎‏‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‏‏‎‏‎‏‏‎‏‏‎‏‏‎‎‎Nothing can interrupt‎‏‎‎‏‎"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‎‎‎‏‎‏‎‎‏‏‎‎‎‏‎‎‏‎‏‏‎‎‏‏‎‏‎‏‏‏‎‏‏‏‏‎‎‎‎‏‏‎‎‏‎‏‏‏‎‎‎‏‏‎‎No one can interrupt‎‏‎‎‏‎"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‎‎‎‏‎‏‏‎‎‎‏‏‏‏‏‎‏‎‏‏‎‏‎‏‏‏‏‎‏‎‎‏‎‏‏‏‎‏‎‏‎‏‏‎‏‎‏‎‎‏‎Some people can interrupt‎‏‎‎‏‎"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‎‏‎‏‎‎‎‏‎‎‎‎‎‏‎‏‏‎‏‏‎‎‎‏‏‏‎‎‎‎‎‏‏‎‏‏‏‏‎‏‎‎‎‎‎‏‎‎‎‎‏‎‎‏‎‏‎All people can interrupt‎‏‎‎‏‎"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‎‎‎‎‎‏‎‎‎‏‏‎‎‏‎‎‏‎‎‏‏‎‏‏‏‏‎‎‎‎‎‏‎‎‎‎‏‎‎‎‎‏‏‎‎‎‏‎‏‏‏‏‏‏‎‏‎USB controlled by‎‏‎‎‏‎"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‏‏‎‎‎‎‎‏‎‎‎‎‏‏‏‏‎‎‏‎‎‏‏‎‏‏‎‎‎‏‎‎‏‎‎‏‎‏‎‎‎‎‏‎‎‎‎‎‎‎‏‎‏‏‏‏‎Connected device‎‏‎‎‏‎"</string>
     <string name="usb_control_device" msgid="527916783743021577">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎‏‎‏‎‎‏‏‏‎‎‎‏‎‎‏‏‎‎‎‎‏‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‎‎‎‎‏‏‎‎‏‎‎‎‎‎‏‎‎‏‎This device‎‏‎‎‏‎"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‏‎‎‎‏‎‎‏‎‏‎‏‏‏‏‎‎‎‏‎‎‏‎‏‎‎‎‏‎‏‎‏‎‎‎‎‎‏‏‏‎‏‏‏‎‏‎‏‎‎‎‏‎‏‏‎‎Switching...‎‏‎‎‏‎"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‎‏‏‏‎‎‎‎‎‏‎‎‎‏‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‎‏‏‎‎‎‏‎‏‎‎‏‎‏‎‎Switching…‎‏‎‎‏‎"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‏‎‎‏‏‎‎‎‎‎‎‎‏‎‎‎‎‏‏‏‎‎‎‏‏‎‏‏‎‎‎‎‎‎‎‏‎‏‏‏‎‏‎‎‎‎‏‎‏‏‏‎‎‏‎Couldn\'t switch‎‏‎‎‏‎"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‎‏‏‎‏‎‎‏‎‎‎‏‎‏‎‎‎‏‎‏‏‎‏‎‏‏‎‏‏‏‏‎‎‎‏‏‎‏‎‎‏‎‎‎‎‎‎‎‎‏‎‏‏‎‏‎‎Charging this device‎‏‎‎‏‎"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‎‎‎‎‎‏‏‎‎‏‏‏‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‎‏‎‏‏‎‏‏‏‏‎‏‏‏‎‏‏‎‏‎‏‎‏‎‎‏‏‏‎Charging connected device‎‏‎‎‏‎"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‏‎‎‎‏‏‎‎‏‏‏‏‎‎‏‎‏‎‎‏‏‏‎‎‏‏‎‎‎‎‏‎‏‏‏‏‏‎‎‏‏‎‎‏‏‎‏‎‎‏‏‏‏‏‏‎‎View details‎‏‎‎‏‎"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‎‎‏‏‏‏‎‏‏‏‏‎‎‎‎‏‎‏‎‎‎‎‏‎‏‏‏‎‎‏‏‏‎‏‎‎‎‏‏‏‎Data Saver‎‏‎‎‏‎"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‏‎‎‏‎‏‎‎‏‏‎‎‏‎‏‎‏‎‎‎‎‏‏‎‎‏‏‏‏‏‎‎‏‎‏‏‏‎‏‏‏‎‏‏‏‏‏‎‎‎‏‏‏‎Unrestricted data‎‏‎‎‏‎"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‎‎‎‎‏‏‎‏‏‏‎‏‎‎‎‏‏‏‎‎‏‏‎‏‎‎‏‏‏‏‏‎‎‎‎‏‎‏‎‎‏‏‎Background data is turned off‎‏‎‎‏‎"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‎‎‎‎‏‎‎‎‏‏‏‎‎‎‏‏‏‏‎‎‏‏‎‏‎‏‏‎‏‎‏‏‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‏‎‏‏‎‎‎‎Background data is turned off‎‏‎‎‏‎"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‏‎‏‏‎‎‏‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‎‏‏‎‏‏‎‎‎‎‏‎‎‏‎‎‏‏‎‎‎‏‎‏‏‎‎‏‏‎‎‏‎On‎‏‎‎‏‎"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‎‎‎‎‎‏‏‏‎‎‏‎‎‏‎‎‎‏‎‎‎‏‎‏‏‎‎‏‎‎‏‎‏‎‎‎‎‏‏‏‎‎‎‎‏‎‎‎‏‏‎‏‎‏‎Off‎‏‎‎‏‎"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‏‎‏‏‎‎‎‏‎‏‎‎‎‎‏‎‏‎‏‎‏‎‎‎‏‏‏‏‏‎‏‎‏‏‎‎‎‎‏‎‏‎‏‎‎‏‎‎‏‏‎‎‏‏‏‏‎Use Data Saver‎‏‎‎‏‎"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‏‎‏‏‏‏‏‏‎‏‎‏‏‎‏‎‎‎‏‎‎‏‎‏‎‎‏‎‎‎‎‏‏‎‎‏‎‎‏‏‎‎‏‎‎‎‎‎‏‎‏‏‏‏‎If device is locked, prevent typing replies or other text in notifications‎‏‎‎‏‎"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‏‎‏‎‎‏‏‎‎‎‎‎‎‎‏‏‏‏‎‏‏‎‎‎‎‎‎‎‏‏‏‎‏‏‎‎‏‏‎‎‏‎‎‏‎‏‎‎‏‏‎‎‏‏‏‏‎Default spell checker‎‏‎‎‏‎"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‏‏‎‏‏‎‎‎‎‎‎‏‎‏‎‏‏‏‎‎‎‏‎‏‏‎‎‎‏‎‎‏‎‏‏‎‎‎‎‏‏‎‎‎‏‏‎‎‏‏‎‏‏‎Choose spell checker‎‏‎‎‏‎"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‎‎‎‏‏‏‎‏‎‎‏‎‎‎‏‎‏‎‏‎‏‏‏‎‎‎‏‎‏‏‎‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‎‎‎‎‏‎‎‏‏‎Use spell checker‎‏‎‎‏‎"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎‏‎‏‏‎‎‎‎‎‏‏‏‏‎‏‎‏‏‏‏‎‎‎‎‎‎‏‏‎‏‏‏‎‎‏‎‎‏‏‎‏‎‎‎‏‎‎‎‏‎‎‏‎‏‏‎Use spell checker‎‏‎‎‏‎"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‎‏‎‎‎‎‎‎‏‏‎‏‏‎‏‎‏‏‏‏‎‎‏‏‏‎‏‎‏‏‏‏‎‎‎‎‎‎‏‏‎‎‏‎‎‏‎‏‎‏‏‎Not selected‎‏‎‎‏‎"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‏‎‎‎‎‏‎‏‎‎‏‎‎‎‎‎‏‎‏‏‎‎‎‏‏‎‏‎‏‏‎‏‏‎‎‏‏‎‎‎‏‎‏‏‎‏‏‏‎‏‎‏‏‎‏‏‎(none)‎‏‎‎‏‎"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‎‎‏‎‏‏‏‎‎‎‏‏‏‏‎‎‎‏‎‎‏‎‎‏‎‏‎‎‎‏‏‎‏‏‎‏‏‏‎‏‎‏‎‏‎‏‏‎‎‎‏‏‏‏‏‎‏‎: ‎‏‎‎‏‎ "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‎‏‎‏‎‎‏‏‎‏‎‎‏‏‏‎‏‏‏‏‎‎‏‎‎‎‏‎‎‎‏‎‎‏‎‏‎‎‎‏‎‎‏‎‎‏‎To help free up storage space, storage manager removes backed up photos and videos from your device.‎‏‎‎‏‎"</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‏‏‎‏‏‎‎‎‏‎‎‏‎‎‏‏‎‏‎‎‏‎‎‎‏‎‎‎‏‏‎‏‎‎‏‎‎‏‎‎‎‏‏‏‎‏‏‏‏‎‎‏‏‏‎Remove photos &amp; videos‎‏‎‎‏‎"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‎‏‎‏‎‏‏‏‎‏‎‏‏‏‏‏‏‎‎‏‎‎‎‎‎‏‎‎‏‎‏‏‏‎‎‏‏‎‎‎‏‎‏‏‎‎‎‏‎‏‏‏‎‏‎‎‎Storage manager‎‏‎‎‏‎"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‏‏‎‎‎‎‏‎‏‎‎‎‎‏‏‏‎‏‎‎‏‏‎‏‎‏‏‏‏‏‎‎‏‎‏‎‏‎‎‏‏‎‎‏‎‏‏‎‎‎‎‏‎Use Storage manager‎‏‎‎‏‎"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‏‎‎‏‏‏‏‎‎‎‏‏‏‎‎‎‏‎‎‏‏‏‏‎‎‎‎‏‎‏‎‎‎‏‏‏‏‏‎‎‏‏‏‏‎‏‎‏‎‎Use Storage manager‎‏‎‎‏‎"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‎‏‎‎‏‎‎‏‏‎‏‎‏‎‏‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‏‏‎‏‎‏‏‎‏‏‏‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎Automatic‎‏‎‎‏‎"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‏‏‎‏‎‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‎‎‎‏‏‏‏‏‏‎‎‏‎‎‎‏‎‎‏‏‎‎‎‏‏‎‏‏‏‏‎‏‎Manual‎‏‎‎‏‎"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‎‏‎‏‎‎‎‏‏‎‎‎‏‏‎‏‎‏‏‎‏‏‎‎‏‏‎‎‏‎‏‎‏‏‎‎‎‏‎‏‏‎‏‏‏‎‎‎‎‎‏‏‏‎‏‎‎Free up space now‎‏‎‎‏‎"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‏‎‏‏‎‎‎‎‏‏‎‏‎‎‎‎‎‎‏‏‏‎‎‏‏‎‎‏‎‏‎‎‎‏‏‏‏‏‎‎‏‏‏‎‎‏‏‏‏‎‎‏‎‎‎Double-tap to check phone‎‏‎‎‏‎"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‏‏‎‏‏‎‏‎‏‏‏‏‎‎‏‏‎‏‏‏‏‎‏‎‏‎‎‎‏‎‏‎‏‏‏‏‎‎‏‎‎‎‏‏‎‎‏‎‎‎‏‎‏‎‎‏‎Double-tap to check tablet‎‏‎‎‏‎"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‏‏‎‎‏‎‎‏‏‏‎‏‏‏‏‎‎‎‎‎‎‎‎‎‏‎‎‏‏‎‎‎‏‏‏‏‏‏‎‏‎‎‎‏‏‎‏‎‏‏‎‏‎‎‏‎‎Double-tap to check device‎‏‎‎‏‎"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‏‎‎‏‎‏‏‎‎‏‏‏‏‎‎‏‏‎‎‎‏‎‏‎‏‎‏‎‎‏‏‏‎‏‏‏‏‎‎‎‏‎‎‎‏‎‎‏‏‏‎‎‎Swipe for notifications‎‏‎‎‏‎"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‏‎‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‏‎‏‎‏‏‎‏‏‏‏‏‏‎‎‏‏‎‏‏‎‎‎‎‏‎‏‎‏‏‎‏‎‎‎Swipe down on the bottom edge of the screen to show your notifications‎‏‎‎‏‎"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‎‎‏‎‏‎‏‏‎‏‏‎‏‎‎‎‎‏‏‎‎‎‎‎‏‎‏‏‏‎‎‏‎‎‎‏‎‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‎‎‎‏‎One-Handed mode‎‏‎‎‏‎"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‎‏‎‎‏‎‎‎‎‎‏‎‏‏‎‏‎‎‏‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‎‎‎‏‎‏‎‏‏‎‎‎‏‏‎Use one-handed mode‎‏‎‎‏‎"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‏‏‎‎‎‏‎‏‎‏‎‏‏‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‎‏‏‎‎‏‏‎‎‏‏‎‎‎‎‏‎‏‎‏‎‎‏‏‏‎Exit when switching apps‎‏‎‎‏‎"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‏‏‏‏‏‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎‏‏‏‎‎‎‎‎‎‏‏‏‎‎‎‎‏‎‏‎‎‏‎‎‏‏‎‎‎‎Timeout‎‏‎‎‏‎"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‎‎‏‏‏‎‎‎‎‏‎‎‎‏‎‏‎‏‏‎‏‏‏‏‎‏‏‏‎‏‎‎‎‏‎‎‎‎‏‎‎‏‏‎‎‏‎‎‎‏‎‏‎‎‏‏‎4 seconds‎‏‎‎‏‎"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‏‎‎‏‏‏‎‎‏‎‏‏‎‏‎‏‏‏‏‏‎‎‏‎‎‏‎‏‎‏‎‎‎‏‎‏‏‏‎‏‏‎‏‏‎‎‎‏‏‏‎‏‎‏‎‎8 seconds‎‏‎‎‏‎"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‏‎‏‏‏‎‎‏‎‏‎‎‎‏‎‏‎‏‏‎‏‎‎‏‏‏‎‎‎‎‏‏‏‎‏‏‏‎‏‎‎‏‎‏‎‎‎‏‎‏‏‏‎‎‏‎‎12 seconds‎‏‎‎‏‎"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‏‏‏‎‏‎‎‎‎‏‎‎‏‎‏‎‎‎‏‎‏‎‏‎‎‏‎‎‎‏‎‎‏‏‎‎‏‎‎‎‎‏‏‏‎‏‎‎‏‏‏‎‏‎‏‎reachability‎‏‎‎‏‎"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‏‏‎‎‎‏‏‏‏‏‎‏‏‎‏‎‎‎‏‎‎‎‎‎‏‏‏‎‎‎‏‎‎‏‏‎‎‎‎‏‏‎‏‏‏‎‏‎‏‎‎‎‎‎‏‎‎To check time, notifications, and other info, double-tap your screen.‎‏‎‎‏‎"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‏‎‏‎‎‎‎‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‎‎‎‎‎‎‎‏‏‏‎‏‏‏‏‎‏‏‎‎‎Lift to check phone‎‏‎‎‏‎"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‎‏‎‏‏‎‏‎‏‏‎‏‎‏‎‎‎‎‏‎‏‎‏‏‏‏‎‏‎‎‏‏‎‏‏‏‎‎‏‏‎‏‏‏‎‏‏‏‎‎‏‎Lift to check tablet‎‏‎‎‏‎"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‏‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‏‎‏‏‏‏‏‎‏‏‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‎‎‎‏‎‎‎‎Tap to check tablet‎‏‎‎‏‎"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‏‏‎‎‏‎‎‏‎‎‎‎‎‎‏‏‎‏‏‏‏‏‎‎‎‎‏‏‏‏‏‎‎‏‎‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‎‎Tap to check device‎‏‎‎‏‎"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‎‏‎‎‏‎‏‎‏‏‏‎‏‎‏‎‎‏‏‎‏‎‏‏‎‎‏‎‎‎‎‎‏‏‏‎‏‏‏‏‎‏‎To check time, notifications, and other info, tap your screen.‎‏‎‎‏‎"</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎‏‎‏‎‏‎‏‎‏‎‎‏‎‏‎‏‎‎‎‏‎‏‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‎‎‎‏‏‎‏‏‏‏‏‎‏‏‎‏‎‎Panic button‎‏‎‎‏‎"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‏‏‏‏‎‏‏‏‎‏‎‏‏‏‎‎‏‎‎‏‏‎‏‏‏‏‏‎‎‏‎‏‎‏‎‎‎‎‎Start the emergency SOS actions by pressing the power button quickly 5 times.‎‏‎‎‏‎"</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‎‎‎‎‎‏‏‎‎‎‏‏‎‎‎‎‏‎‏‎‏‎‏‎‏‎‎‎‏‏‏‎‏‎‎‏‎‏‏‏‎‏‏‎‏‎‎‏‏‏‎‎‏‎‎‎‎Warning sound‎‏‎‎‏‎"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‎‏‏‎‏‏‎‎‎‎‏‎‎‏‏‏‎‎‏‎‎‏‏‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‏‎‎‏‏‏‎‎‎‏‎Alert before starting the actions‎‏‎‎‏‎"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‏‏‏‏‏‏‎‎‎‏‎‎‎‏‏‏‎‏‏‎‎‎‎‎‏‎‎‏‎‏‎‎‎‏‎‎‎‏‏‎‏‎‎‎‎‏‎‏‎‏‎‎‏‎Emergency contacts‎‏‎‎‏‎"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‏‏‏‏‏‎‎‎‎‎‎‏‏‏‏‏‎‏‏‎‎‏‎‎‏‎‎‎‏‎‏‎‏‏‎‏‎‎‏‎‏‏‎‏‎‎‏‎Swipe fingerprint for notifications‎‏‎‎‏‎"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎‎‎‏‏‏‎‎‎‏‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‏‎‏‏‏‎‏‏‎‏‎‏‏‏‎‎‎‏‏‏‏‎‏‎‎Swipe fingerprint‎‏‎‎‏‎"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎‏‏‏‎‎‏‎‎‏‎‏‎‎‏‎‎‎‏‏‎‏‏‏‏‏‎‎‎‏‎‎‏‎‏‏‎‏‎‎‏‏‎‎‏‎To check your notifications, swipe down on the fingerprint sensor on the back of your phone.‎‏‎‎‏‎"</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‏‎‏‎‎‎‏‏‏‎‎‎‎‏‏‎‏‏‎‏‏‎‎‏‏‎‎‏‎‎‎‏‏‏‎‎‎‏‎‎‎‏‎‏‎‎‏‎‎‎‎‎‎‎‎‎‎Enable for all apps‎‏‎‎‏‎"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‎‏‏‏‏‎‏‏‏‎‎‎‏‏‏‏‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‎‎‎‏‎‎‏‎‏‏‎‎‏‏‎‏‏‎‏‎‎‏‎Select Graphics Driver‎‏‎‎‏‎"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‏‎‎‏‏‎‏‏‏‏‎‎‏‏‏‏‎‏‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‎‎‎‎‏‏‎‎‏‏‏‏‎‎‎‎‏‏‏‏‎Default‎‏‎‎‏‎"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‎‎‏‏‏‎‏‏‏‎‏‏‎‎‎‎‏‎‎‎‎‎‏‏‎‎‏‎‏‎‏‎‎‏‏‏‎‎‎‎‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎Game Driver‎‏‎‎‏‎"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‎‎‎‏‎‎‏‎‏‏‏‏‎‎‎‎‎‎‏‏‎‎‏‏‏‏‏‏‎‏‏‎‎‎‎‏‏‏‎‏‎‎‏‎‏‎‎‏‏‏‎‎‎‏‏‎Game Driver‎‏‎‎‏‎"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‎‏‎‏‎‏‏‎‎‎‎‎‏‎‏‎‎‏‏‎‎‏‎‏‏‎‏‎‏‎‎‏‎‏‏‏‏‏‏‎‎‏‎‏‎‏‎‏‏‎‏‎‎‎‎Developer Driver‎‏‎‎‏‎"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‎‎‎‏‏‎‏‏‏‎‎‎‏‎‏‏‏‎‎‎‏‏‎‎‎‏‎‏‎‎‎‎‏‏‏‏‎‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎System Graphics Driver‎‏‎‎‏‎"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‏‎‎‏‏‏‏‏‏‎‏‎‏‏‏‏‏‎‎‏‏‎‏‏‏‏‎‎‎‎‏‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‏‎‎‏‎‏‎‎Couldn’t find networks. Try again.‎‏‎‎‏‎"</string>
     <string name="forbidden_network" msgid="7404863971282262991">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‏‏‎‎‎‎‏‏‎‏‎‏‏‏‎‎‏‎‎‎‏‏‎‎‏‎‎‏‏‎‏‎‎‏‎‏‏‏‏‎‎‎‎‏‏‎‏‏‏‏‎‎‏‏‏‏‎(forbidden)‎‏‎‎‏‎"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‏‏‎‎‎‏‏‏‏‏‎‏‏‏‎‎‎‎‏‎‏‏‎‏‏‎‏‎‏‎‏‎‎‎‏‏‎‎‎‎‏‏‏‏‎‏‏‎‏‎‎‎‎‏‏‏‎No SIM card‎‏‎‎‏‎"</string>
+    <string name="sim_card" msgid="6381158752066377709">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‎‎‏‏‏‎‎‏‏‎‏‏‏‎‎‎‎‏‎‎‏‏‏‎‎‎‎‎‎‎‎‏‎‎‏‎‏‎‏‎‎‏‎‏‏‏‏‏‏‎‏‏‎‏‎SIM‎‏‎‎‏‎"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‎‎‏‎‏‏‎‎‏‏‏‎‏‏‏‏‏‎‏‏‎‏‎‏‎‎‎‎‏‏‎‎‏‎‏‎‏‎‎‏‏‎‏‎‎‏‎‎‎‏‎‎‎‎No SIM‎‏‎‎‏‎"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‏‎‎‎‎‏‎‎‏‏‏‏‏‏‎‏‎‏‏‎‎‏‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‎‏‏‎‏‎‏‎‏‎‏‎‏‏‏‎‎None‎‏‎‎‏‎"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‎‏‎‏‎‎‏‏‏‎‏‎‏‎‏‎‏‎‎‎‏‏‎‎‎‎‏‎‎‎‎‏‏‏‏‎‎‏‏‎‎‏‏‎‎‎‎‎‏‏‏‎‎‏‎‎Requires SIM to connect‎‏‎‎‏‎"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‏‎‎‎‏‏‏‏‎‎‏‏‏‎‎‎‎‎‏‎‏‏‎‎‎‏‏‏‎‏‏‎‏‎‎‏‎‏‎‏‎‏‏‎‏‎‎‏‏‎‏‎‎Requires ‎‏‎‎‏‏‎<xliff:g id="WIRELESS_CARRIER">%s</xliff:g>‎‏‎‎‏‏‏‎ SIM to connect‎‏‎‎‏‎"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‎‎‏‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‏‎‎‏‏‎‎‏‏‏‏‎‏‏‎‏‏‏‎‏‏‏‎‏‏‏‏‏‏‏‏‎Preferred network mode: WCDMA preferred‎‏‎‎‏‎"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‏‏‎‎‎‎‏‎‎‎‏‏‎‏‏‎‎‏‎‏‎‏‎‎‎‎‏‎‏‎‎‎‎‎‎‏‎‎‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‏‎‎Preferred network mode: GSM only‎‏‎‎‏‎"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‏‎‎‏‎‎‎‎‎‏‏‎‏‏‏‎‎‎‎‏‏‎‎‎‏‏‎‎‎‏‎‏‎‏‎‎‎‎‏‎‏‏‎‎‎‎‎‎‏‏‏‎‏‎‎‎Preferred network mode: WCDMA only‎‏‎‎‏‎"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‎‎‎‎‎‎‏‎‏‎‏‏‏‏‎‎‏‎‏‎‏‏‏‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‏‎‏‏‎‎‏‏‏‏‎‎‎‎‎‎‎Mobile data‎‏‎‎‏‎"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‏‏‎‎‎‏‎‎‏‏‎‎‏‎‏‏‎‏‎‎‎‏‏‏‎‏‎‏‏‏‎Access data using mobile network‎‏‎‎‏‎"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‏‏‎‏‏‎‎‏‎‎‏‏‏‎‏‏‏‎‏‏‏‎‏‎‏‏‏‏‎‎‏‏‏‎‏‎‏‎‎‏‏‎‎‎‏‏‏‎‎‎‎‎‎‏‎Phone will automatically switch to this carrier when in range‎‏‎‎‏‎"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‏‏‏‎‏‏‎‎‎‏‎‎‏‏‏‎‏‏‎‏‎‏‎‎‏‎‎‎‏‏‎‏‏‏‎‏‎‎‏‏‎‎‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎No SIM card available‎‏‎‎‏‎"</string>
     <string name="calls_preference" msgid="2166481296066890129">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‎‎‎‏‎‎‎‎‏‏‏‎‎‎‏‏‎‏‎‎‎‎‏‎‏‎‏‎‎‎‎‎‏‎‎‏‏‎‎‎‎‏‎‎‏‎‎‏‏‎‎‏‎‎‎‏‎Calls preference‎‏‎‎‏‎"</string>
     <string name="sms_preference" msgid="7742964962568219351">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‏‎‏‎‎‏‎‎‎‏‎‎‏‏‎‎‏‏‏‎‎‎‎‎‎‎‏‏‎‎‎‏‎‏‏‎‎‏‎‏‎‏‎‏‎‏‏‎‏‎‏‏‏‎SMS preference‎‏‎‎‏‎"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‎‎‎‏‏‏‎‏‎‎‏‎‏‎‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‎‏‏‏‎‎‎‎‏‎‏‏‎‎‎‎‏‏‎‏‎‏‎‏‎Ask every time‎‏‎‎‏‎"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‎‏‎‏‎‏‎‏‎‏‏‏‎‏‏‏‏‎‎‎‎‎‎‎‏‎‎‎‏‎‎‏‎‏‏‎‏‎‏‎‏‏‎‏‎‏‏‎‎‏‎‎‏‏‎‏‎Allow screen overlays on Settings‎‏‎‎‏‎"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‎‎‎‏‏‎‎‏‎‏‏‎‎‏‎‎‏‏‎‎‏‎‏‏‏‎‏‎‏‏‎‎‎‎‎‎‎‏‎‎‏‎‎‏‎‏‎‏‎‏‎‎‎‏‏‎‎Allow apps that can display over other apps to overlay Settings screens‎‏‎‎‏‎"</string>
     <string name="media_controls_title" msgid="403271085636252597">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‏‎‎‏‏‎‎‎‏‎‏‏‎‏‎‎‏‏‏‎‏‎‏‎‎‏‏‎‏‏‏‏‏‎‎‎‏‎‎‎‏‏‏‏‎‎‏‏‏‎‏‏‎‏‎‏‎Media‎‏‎‎‏‎"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‏‏‎‏‎‏‎‏‏‎‎‎‎‎‏‎‎‏‎‏‏‎‎‎‏‎‏‎‎‎‏‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‏‎‎‏‎‎‏‏‎Hide player when the media session has ended‎‏‎‎‏‎"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‎‏‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‏‏‎‎‏‎‏‎‏‏‎‎‎‏‏‏‎‏‏‎‏‏‎‏‎‏‏‎‎‏‎‏‏‏‏‏‏‏‎‎The player allows you to resume a session from the expanded Quick Settings panel.‎‏‎‎‏‎"</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‏‎‎‏‎‏‏‎‎‏‎‎‎‏‏‎‏‎‏‎‏‎‎‏‏‏‎‎‏‏‎‎‏‎‎‏‎‎‎‏‏‏‎‏‏‏‏‏‎‎‏‎‏‎‎‎‎Media player in Quick Settings‎‏‎‎‏‎"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‏‎‎‏‎‏‏‎‎‏‎‎‎‏‏‏‎‏‏‎‏‎‎‏‎‏‏‏‎‎‏‎‏‎‎‏‏‏‏‎‏‏‏‎‎‎‏‏‏‏‏‎‏‏‎Show media player for an extended period to easily resume playback‎‏‎‎‏‎"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‎‎‏‎‏‏‏‏‎‎‎‏‎‎‏‏‎‏‎‏‏‏‏‎‎‎‏‎‏‏‏‎‏‏‎‏‏‏‏‏‎‎‎‎‎‏‏‎‎‎‏‎‏‏‏‏‎Hide player‎‏‎‎‏‎"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‎‏‏‎‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎‏‏‏‎‎‏‎‏‏‎‏‎‎‏‎‎‏‏‎‏‏‎‏‎‏‎‎‎‎‎‏‎‏‎Show player‎‏‎‎‏‎"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‎‏‏‏‏‎‎‏‏‎‏‏‎‏‏‎‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‏‎‏‏‏‏‏‏‎‎‎‎‎‏‎‎‏‎‏‎‎No players available‎‏‎‎‏‎"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‏‎‎‎‎‏‏‎‎‏‏‏‏‏‎‏‏‎‏‎‏‎‎‏‎‏‏‏‏‎‏‎‏‎‏‎‎‏‎‏‏‎‏‏‏‏‎‎‎‎Allowed apps‎‏‎‎‏‎"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‎‎‎‏‎‎‏‎‎‎‏‏‎‏‏‏‎‏‎‎‏‎‎‏‏‏‏‏‎‏‏‎‎‏‏‏‏‎‎‎‎‎‎‎‎‏‎‎‏‏‏‎‎media‎‏‎‎‏‎"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‎‎‎‏‎‎‎‎‏‏‎‏‎‏‎‎‏‏‏‏‏‎‏‏‏‎‏‎‎‏‎‏‏‏‏‎‎‏‏‏‎‎‏‏‎‏‏‏‎‎‎‏‏‎‎‎Bluetooth will turn on‎‏‎‎‏‎"</string>
 </resources>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index e1c0b85..8f85139 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Medio"</item>
     <item msgid="6740026006576843477">"Largo"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Corto"</item>
+    <item msgid="7397961711906421599">"Medio"</item>
+    <item msgid="4079132024502041928">"Largo"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Predeterminado"</item>
     <item msgid="4234707448428002595">"Sans Serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Solo TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Global"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 548f12a..c9b6a4e 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Mostrar datos del perfil en pantalla bloqueada"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Cuentas"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Ubicación"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Usar ubicación"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Usar ubicación"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Desactivado"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">Encendido: <xliff:g id="COUNT_1">%1$d</xliff:g> apps tienen acceso a la ubicación</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Usa tu rostro para autenticarte"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Iniciar"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Si el desbloqueo facial de accesibilidad está desactivado, es posible que algunos pasos de la configuración no funcionen correctamente con TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Atrás"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Seguir configurando"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Usar config. de accesibilidad"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="one">Debe tener menos de <xliff:g id="NUMBER_0">%d</xliff:g> dígito</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"El administrador del dispositivo no permite el uso de un PIN reciente"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Tu administrador de TI bloquea los PIN comunes. Prueba uno diferente."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"No puede incluir un carácter no válido"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Debe tener al menos una letra"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Debe tener al menos un dígito"</string>
@@ -653,7 +655,6 @@
       <item quantity="one">Debe tener al menos 1 carácter no numérico</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"El administrador del dispositivo no permite el uso de contraseñas recientes"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Tu administrador de TI bloquea las contraseñas comunes. Prueba una diferente."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"No se permiten secuencias de dígitos ascendentes, descendentes ni repetidas"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Confirmar"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Cancelar"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Activar Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Usar Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Usar Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Configuración de Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Configurar y administrar los puntos de acceso de teléfonos inalámbricos"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Centra el código QR debajo para conectarte a \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Escanea un código QR para unirte a la red Wi-Fi"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Compartir Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Escanea este código QR para conectarte a \"<xliff:g id="SSID">%1$s</xliff:g>\" y compartir la contraseña"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Escanea este código QR con otro dispositivo para unirte a \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Escanea este código QR para conectarte a \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Vuelve a intentarlo. Si el problema persiste, comunícate con el fabricante del dispositivo"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Se produjo un error"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Contraseña de Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Contraseña del hotspot: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Conectar automáticamente"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Permitir que el teléfono se conecte automáticamente cerca de esta red"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Permite que la tablet se conecte automáticamente cerca de esta red"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Permitir conexión a esta red al entrar en su rango"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Agregar dispositivo"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Usar un código QR para agregar un dispositivo a esta red"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"El código QR no es un formato válido"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Usar certificados de sistema"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"No proporcionar"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"No validar"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"No especificaste ningún certificado. Tu conexión no será privada."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"El nombre de la red es demasiado largo."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Se debe especificar un dominio."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Se requiere un certificado."</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Conectar"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi activado"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Conectado a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Estableciendo conexión con <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Conectando…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"No se pudo establecer conexión con la red."</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Red fuera de alcance"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"La app está compartiendo contenido. Para compartir la conexión a Internet, desactiva el hotspot y vuelve a activarlo"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"No se configuró una contraseña"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Nombre del hotspot"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Activando <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Activando <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Otros dispositivos pueden conectarse a <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Contraseña del hotspot"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Banda AP"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Aumenta automáticamente la frecuencia de actualización de 60 Hz a 90 Hz para cierto contenido. Incrementa el uso de batería."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Forzar frecuencia de actualización de 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"La máxima frecuencia de actualización mejora la respuesta táctil y la calidad de las animaciones. Incrementa el uso de batería."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Atención a la pantalla"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Activado: No se apagará la pantalla si estás mirándola"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Versión de Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Actualización de seguridad de Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Modelo"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Modelo: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Modelo y hardware"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Versión de hardware"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ID del equipo"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Se restableció la configuración de red."</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"No se pueden borrar las tarjetas SIM"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"No es posible borrar las tarjetas SIM descargadas debido a un error.\n\nReinicia el dispositivo y vuelve a intentarlo."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Borrar todos los datos (restablecer la configuración de fábrica)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Borrar todos los datos"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Esta acción borrará todos los datos del "<b>"almacenamiento interno"</b>" de tu tablet, como\n\n"<li>"Tu Cuenta de Google"</li>\n<li>"Los datos y la configuración del sistema y de las apps"</li>\n<li>"Las apps descargadas"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Se borrarán todos los datos del "<b>"almacenamiento interno"</b>" del teléfono, por ejemplo:\n\n"<li>"Tu Cuenta de Google"</li>\n<li>"Los datos y la configuración del sistema y de las apps"</li>\n<li>"Las apps descargadas"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Accediste a las siguientes cuentas:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Hay otros usuarios presentes en este dispositivo.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Música"</li>\n<li>"Fotos"</li>\n<li>"Otros datos de usuario"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"No se cancelará tu plan de servicio móvil."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Para borrar la música, las imágenes y otros datos de usuario, debes borrar el "<b>"almacenamiento USB"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Para borrar música, imágenes y otros datos del usuario, debes borrar la "<b>"tarjeta SD"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Borrar todos los datos (restablecer la configuración de fábrica)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Borrar todo (restablecer configuración de fábrica)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Esta acción borrará todos los datos del "<b>"almacenamiento interno"</b>" de tu tablet, como\n\n"<li>"Tu Cuenta de Google"</li>\n<li>"Los datos y la configuración del sistema y de las apps"</li>\n<li>"Las apps descargadas"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Esta acción borrará todos los datos del "<b>"almacenamiento interno"</b>" de tu teléfono, como\n\n"<li>"Tu Cuenta de Google"</li>\n<li>"Los datos y la configuración del sistema y de las apps"</li>\n<li>"Las apps descargadas"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Accediste a las siguientes cuentas:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Hay otros usuarios presentes en este dispositivo.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Música"</li>\n<li>"Fotos"</li>\n<li>"Otros datos del usuario"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"No se cancelará tu plan de servicio móvil."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Para borrar la música, las imágenes y otros datos de usuario, debes borrar el "<b>"almacenamiento USB"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Para borrar música, imágenes y otros datos del usuario, debes borrar la "<b>"tarjeta SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Eliminar almacenamiento USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Borrar tarjeta SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Borra todos los datos del almacenamiento USB, como la música o las fotos."</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Borra todos los datos de la tarjeta SD, como música o fotos."</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Borrar todos los datos"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Borrar todos los datos"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Se borrarán las apps que hayas descargado y tu información personal. No podrás deshacer esta acción."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Se borrará toda tu información personal, incluidas las apps y las tarjetas SIM descargadas. No podrás deshacer esta acción."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Eliminar todo"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"No se realizó ningún restablecimiento debido a que el servicio \"Eliminar sistema\" no está disponible."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"¿Borrar todos los datos?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"El restablecimiento de la configuración de fábrica no está disponible para este usuario."</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Borrando"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Espera un momento…"</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Borrar todos los datos"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Borrar todos los datos"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Se borrarán las apps que hayas descargado y tu información personal. No podrás deshacer esta acción."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Se borrará toda tu información personal, incluidas las apps y las tarjetas SIM descargadas. No podrás deshacer esta acción."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"¿Quieres borrar todos los datos?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"El restablecimiento de la configuración de fábrica no está disponible para este usuario"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Borrando"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Espera…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Configuración"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Establecer correo de voz, desvío de llamadas, llamada en espera, identificador de llamadas"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Conexión a red por USB"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"No se puede anclar a red a más de <xliff:g id="MAXCONNECTION">%1$d</xliff:g> dispositivos."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ya no se anclará a red."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Conexión a Ethernet"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Compartir la conexión a Internet del teléfono mediante Ethernet USB"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Comparte la conexión a Internet del teléfono mediante Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Usa la función de hotspot y conexión mediante dispositivo portátil para brindar acceso a Internet a otros dispositivos mediante tu conexión de datos móviles. Las apps también pueden crear un hotspot para compartir contenido con dispositivos cercanos."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Usa un hotspot y una conexión mediante dispositivo móvil para brindar acceso a Internet a otros dispositivos a través de una conexión Wi-Fi o de datos móviles. Las apps también pueden crear un hotspot para compartir contenido con dispositivos cercanos."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Ayuda"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Preferencias de subtítulos"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Ampliación"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Área de ampliación"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Habilitar ampliación"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Selecciona las áreas en las que quieres implementar la ampliación de pantalla al usar la función"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Pantalla completa"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Parte de la pantalla"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Pantalla completa y parte de la pantalla"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Ampliar toda la pantalla"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Ampliar parte de la pantalla"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"¿Quieres cambiar al botón de accesibilidad?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Cuando presionas tres veces para ampliar una parte de la pantalla, algunas acciones, como escribir, demorarán más tiempo.\n\n¿Prefieres usar el botón de accesibilidad para ampliar?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Cambiar al botón de accesibilidad"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Mantener presionar tres veces para ampliar"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Configuración de ampliación"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Ampliar presionando tres veces"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Ampliar con gesto"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Cortar con el botón de encendido"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Puntero del mouse grande"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Quitar animaciones"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Audio mono"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Combinar canales cuando se reproduce audio"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Balance de audio"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Izquierda"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Derecha"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Audio mono"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Combinar canales cuando se reproduce audio"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Balance de audio"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Izquierda"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Derecha"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Predeterminado"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 segundos"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 segundos"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Vibración de las notificaciones"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Vibración del tono"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Respuesta táctil"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Usar <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Abrir <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Usar la corrección de color"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Mostrar subtítulos"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Solo para apps compatibles"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Usar <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Abrir <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Usar la corrección de colores"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Mostrar subtítulos"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Solo para apps compatibles"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Estilo y tamaño de los subtítulos"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Tamaño del texto: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Más opciones"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteronomalía"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomalía"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomalía"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Escala de grises"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Rojo-verde"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Rojo-verde"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Azul-amarillo"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Restricción en segundo plano"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Permite que la app se ejecute en segundo plano"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"La app no puede ejecutarse en segundo plano"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"No se puede restringir el uso en segundo plano"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"No se puede restringir el uso en segundo plano"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"¿Limitar actividad en segundo plano?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Si limitas la actividad en segundo plano de una app, es posible que no funcione correctamente"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Como no se configuró la app para optimizar la batería, no puedes restringirla.\n\nPrimero, activa optimización de batería."</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Establecer un programa"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Extender la duración de la batería"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Desactivar después de la carga"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"El Ahorro de batería se desactiva cuando el teléfono tiene <xliff:g id="PERCENT">%1$s</xliff:g> de carga"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"El Ahorro de batería se desactiva cuando la tablet tiene <xliff:g id="PERCENT">%1$s</xliff:g> de carga"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"El Ahorro de batería se desactiva cuando el dispositivo tiene <xliff:g id="PERCENT">%1$s</xliff:g> de carga"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"El Ahorro de batería se desactiva cuando el teléfono tiene más del <xliff:g id="PERCENT">%1$s</xliff:g> de carga"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"El Ahorro de batería se desactiva cuando la tablet tiene más del <xliff:g id="PERCENT">%1$s</xliff:g> de carga"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"El Ahorro de batería se desactiva cuando el dispositivo tiene más del <xliff:g id="PERCENT">%1$s</xliff:g> de carga"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Activar"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Restablecer"</string>
     <string name="tts_play" msgid="2945513377250757221">"Reproducir"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Conectividad adaptable"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Extiende la duración de batería y mejora el rendimiento del dispositivo, ya que administra automáticamente las conexiones de red"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Almacenamiento de credenciales"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Instala un certificado"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Instalar certificados desde el almacenamiento"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Credenciales de usuario"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Ver y modificar las credenciales guardadas"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Configuración avanzada"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Tipo de almacenamiento"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Copia de seguridad en hardware"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Solo software"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Las credenciales no están disponibles para este usuario."</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Se instaló para redes VPN y apps"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Se instaló para redes Wi-Fi"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Cómo pagar en la terminal"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Configura una aplicación para efectuar pagos. A continuación, solo tienes que sostener la parte posterior del teléfono sobre cualquier terminal con el símbolo de pago sin contacto."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Entendido"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Más…"</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Más…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Establecer app de pagos predeterminada"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Actualizar app de pagos predeterminada"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"En una terminal para pagar sin contacto, usar <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Usar siempre para llamadas"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Seleccionar SIM para datos"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Selecciona una SIM para los SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Cambiando SIM de datos, esto puede demorar unos minutos…"</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Cambiando SIM de datos. Este proceso puede demorar unos minutos…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Llamar con"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Seleccionar una tarjeta SIM"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"rutina, programa, ahorro de batería, ahorro de energía, batería, automático, porcentaje"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, llamadas avanzadas, llamadas mediante 4G"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"agregar idioma, agregar un idioma"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"tamaño del texto"</string>
     <string name="default_sound" msgid="6604374495015245195">"Sonido predeterminado"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Volumen de tono y notificaciones al <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Volumen, vibración, No interrumpir"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Activar los sonidos"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Subtitulado instantáneo"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Subtitular automáticamente"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Ninguno"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other">Se establecieron <xliff:g id="ON_COUNT">%d</xliff:g> programas</item>
-      <item quantity="one">Se estableció 1 programa</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Ninguno}=1{Se estableció 1 programa}other{Se establecieron # programas}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"No interrumpir"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Solo recibe notificaciones de las personas y apps que más te interesan"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limitar las interrupciones"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Solo prioridad"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Activado/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Desactivado/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Desactivado"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Activado"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Preguntar siempre"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Hasta que lo desactives"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> horas</item>
-      <item quantity="one">1 hora</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minutos"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> programas se pueden actualizar automáticamente</item>
-      <item quantity="one">1 programa se puede actualizar automáticamente</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 hora}other{# horas}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minuto}other{# minutos}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Desactivada}=1{Desactivada/1 programa se puede activar automáticamente}other{Desactivada/# programas se pueden activar automáticamente}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Pueden suspender la función No interrumpir:"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Personas"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Apps"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Configurar automáticamente las notificaciones de menor prioridad a silenciosas"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Clasificación de notificaciones adaptables"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Clasificar las notificaciones automáticamente por relevancia"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Comentarios sobre notificaciones adaptables"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Indica los ajustes realizados a las notificaciones y muestra la opción para enviar comentarios al sistema"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Respuestas y acciones sugeridas"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Mostrar automáticamente respuestas y acciones sugeridas"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Visualiza notificaciones recientes y pospuestas"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Acceso en No interrumpir"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Permitir opción No interrumpir"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Ninguna aplicación instalada solicitó acceso en No interrumpir."</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Cargando aplicaciones…"</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Cargando apps…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Como lo solicitaste, Android bloquea las notificaciones de esta app para que no se muestren en el dispositivo"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Como lo solicitaste, Android bloquea esta categoría de notificaciones para que no se muestren en el dispositivo"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Como lo solicitaste, Android bloquea este grupo de notificaciones para que no se muestren en el dispositivo"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Todas las conversaciones"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Conversaciones prioritarias"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Ninguna"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> conversaciones</item>
-      <item quantity="one">1 conversación</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Ninguna"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Ninguna}=1{1 conversación}other{# conversaciones}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Quiénes pueden interrumpir"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Llamadas"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Llamadas"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"A fin de asegurarte de que el dispositivo suene cuando recibes llamadas permitidas, verifica que esté configurado para emitir un sonido"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Se bloquearán las llamadas entrantes durante \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\". Puedes ajustar la configuración para permitir que tus amigos, familia y otros contactos se comuniquen contigo."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Contactos destacados"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> más</item>
-      <item quantity="one">1 más</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Ninguno"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Ninguno}=1{{contact_1}}=2{{contact_1} y {contact_2}}=3{{contact_1}, {contact_2} y {contact_3}}other{{contact_1}, {contact_2} y # más}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Mensajes"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"mensajes"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Mensajes"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Se bloquearán los mensajes entrantes durante \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\". Puedes ajustar la configuración para permitir que tus amigos, familiares y otros contactos se comuniquen contigo."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Puedes recibir todos los mensajes"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Puedes recibir todas las llamadas"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Ninguno"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> contactos</item>
-      <item quantity="one">1 contacto</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Ninguno}=1{1 contacto}other{# contactos}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Cualquier usuario"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Contactos"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Contactos destacados"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Todas las notificaciones"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Algunas notificaciones"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Las personas seleccionadas podrán comunicarse contigo, incluso si no permites que las apps causen interrupciones"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> pueden interrumpir</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> puede interrumpir</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> más"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Ninguna app puede interrumpir}=1{{app_1} puede interrumpir}=2{{app_1} y {app_2} pueden interrumpir}=3{{app_1}, {app_2} y {app_3} pueden interrumpir}other{{app_1}, {app_2} y # más pueden interrumpir}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Apps"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Todas las notificaciones"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Algunas notificaciones"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Notificaciones que pueden interrumpir"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Permitir todas las notificaciones"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> pueden interrumpir</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> puede interrumpir</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Nada puede interrumpir"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> más"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Nada puede interrumpir}=1{{sound_category_1} puede interrumpir}=2{{sound_category_1} y {sound_category_2} pueden interrumpir}=3{{sound_category_1}, {sound_category_2} y {sound_category_3} pueden interrumpir}other{{sound_category_1}, {sound_category_2} y # más pueden interrumpir}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Nada puede interrumpir"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Ninguna persona puede interrumpir"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Algunas personas pueden interrumpir"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Cualquier persona puede interrumpir"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB controlado por"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Dispositivo conectado"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Este dispositivo"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Cambiando…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Cambiando…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"No se pudo cambiar"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Cargando este dispositivo"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Cargando dispositivo conectado"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Ver detalles"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Ahorro de datos"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Datos sin restricciones"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Se desactivaron los datos en segundo plano"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Se desactivaron los datos en segundo plano"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Activado"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Desactivado"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Usar Ahorro de datos"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Si el dispositivo está bloqueado, evita la escritura de respuestas y otros textos en las notificaciones"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Corrector predeterminado"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Elegir corrector ortográfico"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Usar el corrector ortográfico"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Usar el corrector ortográfico"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Sin seleccionar"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(ninguno)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"El administrador de almacenamiento quita de tu dispositivo las fotos y los videos con copia de seguridad para liberar espacio de almacenamiento."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Quitar fotos y videos"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Administrador de almacenamiento"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Usar el Administrador de almacenamiento"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Usar el Administrador de almacenamiento"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automático"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Liberar espacio ahora"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Presionar la pantalla dos veces para revisar el teléfono"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Presionar dos veces la tablet para revisarla"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Presionar dos veces el dispositivo para revisarlo"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Desliza para ver notific."</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Desliza el dedo hacia abajo desde el borde inferior para ver las notificaciones"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Modo de una mano"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Usar el modo de una mano"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Salir del modo cuando se cambia de app"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Tiempo de espera"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 segundos"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 segundos"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 segundos"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"accesibilidad"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Para consultar la hora, las notificaciones y otra información, presiona dos veces la pantalla."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Levantar el teléfono para revisarlo"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Levanta la tablet para revisarla"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Presiona para revisar la tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Presiona para revisar el dispositivo"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Para consultar la hora, las notificaciones y otra información, presiona la pantalla."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Botón de pánico"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Para iniciar las acciones de ayuda en emergencias, presiona rápido el botón de encendido 5 veces."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Sonido de advertencia"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Alerta previa al inicio de las acciones"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Contactos de emergencia"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Deslizar tu huella para ver notificaciones"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Deslizar huella digital"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Para ver las notificaciones, desliza el dedo hacia abajo en el sensor de huellas digitales ubicado en la parte posterior del teléfono."</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Habilitar para todas las apps"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Seleccionar controlador gráfico"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Predeterminado"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Controlador de juegos"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Controlador de juegos"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Controlador para desarrolladores"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Controlador gráfico del sistema"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"No se encontraron redes. Vuelve a intentarlo."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(prohibida)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Sin tarjeta SIM"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"No hay ninguna tarjeta SIM"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"No hay información"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Se requiere una tarjeta SIM para conectarse"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Se requiere una tarjeta SIM <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> para conectarse"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Modo de red preferido: WCDMA preferido"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Modo de red preferido: solo GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Modo de red preferido: solo WCDMA"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Datos móviles"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Acceder a los datos usando la red móvil"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"El teléfono cambiará a este proveedor automáticamente en cuanto esté dentro del rango"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"No hay ninguna tarjeta SIM disponible"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Preferencia de llamadas"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Preferencia de SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Preguntar siempre"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Permitir pantallas superpuestas en Configuración"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Permite que las apps que pueden mostrar contenido sobre otras se superpongan a las pantallas de Configuración"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Contenido multimedia"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Ocultar reproductor al terminar sesión multimedia"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"El reproductor te permite reanudar una sesión desde el panel expandido de Configuración rápida."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Reproductor multimedia en la Configuración rápida"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Muestra el reproductor multimedia durante un período extendido para reanudar la reproducción de manera sencilla"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Ocultar reproductor"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Mostrar reproductor"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"No hay jugadores disponibles"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Apps permitidas"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"contenido multimedia"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Se activará el Bluetooth"</string>
 </resources>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index 1f2dc1a..d48f1cf 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Medio"</item>
     <item msgid="6740026006576843477">"Largo"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Corto"</item>
+    <item msgid="7397961711906421599">"Medio"</item>
+    <item msgid="4079132024502041928">"Largo"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Predeterminado"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA, EvDo, GSM o WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA y LTE o EvDo"</item>
     <item msgid="2247906254631766720">"GSM, WCDMA o LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE o WCDMA"</item>
     <item msgid="7723670142495874534">"Solo TD-SCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR o LTE"</item>
     <item msgid="5237423971422723128">"NR, LTE, CDMA o EvDo"</item>
     <item msgid="6856991565745877075">"NR, LTE, GSM o WCDMA"</item>
-    <item msgid="473436147270962091">"NR, LTE, CDMA, EvDo, GSM o WCDMA"</item>
+    <item msgid="8908263949185004366">"Mundial"</item>
     <item msgid="6692179237956480280">"NR, LTE o WCDMA"</item>
     <item msgid="8160757136163231885">"NR, LTE o TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR, LTE, TDSCDMA o GSM"</item>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index b211680..cab6794 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -254,7 +254,7 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Fecha y hora"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Establecer fecha y hora"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Establecer fecha, hora, zona horaria y formatos"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Usar hora de la red"</string>
+    <string name="date_time_auto" msgid="8227898528525208628">"Usar la hora proporcionada por la red"</string>
     <string name="zone_auto_title" msgid="4715775349468228598">"Usar la zona horaria proporcionada por la red"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Usar la configuración regional predeterminada"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"Formato de 24 horas"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Mostrar información de perfil en pantalla bloqueo"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Cuentas"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Ubicación"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Usar ubicación"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Usar ubicación"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Desactivado"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">Activada ‑ <xliff:g id="COUNT_1">%1$d</xliff:g> aplicaciones tienen acceso a la ubicación</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Usa tu cara para autenticarte"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Empezar"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Si el desbloqueo facial está desactivado, es posible que algunos pasos de la configuración no funcionen correctamente con TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Atrás"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Continuar configuración"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Utilizar ajustes accesibilidad"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="one">Debe tener menos de <xliff:g id="NUMBER_0">%d</xliff:g> dígito</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"El administrador de dispositivos no permite utilizar un PIN reciente"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"El administrador de TI bloquea los PIN comunes. Prueba a utilizar otro PIN."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"No puede incluir un carácter que no sea válido"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Debe tener al menos una letra"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Debe tener al menos un dígito"</string>
@@ -653,7 +655,6 @@
       <item quantity="one">Debe contener al menos 1 carácter no numérico</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"El administrador de dispositivos no permite utilizar una contraseña reciente"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"El administrador de TI bloquea las contraseñas comunes. Prueba a utilizar otra contraseña."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"No se permite utilizar una secuencia ascendente, descendente ni repetida de dígitos"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Confirmar"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Cancelar"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Activar conexión Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Usar Wi‑Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Utilizar Wi‑Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Ajustes de Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Configurar y administrar puntos de acceso inalámbricos"</string>
@@ -876,7 +877,7 @@
     <string name="passpoint_content" msgid="5219226173518418335">"Credenciales de <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="wifi_eap_method" msgid="3776009521349381742">"Método EAP"</string>
     <string name="please_select_phase2" msgid="577633852089847142">"Autenticación de fase 2"</string>
-    <string name="wifi_eap_ca_cert" msgid="8033404008276298886">"Certificado de CA"</string>
+    <string name="wifi_eap_ca_cert" msgid="8033404008276298886">"Certificado AC"</string>
     <string name="wifi_eap_ocsp" msgid="8713933962516871238">"Estado del certificado online"</string>
     <string name="wifi_eap_domain" msgid="8304301470752333203">"Dominio"</string>
     <string name="wifi_eap_user_cert" msgid="3569182430929173220">"Certificado de usuario"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Encuadra el código QR abajo para conectarte a \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Escanea el código QR para conectarte a la red Wi‑Fi"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Compartir Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Escanea este código QR con otro dispositivo para conectarlo a \"<xliff:g id="SSID">%1$s</xliff:g>\" y compartir la contraseña"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Escanea el código QR con otro dispositivo para conectarte a \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Escanea este código QR con otro dispositivo para conectarte a \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Vuelve a intentarlo. Si el problema persiste, ponte en contacto con el fabricante del dispositivo"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Ha habido un error"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Contraseña de la red Wi‑Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Contraseña del punto de acceso: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Conexión automática"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Permite que el teléfono se conecte automáticamente a esta red cuando esté cerca"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Permitir que el tablet se conecte automáticamente a esta red cuando esté cerca"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Permitir conectarse a esta red cuando esté en rango"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Añadir dispositivo"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Usa un código QR para añadir un dispositivo a esta red"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"El formato del código QR no es válido"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Usar certificados del sistema"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"No proporcionar"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"No validar"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"No se ha especificado ningún certificado. La conexión no será privada."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"El nombre de la red es demasiado largo."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Se debe especificar un dominio."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Se necesita un certificado."</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Conectar"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Red Wi‑Fi activada"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Con conexión a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Conectando a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Conectando…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Error al conectar a la red"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"La red está fuera de rango"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"La aplicación está compartiendo contenido. Para compartir la conexión a Internet, desactiva el punto de acceso y vuelve a activarlo"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"No se ha definido ninguna contraseña"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Nombre del punto de acceso"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Activando <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Activando <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Otros dispositivos pueden conectarse a <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Contraseña del punto de acceso"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Banda del punto de acceso"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Pantalla fluida"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Aumenta automáticamente la frecuencia de actualización de 60 a 90 Hz en determinados tipos de contenido, lo que gasta más batería."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Pantalla fluida"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Forzar frecuencia de actualización de 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Se utiliza la mayor frecuencia de actualización posible para mejorar la capacidad de respuesta a toques y la calidad de las animaciones. Aumenta el uso de batería."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Atención a la pantalla"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Activado / La pantalla no se apagará si estás mirándola"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Versión de Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Actualización de seguridad de Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Modelo"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Modelo: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Modelo y hardware"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Versión de hardware"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ID de equipo"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Se han recuperado los ajustes de red"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"No se pueden borrar las SIM"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"No se pueden eliminar las SIM descargadas debido a un error.\n\nReinicia el dispositivo y vuelve a intentarlo."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Volver al estado de fábrica (borrar todo)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Volver al estado de fábrica (borrar todo)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Se borrarán todos los datos del "<b>"almacenamiento interno"</b>" del tablet, como:\n\n"<li>"Tu cuenta de Google"</li>\n<li>"Los ajustes y los datos de aplicaciones y del sistema"</li>\n<li>"Las aplicaciones descargadas"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Se borrarán todos los datos del "<b>"almacenamiento interno"</b>" del teléfono, como:\n\n"<li>"Tu cuenta de Google"</li>\n<li>"Los ajustes y los datos de aplicaciones y del sistema"</li>\n<li>"Las aplicaciones descargadas"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Has iniciado sesión en las cuentas que se indican a continuación:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Hay otros usuarios presentes en este dispositivo.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Música"</li>\n<li>"Fotos"</li>\n<li>"Otros datos de usuario"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIMs"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Esta acción no cancelará tu plan de servicios móviles."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Para eliminar la música, las imágenes y otros datos de usuario, debes borrar el "<b>"almacenamiento USB"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Para eliminar la música, las imágenes y otros datos de usuario, debes borrar la "<b>"tarjeta SD"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Borrar todos los datos"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Borrar todos los datos"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Se borrarán todos los datos del "<b>"almacenamiento interno"</b>" de tu tablet, como:\n\n"<li>"Tu cuenta de Google"</li>\n<li>"Los ajustes y los datos de aplicaciones y del sistema"</li>\n<li>"Las aplicaciones descargadas"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Se borrarán todos los datos del "<b>"almacenamiento interno"</b>" de tu teléfono, como:\n\n"<li>"Tu cuenta de Google"</li>\n<li>"Los ajustes y los datos de aplicaciones y del sistema"</li>\n<li>"Las aplicaciones descargadas"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Has iniciado sesión en estas cuentas:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Hay otros usuarios presentes en este dispositivo.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Música"</li>\n<li>"Fotos"</li>\n<li>"Otros datos de usuario"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIMs"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"No se cancelará tu plan de servicios móviles."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Para eliminar la música, las imágenes y otros datos de usuario, debes borrar el "<b>"almacenamiento USB"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Para eliminar la música, las imágenes y otros datos de usuario, debes borrar la "<b>"tarjeta SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Borrar almacenamiento USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Borrar tarjeta SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Borra todos los datos del almacenamiento USB interno, como la música o las fotos."</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Borrar todos los datos de la tarjeta SD"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Borrar todos los datos"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Borrar todos los datos"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Se eliminarán las aplicaciones que hayas descargado y tu información personal. No podrás deshacer esta acción."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Toda tu información personal, incluidas las aplicaciones y las SIM descargadas, se eliminarán. No podrás deshacer esta acción."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Borrar todo"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"No se ha reiniciado el sistema porque el servicio Borrado del sistema no está disponible."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"¿Borrar todos los datos?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Este usuario no puede restablecer el estado de fábrica"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Borrando"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Espera..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Borrar todos los datos"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Borrar todos los datos"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Se eliminarán las aplicaciones que hayas descargado y tu información personal. No podrás deshacer esta acción."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Se eliminará toda tu información personal, incluidas las aplicaciones y las tarjetas SIM descargadas. No podrás deshacer esta acción."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"¿Borrar todos los datos?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Este usuario no puede restablecer el estado de fábrica"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Borrando"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Espera…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Ajustes de llamadas"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Configurar buzón, llamada en espera, desvío e identificador"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Compartir conexión por USB"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"No se puede anclar a más de <xliff:g id="MAXCONNECTION">%1$d</xliff:g> dispositivos."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Se desactivará el anclaje a red de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Compartir Ethernet"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Comparte la conexión a Internet del teléfono por USB Ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Comparte la conexión a Internet del teléfono por Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Utiliza el punto de acceso y la conexión compartida para que otros dispositivos puedan conectarse a Internet a través de tu conexión de datos móviles. Las aplicaciones también pueden crear un punto de acceso para compartir contenido con dispositivos cercanos."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Utiliza el punto de acceso y la conexión compartida para que otros dispositivos puedan conectarse a Internet a través de tu red Wi‑Fi o tus datos móviles. Las aplicaciones también pueden crear un punto de acceso para compartir contenido con dispositivos cercanos."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Ayuda"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Preferencias de subtítulos"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Ampliación"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Área de ampliación"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Habilitar la ampliación"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Selecciona qué áreas quieres ver al ampliar la pantalla"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Pantalla completa"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Parte de la pantalla"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Pantalla completa y parte de la pantalla"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Ampliar toda la pantalla"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Ampliar parte de la pantalla"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"¿Cambiar al botón Accesibilidad?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Cuando se toca tres veces una parte de la pantalla para ampliarla, se retardan la escritura y otras acciones.\n\n¿Quieres pasar a usar el botón Accesibilidad para ampliar la pantalla?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Cambiar al botón Accesibilidad"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Seguir tocando tres veces para ampliar"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Ajustes de ampliación"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Ampliar con tres toques"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Ampliación con acceso directo"</string>
@@ -2159,7 +2159,7 @@
     <string name="accessibility_shortcut_edit_dialog_summary_software_gesture_talkback" msgid="84483464524360845">"Desde la parte inferior de la pantalla, desliza tres dedos hacia arriba.\n\nPara cambiar de una función a otra, desliza tres dedos hacia arriba y mantén pulsada la pantalla."</string>
     <string name="accessibility_shortcut_edit_dialog_title_hardware" msgid="2356853121810443026">"Mantener pulsadas las teclas de volumen"</string>
     <string name="accessibility_shortcut_hardware_keyword" msgid="3921915304537166064">"mantén pulsadas las teclas de volumen"</string>
-    <string name="accessibility_shortcut_edit_dialog_summary_hardware" msgid="2503134386397991634">"Mantén pulsadas las dos teclas de volumen"</string>
+    <string name="accessibility_shortcut_edit_dialog_summary_hardware" msgid="2503134386397991634">"Mantener pulsadas las dos teclas de volumen"</string>
     <string name="accessibility_shortcut_edit_dialog_title_triple_tap" msgid="6672798007229795841">"Triple toque en la pantalla"</string>
     <string name="accessibility_shortcut_triple_tap_keyword" msgid="6863958573135995927">"toca tres veces la pantalla"</string>
     <string name="accessibility_shortcut_edit_dialog_summary_triple_tap" msgid="3081710523998838305">"Toca la pantalla tres veces rápidamente. Esta acción puede hacer que tu dispositivo funcione más lento."</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"El botón de encendido cuelga"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Puntero del ratón grande"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Quitar animaciones"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Audio en mono"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Combina canales al reproducir audio"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Balance de audio"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Izquierdo"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Derecho"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Audio en mono"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Combina canales al reproducir audio"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Balance de audio"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Izquierda"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Derecha"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Predeterminado"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 segundos"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 segundos"</string>
@@ -2211,19 +2211,19 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Vibración de las notificaciones"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Vibración del tono"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Respuesta táctil"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Utilizar <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Abrir <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Usar corrección de color"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Mostrar subtítulos"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Solo en aplicaciones admitidas"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Utilizar <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Abrir <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Usar corrección de color"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Mostrar subtítulos"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Solo en aplicaciones compatibles"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Tamaño y estilo de los subtítulos"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Tamaño del texto: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Más opciones"</string>
     <string name="accessibility_caption_preference_summary" msgid="1191356970836416954">"Algunas aplicaciones no admiten estas preferencias de subtítulos"</string>
     <string name="accessibility_shortcut_type_software" msgid="2552732582767687515">"Botón Accesibilidad"</string>
-    <string name="accessibility_shortcut_type_software_gesture" msgid="5608959693931019059">"Desliza hacia arriba con dos dedos desde la parte inferior"</string>
-    <string name="accessibility_shortcut_type_hardware" msgid="4834144210432451916">"Mantén pulsadas las teclas de volumen"</string>
-    <string name="accessibility_shortcut_type_triple_tap" msgid="7717524216825494543">"Toca tres veces la pantalla"</string>
+    <string name="accessibility_shortcut_type_software_gesture" msgid="5608959693931019059">"Deslizar hacia arriba con dos dedos desde la parte inferior"</string>
+    <string name="accessibility_shortcut_type_hardware" msgid="4834144210432451916">"Mantener pulsadas las teclas de volumen"</string>
+    <string name="accessibility_shortcut_type_triple_tap" msgid="7717524216825494543">"Tocar tres veces la pantalla"</string>
     <string name="accessibility_hearingaid_instruction_continue_button" msgid="3367260988024430722">"Continuar"</string>
     <string name="accessibility_hearingaid_title" msgid="427173678199203191">"Audífonos"</string>
     <string name="accessibility_hearingaid_not_connected_summary" msgid="3371427366765435743">"No hay audífonos conectados"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteronomalía"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomalía"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomalía"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Escala de grises"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Rojo-verde"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Rojo-verde"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Azul-amarillo"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Restricción en segundo plano"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Permite que la aplicación se ejecute en segundo plano"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"La aplicación no puede funcionar en segundo plano"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"No se puede restringir el uso en segundo plano"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"No se puede restringir el uso en segundo plano"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"¿Limitar actividad en segundo plano?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Si limitas la actividad en segundo plano de una aplicación, puede que no funcione correctamente"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Esta aplicación no optimiza la batería, por lo que no puedes restringirla.\n\nPara hacerlo, activa antes la optimización."</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Establecer una programación"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Amplía la duración de la batería"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Desactivar cuando la batería esté cargada"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"El modo Ahorro de batería se desactiva cuando el teléfono está al <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"El modo Ahorro de batería se desactiva cuando el teléfono está al <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"El modo Ahorro de batería se desactiva cuando el teléfono está al <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Ahorro de batería se desactiva cuando tu teléfono tiene más del <xliff:g id="PERCENT">%1$s</xliff:g> de batería"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Ahorro de batería se desactiva cuando tu tablet tiene más del <xliff:g id="PERCENT">%1$s</xliff:g> de batería"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Ahorro de batería se desactiva cuando tu dispositivo tiene más del <xliff:g id="PERCENT">%1$s</xliff:g> de batería"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Activar"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Restablecer"</string>
     <string name="tts_play" msgid="2945513377250757221">"Reproducir"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Conectividad adaptable"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Alarga la duración de la batería y mejora el rendimiento del dispositivo gestionando automáticamente las conexiones de red"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Almacenamiento de credenciales"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Instalar certificados"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Instala certificados desde el almacenamiento"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Credenciales de usuario"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Consulta y modifica credenciales almacenadas"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Avanzado"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Tipo de almacenamiento"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Almacenado en hardware"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Solo software"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Las credenciales no están disponibles para este usuario"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Instalada para redes VPN y aplicaciones"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Instalada para redes Wi-Fi"</string>
@@ -2679,11 +2679,11 @@
     <string name="credentials_erased" msgid="9121052044566053345">"Almacenamiento de credenciales borrado"</string>
     <string name="credentials_not_erased" msgid="3611058412683184031">"No se ha podido borrar el almacenamiento de credenciales."</string>
     <string name="usage_access_title" msgid="1580006124578134850">"Apps con acceso de uso"</string>
-    <string name="ca_certificate" msgid="3076484307693855611">"Certificado de CA"</string>
+    <string name="ca_certificate" msgid="3076484307693855611">"Certificado AC"</string>
     <string name="user_certificate" msgid="6897024598058566466">"Certificado de usuario"</string>
     <string name="wifi_certificate" msgid="8461905432409380387">"Certificado de Wi‑Fi"</string>
     <string name="ca_certificate_warning_title" msgid="7951148441028692619">"Tus datos no serán privados"</string>
-    <string name="ca_certificate_warning_description" msgid="3386740654961466569">"Los certificados de CA permiten que los sitios web, las aplicaciones y las VPN puedan cifrar datos. Instala solo certificados de CA de organizaciones de confianza. \n\n Si instalas un certificado de CA, el propietario podrá acceder a datos (como contraseñas e información de tarjetas de crédito) que proporciones en sitios web que visites o aplicaciones que uses, incluso aunque la información esté cifrada."</string>
+    <string name="ca_certificate_warning_description" msgid="3386740654961466569">"Los certificados de CA permiten que los sitios web, las aplicaciones y las VPN puedan cifrar datos. Instala solo certificados de CA de organizaciones de confianza. \n\n Si instalas un certificado AC, el propietario podrá acceder a datos (como contraseñas e información de tarjetas de crédito) que proporciones en sitios web que visites o aplicaciones que uses, incluso aunque la información esté cifrada."</string>
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"No instalar"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Instalar (no seguro)"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"No se ha instalado el certificado"</string>
@@ -2897,7 +2897,7 @@
     <string name="vpn_ipsec_identifier" msgid="8511842694369254801">"Identificador de IPSec"</string>
     <string name="vpn_ipsec_secret" msgid="532007567355505963">"Clave precompartida de IPSec"</string>
     <string name="vpn_ipsec_user_cert" msgid="2714372103705048405">"Certificado de usuario de IPSec"</string>
-    <string name="vpn_ipsec_ca_cert" msgid="5558498943577474987">"Certificado de CA de IPSec"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="5558498943577474987">"Certificado AC de IPSec"</string>
     <string name="vpn_ipsec_server_cert" msgid="1411390470454731396">"Certificado del servidor IPSec"</string>
     <string name="vpn_show_options" msgid="6105437733943318667">"Mostrar opciones avanzadas"</string>
     <string name="vpn_search_domains" msgid="1973799969613962440">"Dominios de búsqueda de DNS"</string>
@@ -2959,13 +2959,13 @@
     <string name="trusted_credentials_enable_label" msgid="5551204878588237991">"Activar"</string>
     <string name="trusted_credentials_remove_label" msgid="8975881053042174913">"Quitar"</string>
     <string name="trusted_credentials_trust_label" msgid="4841047312274452474">"Confiar"</string>
-    <string name="trusted_credentials_enable_confirmation" msgid="6686528499458144754">"¿Quieres habilitar el certificado de CA del sistema?"</string>
-    <string name="trusted_credentials_disable_confirmation" msgid="5131642563381656676">"¿Quieres inhabilitar el certificado de CA del sistema?"</string>
-    <string name="trusted_credentials_remove_confirmation" msgid="3420345440353248381">"¿Eliminar el certificado de CA de usuario de forma permanente?"</string>
+    <string name="trusted_credentials_enable_confirmation" msgid="6686528499458144754">"¿Quieres habilitar el certificado AC del sistema?"</string>
+    <string name="trusted_credentials_disable_confirmation" msgid="5131642563381656676">"¿Quieres inhabilitar el certificado AC del sistema?"</string>
+    <string name="trusted_credentials_remove_confirmation" msgid="3420345440353248381">"¿Eliminar el certificado AC de usuario de forma permanente?"</string>
     <string name="credential_contains" msgid="407972262032275476">"Esta entrada incluye:"</string>
     <string name="one_userkey" msgid="4417212932385103517">"una clave de usuario"</string>
     <string name="one_usercrt" msgid="1865069301105101370">"un certificado de usuario"</string>
-    <string name="one_cacrt" msgid="7467796501404158399">"un certificado de CA"</string>
+    <string name="one_cacrt" msgid="7467796501404158399">"un certificado AC"</string>
     <string name="n_cacrts" msgid="5886462550192731627">"%d certificados de CA"</string>
     <string name="user_credential_title" msgid="4686178602575567298">"Detalles de credenciales"</string>
     <string name="user_credential_removed" msgid="4087675887725394743">"Quitar credencial: <xliff:g id="CREDENTIAL_NAME">%s</xliff:g>"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Cómo pagar en el terminal"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Configura una aplicación de pago. A continuación, solo tienes que sostener la parte trasera del teléfono sobre cualquier terminal con el símbolo de pago contactless."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Entendido"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Más..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Más…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Elegir aplicación de pago predeterminada"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Actualizar aplicación de pago predeterminada"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"En un terminal contactless, paga con <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Usar siempre esta para llamadas"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Selecciona una SIM de datos"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Selecciona una tarjeta SIM para los SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Cambiando SIM de datos. Este proceso puede tardar hasta un minuto..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Cambiando SIM de datos. Este proceso puede tardar hasta un minuto…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Llamar con"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Selecciona una tarjeta SIM"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"rutina, horario, ahorro de batería, ahorro de corriente, batería, automático, porcentaje"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, llamadas avanzadas, llamadas 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"añadir idioma, añadir un idioma, añadir lengua, añadir una lengua"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"tamaño del texto"</string>
     <string name="default_sound" msgid="6604374495015245195">"Sonido predeterminado"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"El volumen del tono de llamada y de las notificaciones está al <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Volumen, vibración, No molestar"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Sonidos de encendido"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Subtítulos automáticos"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Subtitula automáticamente el contenido multimedia"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Ninguna"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> horarios establecidos</item>
-      <item quantity="one">1 horario establecido</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Ninguno}=1{1 horario creado}other{# horarios creados}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"No molestar"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Recibe notificaciones solo de personas y aplicaciones importantes"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limitar interrupciones"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Solo interrupciones prioritarias"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Activado / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Desactivado / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Desactivado"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Activado"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Preguntar siempre"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Hasta que lo desactives"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> horas</item>
-      <item quantity="one">1 hora</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minutos"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> programaciones se pueden activar automáticamente</item>
-      <item quantity="one">1 programación se puede activar automáticamente</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 hora}other{# horas}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minuto}other{# minutos}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Desactivado}=1{Desactivado; 1 horario puede activarlo automáticamente}other{Desactivado; # horarios pueden activarlo automáticamente}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Qué puede interrumpirte con el modo No molestar"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Personas"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Aplicaciones"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Establece automáticamente las notificaciones prioritarias como Discretas"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Clasificación de notificaciones adaptable"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Clasificar las notificaciones por importancia automáticamente"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Comentarios sobre notificaciones adaptativas"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Indica los ajustes hechos a las notificaciones y muestra la opción para enviar comentarios al sistema"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Acciones y respuestas sugeridas"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Muestra automáticamente las acciones y las respuestas sugeridas"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Consulta las notificaciones recientes y pospuestas"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Acceso a No molestar"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Permitir No molestar"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Ninguna aplicación instalada ha solicitado acceso de No molestar"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Cargando aplicaciones..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Cargando aplicaciones…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Como solicitaste, Android está bloqueando las notificaciones de esta aplicación para que no aparezcan en el dispositivo"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Como solicitaste, Android está bloqueando esta categoría de notificaciones para que no aparezcan en el dispositivo"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Como solicitaste, Android está bloqueando este grupo de notificaciones para que no aparezcan en el dispositivo"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Todas las conversaciones"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Conversaciones prioritarias"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Ninguna"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> conversaciones</item>
-      <item quantity="one">1 conversación</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Ninguna"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Ninguna}=1{1 conversación}other{# conversaciones}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Quién puede interrumpirte"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Llamadas"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Llamadas"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Para asegurarte de que las llamadas permitidas suenan, comprueba que el dispositivo está configurado para sonar"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Las llamadas entrantes se bloquean en la programación \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\". Cambia los ajustes para que tus amigos, familiares u otros puedan contactar contigo."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Contactos destacados"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> más</item>
-      <item quantity="one">1 más</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Ninguno"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Nadie}=1{{contact_1}}=2{{contact_1} y {contact_2}}=3{{contact_1}, {contact_2} y {contact_3}}other{{contact_1}, {contact_2} y # más}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Mensajes"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"mensajes"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Mensajes"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Los mensajes entrantes se bloquean en la programación \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\". Cambia los ajustes para que tus amigos, familiares u otros puedan contactar contigo."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Todos los mensajes pueden interrumpirte"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Todas las llamadas pueden interrumpirte"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Ninguno"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> contactos</item>
-      <item quantity="one">1 contacto</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Nadie}=1{1 contacto}other{# contactos}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Todo el mundo"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Contactos"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Contactos destacados"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Todas las notificaciones"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Algunas notificaciones"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Las personas seleccionadas podrán ponerse en contacto contigo, incluso si no permites que las aplicaciones puedan interrumpirte"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> pueden interrumpirte</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> puede interrumpirte</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> más"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Ninguna aplicación puede interrumpirte}=1{{app_1} puede interrumpirte}=2{{app_1} y {app_2} pueden interrumpirte}=3{{app_1}, {app_2} y {app_3} pueden interrumpirte}other{{app_1}, {app_2} y # más pueden interrumpirte}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Aplicaciones"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Todas las notificaciones"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Algunas notificaciones"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Notificaciones que pueden interrumpirte"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Permitir todas las notificaciones"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> pueden interrumpirte</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> puede interrumpirte</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Nada puede interrumpirte"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> más"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Nada puede interrumpirte}=1{{sound_category_1} puede interrumpirte}=2{{sound_category_1} y {sound_category_2} pueden interrumpirte}=3{{sound_category_1}, {sound_category_2} y {sound_category_3} pueden interrumpirte}other{{sound_category_1}, {sound_category_2} y # más pueden interrumpirte}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Nada puede interrumpirte"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Nadie puede interrumpirte"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Algunas personas pueden interrumpirte"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Todo el mundo puede interrumpirte"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB controlado por"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Dispositivo conectado"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Este dispositivo"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Cambiando..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Cambiando…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"No se ha podido hacer el cambio"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Cargando el dispositivo"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Cargando dispositivo conectado"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Ver detalles"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Ahorro de datos"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Datos sin restricción"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Las datos en segundo plano están desactivadas"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Los datos en segundo plano están desactivados"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Activado"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Desactivado"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Usar ahorro de datos"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Si el dispositivo está bloqueado, evitar que se escriban respuestas u otros textos en las notificaciones"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Corrector predeterminado"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Elige corrector ortográfico"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Usar corrector ortográfico"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Usar corrector ortográfico"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"No seleccionado"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(ninguno)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Para liberar espacio, el Administrador de Almacenamiento borrará de tu dispositivo las fotos y vídeos que tengan copia de seguridad."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Borrar fotos y vídeos"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Administrador de almacenamiento"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Utilizar el Administrador de Almacenamiento"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Usar administrador de almacenamiento"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automático"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Liberar espacio ahora"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Doble toque para consultar el teléfono"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Doble toque para consultar el tablet"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Doble toque para consultar el dispositivo"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Desliza para ver notific."</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Desliza el dedo hacia abajo en el borde inferior para ver tus notificaciones"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Modo una mano"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Usar modo una mano"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Salir al cambiar de aplicación"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Tiempo de espera"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 segundos"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 segundos"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 segundos"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"fácil alcance"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Toca la pantalla dos veces para consultar la hora, las notificaciones y otra información."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Levantar el teléfono para consultarlo"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Levantar el tablet para comprobar las notificaciones"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Toca para comprobar el tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Toca para comprobar el dispositivo"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Para ver la hora, las notificaciones y otra información, toca la pantalla."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Botón de pánico"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Puedes iniciar las acciones de SOS de emergencia pulsando el botón de encendido 5 veces rápidamente."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Sonido de alerta"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Avisar antes de iniciar las acciones"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Contactos de emergencias"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Deslizar por el sensor de huellas para ver notificaciones"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Deslizar por sensor de huella digital"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Para ver tus notificaciones, desliza el dedo hacia abajo en el sensor de huellas digitales de la parte trasera del teléfono."</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Habilitar en todas las aplicaciones"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Seleccionar controlador de gráficos"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Opción predeterminada"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Controlador de juegos"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Controlador de juegos"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Controlador para desarrolladores"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Controlador de gráficos del sistema"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"No se ha encontrado ninguna red. Vuelve a intentarlo."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(prohibida)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"No hay ninguna tarjeta SIM"</string>
+    <string name="sim_card" msgid="6381158752066377709">"Tarjeta SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Ninguna tarjeta SIM"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Nada"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Se necesita una tarjeta SIM para conectarse"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Se necesita una tarjeta SIM de <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> para conectarse"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Preferencia de modo de red: WCDMA preferido"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Preferencia de modo de red: solo GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Preferencia de modo de red: solo WCDMA"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Datos móviles"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Acceder a datos con la red móvil"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"El teléfono cambiará automáticamente a este operador cuando esté en su rango"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Ninguna tarjeta SIM disponible"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Preferencias de llamadas"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Preferencia de SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Preguntar siempre"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Permitir las superposiciones en pantallas de Ajustes"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Permite que otras aplicaciones se superpongan a la aplicación ajustes"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Multimedia"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Ocultar reproductor al acabar la sesión multimedia"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"El reproductor te permite seguir con una sesión desde el panel ampliado de ajustes rápidos."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Reproductor multimedia en los ajustes rápidos"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Muestra el reproductor durante mucho tiempo para que puedas reanudar fácilmente el contenido"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Ocultar reproductor"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Mostrar reproductor"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"No hay reproductores disponibles"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Aplicaciones permitidas"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"multimedia"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Se activará el Bluetooth"</string>
 </resources>
diff --git a/res/values-et/arrays.xml b/res/values-et/arrays.xml
index 036cf5f..1bdf94b 100644
--- a/res/values-et/arrays.xml
+++ b/res/values-et/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Keskmine"</item>
     <item msgid="6740026006576843477">"Pikk"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Lühike"</item>
+    <item msgid="7397961711906421599">"Keskmine"</item>
+    <item msgid="4079132024502041928">"Pikk"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Vaikeseade"</item>
     <item msgid="4234707448428002595">"Sans Serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Üldine"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Ainult TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Üldine"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 69c46bd..cabe408 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Kuva lukustusekraanil profiili teave"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Kontod"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Asukoht"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Kasuta asukohta"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Kasuta asukohta"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Väljas"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">Sees – <xliff:g id="COUNT_1">%1$d</xliff:g> rakendusel on asukohale juurdepääs</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Kasutage autentimiseks oma nägu"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Alustamine"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Kui juurdepääsetavuse Face Unlock välja lülitatakse, ei pruugi mõned seadistustoimingud TalkBackiga õigesti töötada."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Mine tagasi"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Jätka seadistamist"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Kasuta juurdepääset. seadistust"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="one">Peab olema alla <xliff:g id="NUMBER_0">%d</xliff:g> numbri</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Seadme administraator ei luba kasutada viimast PIN-koodi"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"IT-administraator on levinud PIN-koodid blokeerinud. Proovige muud PIN-koodi."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"See ei tohi sisaldada sobimatut tähemärki"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Peab sisaldama vähemalt ühte tähte"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Peab sisaldama vähemalt ühte numbrit"</string>
@@ -653,7 +655,6 @@
       <item quantity="one">Peab sisaldama vähemalt 1 tähemärki, mis ei ole number</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Seadme administraator ei luba kasutada hiljutist parooli"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"IT-administraator on levinud paroolid blokeerinud. Proovige muud parooli."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Kasvavad, kahanevad või korduvad numbrijadad on keelatud"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Kinnita"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Tühista"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"WiFi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Lülita WiFi sisse"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"WiFi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"WiFi kasutus"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"WiFi kasutus"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"WiFi-seaded"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"WiFi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Määra ja halda traadita pääsupunkte"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Võrguga „<xliff:g id="SSID">%1$s</xliff:g>” ühenduse oomiseks paigutage QR-kood allolevas aknas keskele"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Liituge WiFi-võrguga, skannides QR-koodi"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"WiFi jagamine"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Skannige see QR-kood, et luua ühendus võrguga „<xliff:g id="SSID">%1$s</xliff:g>” ja jagada parooli"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Võrguga „<xliff:g id="SSID">%1$s</xliff:g>” liitumiseks skannige see QR-kood teise seadmega"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Võrguga „<xliff:g id="SSID">%1$s</xliff:g>” ühenduse loomiseks skannige see QR-kood"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Proovige uuesti. Kui see probleem jätkub, võtke ühendust seadme tootjaga"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Midagi läks valesti"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"WiFi-võrgu parool: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Kuumkoha parool: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Automaatne ühendamine"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Luba telefonil selle võrgu läheduses automaatselt ühendada"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Luba tahvelarvutil selle võrgu läheduses automaatselt ühendada"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Luba levialas selle võrguga ühendamine"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Seadme lisamine"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Kasutage sellesse võrku seadme lisamiseks QR-koodi"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR-kood ei ole sobilik vorming"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Kasuta süsteemi sertifikaate"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Ära esita"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Ära kinnita"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Sertifikaati pole määratud. Teie ühendus pole privaatne."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Võrgu nimi on liiga pikk."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Domeeni määramine on kohustuslik."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Sertifikaat on nõutav."</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Ühenda"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"WiFi on sisse lülitatud"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Ühendatud võrguga <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Ühendamine võrguga <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Ühendamine …"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Võrguga ühenduse loomine ebaõnnestus"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Te ei ole võrgu levialas"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Rakendus jagab sisu. Interneti-ühenduse jagamiseks lülitage kuumkoht välja ja seejärel uuesti sisse."</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Parool on määramata"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Kuumkoha nimi"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Võrgu <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> sisselülitamine …"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Kuumkoha <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> sisselülitamine …"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Teised seadmed saavad luua ühenduse võrguga <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Kuumkoha parool"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Pääsupunkti sagedusriba"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Suurendab teatud sisu puhul värskendamissagedust 60 hertsilt 90 hertsini. Akukasutus suureneb."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Jõusta 90 Hz värskendamissagedus"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Kõrgeim värskendamissagedus täiustab puutetundlikkust ja pakub sujuvamaid animatsioone. Akukasutus suureneb."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Ekraanivaatamise tuvastus"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Sees / ekraan jääb sisselülitatuks, kui seda vaatate"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Androidi versioon"</string>
     <string name="security_patch" msgid="4071756145347865382">"Androidi turvavärskendus"</string>
     <string name="model_info" msgid="8997566254717810904">"Mudel"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Mudel: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Mudel ja riistvara"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Riistvara versioon"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Seadme ID"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Võrguseaded lähtestati"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"SIM-kaarte ei saa kustutada"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Allalaaditud SIM-kaarte ei saa vea tõttu kustutada.\n\nTaaskäivitage seade ja proovige uuesti."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Kõigi andmete kustutamine (tehaseseadetele lähtestamine)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Kust. andmed (tehases. läht.)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"See kustutab teie tahvelarvuti "<b>"sisemälust"</b>" kõik andmed, sh:\n\n"<li>"teie Google\'i konto;"</li>\n<li>"süsteemi ja rakenduste andmed ning seaded;"</li>\n<li>"allalaaditud rakendused."</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"See kustutab teie telefoni "<b>"sisemälust"</b>" kõik andmed, sh järgmised.\n\n"<li>"Teie Google\'i konto"</li>\n<li>"Süsteemi- ja rakenduste andmed ning seaded"</li>\n<li>"Allalaaditud rakendused"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Olete praegu sisse logitud järgmistele kontodele:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Seadmes on teisi kasutajaid.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Muusika"</li>\n<li>"Fotod"</li>\n<li>"Muud kasutajaandmed"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM-id"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"See ei tühista teie mobiilsideteenuse paketti."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Muusika, piltide ja muu kasutajateabe kustutamiseks tuleb tühjendada ka "<b>"USB-mäluseade"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Muusika, piltide ja muude kasutajaandmete kustutamiseks tuleb tühjendada ka "<b>"SD-kaart"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Kustuta kõik andmed (tehaseseadetele lähtestamine)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Kust. andmed (tehases. läht.)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"See kustutab teie tahvelarvuti "<b>"sisemälust"</b>" kõik andmed, sh järgmised.\n\n"<li>"Teie Google\'i konto"</li>\n<li>"Süsteemi- ja rakenduste andmed ning seaded"</li>\n<li>"Allalaaditud rakendused"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"See kustutab teie telefoni "<b>"sisemälust"</b>" kõik andmed, sh järgmised.\n\n"<li>"Teie Google\'i konto"</li>\n<li>"Süsteemi- ja rakenduste andmed ning seaded"</li>\n<li>"Allalaaditud rakendused"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Olete praegu sisse logitud järgmistele kontodele:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Seadmes on teisi kasutajaid.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Muusika"</li>\n<li>"Fotod"</li>\n<li>"Muud kasutajaandmed"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM-id"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"See ei tühista teie mobiilsideteenuse paketti."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Muusika, piltide ja muude kasutajaandmete kustutamiseks tuleb tühjendada ka "<b>"USB-mäluseade"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Muusika, piltide ja muude kasutajaandmete kustutamiseks tuleb tühjendada ka "<b>"SD-kaart"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Kustuta USB-mäluseade"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Kustuta SD-kaart"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Sisemiselt USB-mäluseadmelt kõikide andmete (nt muusika või fotode) kustutamine"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"SD-kaardilt kõigi andmete (nt muusika või fotode) kustutamine"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Kustuta kõik andmed"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Kustuta kõik andmed"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Kõik teie isiklikud andmed ja allalaaditud rakendused kustutatakse. Seda toimingut ei saa tagasi võtta."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Kõik teie isiklikud andmed, sealhulgas allalaaditud rakendused ja SIM-id kustutatakse. Seda toimingut ei saa tagasi võtta."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Kustuta kõik"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Lähtestust ei tehtud, sest süsteemi kustutamise teenus pole saadaval."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Kas kustutada kõik andmed?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Tehaseseadetele lähtestamine pole selle kasutaja puhul saadaval"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Kustutamine"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Oodake ..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Kustuta kõik andmed"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Kustuta kõik andmed"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Kõik teie isiklikud andmed ja allalaaditud rakendused kustutatakse. Seda toimingut ei saa tagasi võtta."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Kõik teie isiklikud andmed, sealhulgas allalaaditud rakendused ja SIM-kaardid kustutatakse. Seda toimingut ei saa tagasi võtta."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Kas kustutada kõik andmed?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Tehaseseadetele lähtestamine pole selle kasutaja puhul saadaval"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Kustutamine"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Oodake …"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Kõneseaded"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Seadista kõnepost, kõne edastamine, ootel kõne, helistaja ID"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB jagamine"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Ei saa jagada rohkem kui <xliff:g id="MAXCONNECTION">%1$d</xliff:g> seadmele."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Seadme <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ühenduse jagamine lõpetatakse."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Etherneti jagamine"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Telefoni internetiühenduse jagamine USB Etherneti kaudu"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Telefoni internetiühenduse jagamine Etherneti kaudu"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Teistele seadmetele mobiilse andmesidevõrgu kaudu Interneti-ühenduse pakkumiseks kasutage kuumkohta ja ühenduse jagamist. Samuti saavad kuumkoha luua rakendused, et jagada sisu läheduses olevate seadmetega."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Teistele seadmetele WiFi- või mobiilse andmesidevõrgu kaudu internetiühenduse pakkumiseks kasutage kuumkohta ja ühenduse jagamist. Samuti saavad kuumkoha luua rakendused, et jagada sisu läheduses olevate seadmetega."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Abi"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Subtiitrite eelistused"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Suurendus"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Suurendusala"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Suurendamise lubamine"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Valige ala(d), mida ekraanikuva suurendamisel suurendada"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Täisekraan"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Osa ekraanikuvast"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Täisekraan ja osa ekraanikuvast"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Kogu ekraanikuva suurendamine"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Ekraanikuva osa suurendamine"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Kas lülitada juurdepääsetavuse nupule?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Kolmikpuudutuse kasutamine ekraanikuva teatud osa suurendamiseks põhjustab teksti sisestamisel ja muude toimingute tegemisel viiteid.\n\nKas soovite suurendamiseks lülitada juurdepääsetavuse nupu kasutamisele?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Lülita juurdepääsetavuse nupule"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Säilita suurendamiseks kolmikpuudutus"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Suurendamisseaded"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Kolmikpuudutusega suurendamine"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Otsetee abil suurendamine"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Toitenupp lõpetab kõne"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Suur hiirekursor"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Animatsioonide eemaldamine"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Monoheli"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Kanalite ühendamine heli esitamisel"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Heli tasakaal"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Vasak"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Parem"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Monoheli"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Kanalite ühendamine heli esitamisel"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Heli tasakaal"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Vasak"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Parem"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Vaikeseade"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 sekundit"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 sekundit"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Märguanne koos vibreerimisega"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Helin koos vibreerimisega"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Puudutuste tagasiside"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Kasuta funktsiooni <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Ava <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Kasuta värvide korrigeerimist"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Kuva subtiitrid"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Ainult toetatud rakendustes"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Kasuta rakendust <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"URL-i <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> avamine"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Kasuta värvide korrigeerimist"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Kuva subtiitrid"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Ainult toetatud rakendustes"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Subtiitrite suurus ja stiil"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Teksti suurus – <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Rohkem valikuid"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomaalia"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomaalia"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomaalia"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Halltoonid"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Punane-roheline"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Punane-roheline"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Sinine-kollane"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Taustal kasutamise piiramine"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Lubatakse rakenduse taustal käitamine"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Rakendusel ei ole lubatud taustal töötada"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Taustal kasutamist ei saa piirata"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Taustal kasutamist ei saa piirata"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Kas piirata taustal tegevust?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Kui piirate rakenduse tegevust taustal, võib rakendus valesti käituda."</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Kuna rak. pole aku optimeerimine seadistatud, ei saa te seda piirata.\n\nRak. piiramiseks lülit. esmalt sisse aku optimeerimine."</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Ajakava määramine"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Aku tööea pikendamine"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Lülita välja, kui aku on täis laetud"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Akusäästja lülitub välja, kui telefoni aku laetuse tase on <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Akusäästja lülitub välja, kui tahvelarvuti aku laetuse tase on <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Akusäästja lülitub välja, kui seadme aku laetuse tase on <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Akusäästja lülitub välja, kui telefoni laetuse tase ületab <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Akusäästja lülitub välja, kui tahvelarvuti laetuse tase ületab <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Akusäästja lülitub välja, kui seadme laetuse tase ületab <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Lülita sisse"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Lähtesta"</string>
     <string name="tts_play" msgid="2945513377250757221">"Esita"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Kohanduv ühenduvus"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Pikendab aku tööiga ja täiustab seadme toimivust, hallates automaatselt teie võrguühendusi"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Mandaatide salvestusruum"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Sertifikaadi installimine"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Sertifikaatide installimine salvestusseadmelt"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Kasutaja mandaadid"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Salvestatud mandaatide vaatamine ja muutmine"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Täpsemad"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Salvestusruumi tüüp"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Riistvaratoega"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Ainult tarkvara"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Mandaadid pole selle kasutaja jaoks saadaval"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Installitud VPN-i ja rakenduste jaoks"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Installitud WiFi jaoks"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Terminali kaudu maksmine"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Seadistage makserakendus. Seejärel peate oma telefoni tagakülge hoidma lihtsalt mis tahes terminali suunas, millel on kontaktivaba makse sümbol."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Selge"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Rohkem ..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Rohkem …"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Määrake vaikemakserakenduseks"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Värskendage vaikemakserakendust"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Kontaktivabas terminalis maksate rakendusega <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Kasuta helistamiseks alati seda"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Andmete SIM-kaardi valimine"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Valige SMS-i jaoks SIM-kaart"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Andmete SIM-kaardi vahetamine, selleks võib kuluda kuni üks minut ..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Andmete SIM-kaardi vahetamine, selleks võib kuluda kuni üks minut …"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Helistamine SIM-kaardiga"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"SIM-kaardi valimine"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"rutiin, ajakava, akusäästja, toite säästmine, aku, automaatne, protsent"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, täiustatud helistamine, 4g-kõned"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"lisa keel, keele lisamine"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"teksti suurus"</string>
     <string name="default_sound" msgid="6604374495015245195">"Vaikeheli"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Helina ja märguannete helitugevus on <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Helitugevus, vibreerimine, režiim Mitte segada"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Sisselülitamise helid"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Reaalajas subtiitrid"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Meediasisu automaatsed subtiitrid"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Mitte ükski"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ajakava on määratud</item>
-      <item quantity="one">1 ajakava on määratud</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Puudub}=1{1 ajakava on määratud}other{# ajakava on määratud}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Mitte segada"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Ainult oluliste inimeste ja rakendustega seotud märguanded"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Katkestuste piiramine"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Ainult prioriteetsed"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Sees / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Väljas / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Väljas"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Sees"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Küsi iga kord"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Kuni välja lülitate"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> tundi</item>
-      <item quantity="one">1 tund</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minutit"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ajakava saab automaatselt sisse lülitada</item>
-      <item quantity="one">1 ajakava saab automaatselt sisse lülitada</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 tund}other{# tundi}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minut}other{# minutit}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Väljas}=1{Väljas / 1 ajakava saab automaatselt sisse lülitada}other{Väljas / # ajakava saavad automaatselt sisse lülitada}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Mis saavad režiimi Mitte segada katkestada?"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Inimesed"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Rakendused"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Madalama prioriteediga märguanded määratakse automaatselt leebeteks märguanneteks"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Märguannete kohanduv järjestamine"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Järjesta märguanded automaatselt asjakohasuse järgi"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Kohanduvate märguannete tagasiside"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Näitab, kuidas on märguandeid kohandatud. Samuti näitab valikut süsteemile tagasiside andmiseks."</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Soovitatud toimingud ja vastused"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Kuva soovitatud toimingud ja vastused automaatselt"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Kuva hiljutisi ja edasilükatud märguandeid"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Mitte segada juurdepääs"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Luba funktsioon Mitte segada"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Ükski installitud rakendus pole palunud juurdepääsu funktsioonile Mitte segada"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Rakenduste laadimine ..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Rakenduste laadimine …"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Teie taotluse kohaselt blokeerib Android selle rakenduse märguannete kuvamise selles seadmes"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Teie taotluse kohaselt blokeerib Android selle märguandekategooria kuvamise selles seadmes"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Teie taotluse kohaselt blokeerib Android selle märguandegrupi kuvamise selles seadmes"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Kõik vestlused"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Prioriteetsed vestlused"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Mitte ükski"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> vestlust</item>
-      <item quantity="one">1 vestlus</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Mitte ükski"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Puudub}=1{1 vestlus}other{# vestlust}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Kes saavad katkestada?"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Kõned"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Kõned"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Selleks et telefon lubatud kõnede puhul heliseks, kontrollige, kas helinarežiim on aktiveeritud."</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Ajakava „<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>” puhul on sissetulevad kõned blokeeritud. Võite seadeid kohandada, et võimaldada sõpradel, pereliikmetel või muudel kontaktidel teiega ühendust võtta."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Tärniga tähistatud kontaktid"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other">Veel <xliff:g id="NUM_PEOPLE">%d</xliff:g> inimest</item>
-      <item quantity="one">Veel 1 inimene</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Mitte ükski"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Puudub}=1{{contact_1}}=2{{contact_1} ja {contact_2}}=3{{contact_1}, {contact_2} ja {contact_3}}other{{contact_1}, {contact_2} ja veel #}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Sõnumid"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"sõnumid"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Sõnumid"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Ajakava „<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>” puhul on sissetulevad sõnumid blokeeritud Võite seadeid kohandada, et võimaldada sõpradel, pereliikmetel või muudel kontaktidel teiega ühendust võtta."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Kõik sõnumid jõuavad teieni"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Kõik kõned jõuavad teieni"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Puuduvad"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontakti</item>
-      <item quantity="one">1 kontakt</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Puudub}=1{1 kontakt}other{# kontakti}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Kõik"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Kontaktid"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Tärniga tähistatud kontaktid"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Kõik märguanded"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Mõned märguanded"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Valitud inimesed saavad teiega ühendust võtta, isegi kui te ei luba rakendustel end segada"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> saavad katkestada</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> saab katkestada</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"Veel <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Mitte ükski rakendus ei saa katkestada}=1{{app_1} saab katkestada}=2{{app_1} ja {app_2} saavad katkestada}=3{{app_1}, {app_2} ja {app_3} saavad katkestada}other{{app_1}, {app_2} ja veel # saavad katkestada}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Rakendused"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Kõik märguanded"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Mõnd märguanded"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Märguanded, mis saavad katkestada"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Luba kõik märguanded"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> saavad katkestada</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> saab katkestada</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Mitte miski ei saa katkestada"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"Veel <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Mitte miski ei saa katkestada}=1{{sound_category_1} saab katkestada}=2{{sound_category_1} ja {sound_category_2} saavad katkestada}=3{{sound_category_1}, {sound_category_2} ja {sound_category_3} saavad katkestada}other{{sound_category_1}, {sound_category_2} ja veel # saavad katkestada}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Mitte miski ei saa katkestada"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Mitte keegi ei saa katkestada"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Mõned inimesed saavad katkestada"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Kõik inimesed saavad katkestada"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB-liidest juhib"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Ühendatud seade"</string>
     <string name="usb_control_device" msgid="527916783743021577">"See seade"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Vahetamine …"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Vahetamine …"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Ei õnnestunud vahetada"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Selle seadme laadimine"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Ühendatud seadme laadimine"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Kuva üksikasjad"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Andmemahu säästja"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Piiramata andmeside"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Taustaandmed on välja lülitatud"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Taustaandmed on välja lülitatud"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Sees"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Väljas"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Andmemahu säästja kasutamine"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Kui seade on lukus, keela märguannetes vastuste või muu teksti sisestamine"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Vaikeõigekirjakontroll"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Õigekirjakontrolli valimine"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Kasuta õigekirjakontrolli"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Kasuta õigekirjakontrolli"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Pole valitud"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(puudub)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Salvestusruumi vabastamiseks eemaldab salvestusruumi haldur varundatud fotod ja videod teie seadmest."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Fotode ja videote eemaldamine"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Salvestusruumi haldur"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Kasuta salvestusruumi haldurit"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Kasuta salvestusruumi haldurit"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automaatne"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Käsitsi"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Vabastage ruumi"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Telefoni kontrollimiseks topeltpuudutamine"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Topeltpuudutage tahvelarvuti kontrollimiseks"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Topeltpuudutage seadme kontrollimiseks"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Märguan. nägem. pühkimine"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Märguannete kuvamiseks pühkige ekraanikuva alumises servas alla"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Ühekäerežiim"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Kasuta ühekäerežiimi"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Välju rakenduste vahel vahetamisel"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Ajalõpp"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 sekundit"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 sekundit"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 sekundit"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"ühe käega kasutamine"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Kellaaja, märguannete ja muu teabe vaatamiseks topeltpuudutage oma ekraani."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Telefoni kontrollimiseks tõstmine"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Tahvelarvuti kontrollimiseks tõstke seda"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Puudutamine tahvelarvuti kontrollimiseks"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Puudutamine seadme kontrollimiseks"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Kellaaja, märguannete ja muu teabe vaatamiseks puudutage oma ekraani."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Paanikanupp"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Hädaolukorra SOS-toimingute käivitamiseks vajutage kiiresti viis korda järjest toitenuppu."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Hoiatusheli"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Hoiata enne toimingute käivitamist"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Hädaolukorra kontaktid"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Sõrmejälje pühkimine märguannete vaatamiseks"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Sõrmejälje pühkimine"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Märguannete kontrollimiseks pühkige telefoni tagaküljel oleval sõrmejäljeanduril alla."</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Luba kõigi rakenduste puhul"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Graafikadraiveri valimine"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Vaikeseade"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Mängudraiver"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Mängudraiver"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Arendaja draiver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Süsteemi graafikadraiver"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Võrke ei õnnestunud leida. Proovige uuesti."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(keelatud)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"SIM-kaarti pole"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM-kaart"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"SIM-kaarti pole"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Pole"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Ühendamiseks on vaja SIM-kaarti"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Ühendamiseks on vaja operaatori <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> SIM-kaarti"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Eelistatud võrgurežiim: eelistatud WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Eelistatud võrgurežiim: ainult GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Eelistatud võrgurežiim: ainult WCDMA"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobiilne andmeside"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Andmesideühendus mobiilsidevõrgu abil"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Telefon aktiveerib levialasse jõudmisel selle operaatori automaatselt"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Ühtegi SIM-i pole saadaval"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Kõnede eelistus"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS-i eelistus"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Küsi iga kord"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Lubage seadetes ekraani ülekatted"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Lubage rakendustel, mida tohib kuvada teiste rakenduste peal, katta seadete ekraanikuvasid"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Meedia"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Peida pleier, kui meediaseanss on lõppenud"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Pleier võimaldab teil seanssi jätkata kiirseadete laiendatud paneelil."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Meediapleier kiirseadetes"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Meediapleieri kuvamine pikemaks ajaks, et hõlpsalt taasesitust jätkata"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Peida pleier"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Kuva pleier"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Ühtegi pleierit pole saadaval"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Lubatud rakendused"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"meedia"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth lülitub sisse"</string>
 </resources>
diff --git a/res/values-eu/arrays.xml b/res/values-eu/arrays.xml
index 7bbff21..2ec1da0 100644
--- a/res/values-eu/arrays.xml
+++ b/res/values-eu/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Ertaina"</item>
     <item msgid="6740026006576843477">"Luzea"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Laburra"</item>
+    <item msgid="7397961711906421599">"Ertaina"</item>
+    <item msgid="4079132024502041928">"Luzea"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Lehenetsia"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Orokorrak"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA soilik"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Orokorrak"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 4a3884d..2ee3102 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Erakutsi profileko informazioa pantaila blokeatuan."</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Kontuak"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Kokapena"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Erabili kokapena"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Erabili kokapena"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Desaktibatuta"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">Aktibatuta: <xliff:g id="COUNT_1">%1$d</xliff:g> aplikaziok kokapena atzi dezakete</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Erabili aurpegia autentifikatzeko"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Hasi"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Aurpegiaren bidez desblokeatzeko eginbidea desaktibatuta badago erabilerraztasun moduan, baliteke konfigurazio-urratsek ongi ez funtzionatzea TalkBack-ekin."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Egin atzera"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Jarraitu konfiguratzen"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Erabili erabilerraztasun-konfigurazioa"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="one"><xliff:g id="NUMBER_0">%d</xliff:g> digitu baino gutxiago izan behar du</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Gailuaren administratzaileak ez du eman beste PIN kode bat erabiltzeko baimenik"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"IKT saileko administratzaileak blokeatu egiten ditu asmatzen errazak diren PIN kodeak. Erabili beste PIN bat."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Ezin da erabili onartzen ez den karaktererik"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Hizki bat eduki behar du gutxienez"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Zenbaki bat eduki behar du gutxienez"</string>
@@ -653,7 +655,6 @@
       <item quantity="one">Gutxienez, zenbakizkoa ez den 1 karaktere izan behar du</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Gailuaren administratzaileak ez du eman beste pasahitz bat erabiltzeko baimenik"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"IKT saileko administratzaileak blokeatu egiten ditu asmatzen errazak diren pasahitzak. Erabili beste pasahitz bat."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Ezin da erabili goranzko, beheranzko edo errepikatutako digitu-sekuentziarik"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Berretsi"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Utzi"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wifia"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Aktibatu Wi-Fia"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wifia"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Erabili wifi-konexioa"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Erabili wifi-konexioa"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wi-Fi ezarpenak"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wifia"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Konfiguratu eta kudeatu hari gabeko sarbide-puntuak"</string>
@@ -823,7 +824,7 @@
     <string name="wifi_scan_notify_text" msgid="2518097467707535013">"Kokapenaren zehaztasuna hobetzeko, aplikazioek eta zerbitzuek wifi-sareak bilatzen jarraituko dute, baita wifi-konexioa desaktibatuta dagoenean ere. Besteak beste, kokapenean oinarritutako eginbideak eta zerbitzuak hobetzeko erabil daiteke. Aukera hori aldatzeko, joan <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>bilatzeko ezarpenetara<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_text_scanning_off" msgid="6189528915806353667">"Kokapenaren zehaztasuna hobetzeko, aktibatu Wifi-sareen bilaketa <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>bilatzeko ezarpenetan<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="8436897497968907701">"Ez erakutsi berriro"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="6285374200292675649">"Izan Wi-Fia aktibatuta egoera inaktiboan"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="6285374200292675649">"Eduki Wi-Fia aktibatuta egoera inaktiboan"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8753852404141070878">"Wi‑Fi aktibatuta inaktibo moduan"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="4512566787805720422">"Arazo bat izan da ezarpena aldatzean"</string>
     <string name="wifi_suspend_efficiency_title" msgid="3589291227092825754">"Egin eraginkorrago"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"\"<xliff:g id="SSID">%1$s</xliff:g>\" sarera konektatzeko, erdiratu QR kodea hemen behean"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Wifi-sarean sartzeko, eskaneatu QR kodea"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Partekatu wifi-konexioa"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Eskaneatu QR kode hau \"<xliff:g id="SSID">%1$s</xliff:g>\" sarera konektatu eta pasahitza partekatzeko"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"\"<xliff:g id="SSID">%1$s</xliff:g>\" sarean sartzeko, eskaneatu QR kode hau beste gailu batekin"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Eskaneatu QR kode hau \"<xliff:g id="SSID">%1$s</xliff:g>\" sarera konektatzeko"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Saiatu berriro. Arazoak badirau, jarri gailuaren fabrikatzailearekin harremanetan."</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Arazoren bat izan da"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wifi-sarearen pasahitza: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Wifi-gunearen pasahitza: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Konexio automatikoa"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Baimendu telefonoari automatikoki konektatzea sare honetatik gertu dagoenean"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Baimendu tabletari automatikoki konektatzea sare honetatik gertu dagoenean"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Baimendu sare honetara konektatzea barrutian dagoenean"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Gehitu gailu bat"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Erabili QR kode bat sare honetan gailu bat gehitzeko"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR kodearen formatua ez da baliozkoa"</string>
@@ -942,13 +942,12 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Erabili sistemaren ziurtagiriak"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Ez zehaztu"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Ez balidatu"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Ez da zehaztu ziurtagiririk. Konexioa ez da izango pribatua."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Sarearen izena luzeegia da."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Domeinua zehaztu behar da."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Ziurtagiria behar da."</string>
     <string name="wifi_wps_available_first_item" msgid="5780501151792036589">"WPSa erabilgarri"</string>
     <string name="wifi_wps_available_second_item" msgid="1717024103303480804">" (WPSa erabilgarri)"</string>
-    <string name="wifi_carrier_connect" msgid="4511538300946413213">"Operadorearen Wi‑Fi sarea"</string>
+    <string name="wifi_carrier_connect" msgid="4511538300946413213">"Operadorearen wifi-sarea"</string>
     <string name="wifi_carrier_content" msgid="2876499905644083615">"Konektatu <xliff:g id="NAME">%1$s</xliff:g> bidez"</string>
     <string name="wifi_scan_always_turnon_message" msgid="2165909441512029921">"Kokapenaren zehaztasuna hobetzeko eta beste helburu batzuetarako, <xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak sare-bilaketa aktibatu nahi du, Wi-Fia desaktibatuta egonda ere.\n\nBilaketa egin nahi duten beste aplikazio guztiei ere baimendu nahi diezu?"</string>
     <string name="wifi_scan_always_turn_on_message_unknown" msgid="4903345360745717385">"Kokapen-zehaztasuna hobetzeko eta beste helburu batzuetarako, aplikazio ezezagun batek sare-bilaketa aktibatu nahi du, wifia desaktibatuta egonda ere.\n\nBilaketa egin nahi duten aplikazio guztiei eman nahi diezu baimena?"</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Konektatu"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wifi konexioa aktibatu da"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Hona konektatuta: <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> sarera konektatzen"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Konektatzen…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Ezin izan da sarera konektatu"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Sarea ez dago barrutian"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Edukia partekatzen ari da aplikazioa. Interneteko konexioa partekatzeko, desaktibatu eta aktibatu berriro wifi-gunea"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Ez da ezarri pasahitzik"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Wifi-gunearen izena"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> aktibatzen…"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> aktibatzen…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> sarera konekta daitezke beste gailuak"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Wifi-gunearen pasahitza"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Sarbide-puntuaren banda"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Automatikoki igotzen du freskatze-abiadura 60 Hz-tik 90 Hz-ra zenbait edukitarako. Bateria-erabilera luzatzen du."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Aplikatu 90 Hz-ko freskatze-abiadura"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Freskatze-abiadura handiena, ukipenei erantzuteko gaitasuna eta animazioen kalitatea hobetzeko. Bateria-erabilera luzatzen du."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Pantaila kontzientea"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Aktibatuta / Pantaila ez da itzaliko hari begira zauden bitartean"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android-en bertsioa"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android-en segurtasun-eguneratzea"</string>
     <string name="model_info" msgid="8997566254717810904">"Modeloa"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Modeloa: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Modeloa eta hardwarea"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Hardware-bertsioa"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Ekipoaren IDa"</string>
@@ -1486,7 +1485,7 @@
     <string name="storage_wizard_init_internal_title" msgid="3256355049992147270">"Erabili barneko memoria gisa"</string>
     <string name="storage_wizard_init_internal_summary" msgid="2283798331883929674">"Edozein gauza gailu honetan soilik gordetzeko, aplikazioak eta argazkiak barne. Erabilera hau emateko, beste gailu batzuetan funtzionatzea galarazten duen formateatze bat egin behar da memorian."</string>
     <string name="storage_wizard_format_confirm_title" msgid="4898014527956178762">"Formateatu barneko memoria gisa"</string>
-    <string name="storage_wizard_format_confirm_body" msgid="5514665245241830772">"<xliff:g id="NAME_0">^1</xliff:g> formateatu egin behar da segurua izan dadin. \n\nFormateatu ostean, <xliff:g id="NAME_1">^1</xliff:g> memoriak gailu honetan bakarrik funtzionatuko du. \n\n"<b>"Formateatzean, unean <xliff:g id="NAME_2">^1</xliff:g> memorian gordetako datu guztiak ezabatzen dira."</b>" Daturik ez galtzeko, babeskopia bat egitea gomendatzen dizugu."</string>
+    <string name="storage_wizard_format_confirm_body" msgid="5514665245241830772">"<xliff:g id="NAME_0">^1</xliff:g> formateatu egin behar da segurua izan dadin. \n\nFormateatu ostean, <xliff:g id="NAME_1">^1</xliff:g> memoriak gailu honetan bakarrik funtzionatuko du. \n\n"<b>"Formateatzean, une horretan <xliff:g id="NAME_2">^1</xliff:g> memorian gordetako datu guztiak ezabatzen dira."</b>" Daturik ez galtzeko, babeskopia bat egitea gomendatzen dizugu."</string>
     <string name="storage_wizard_format_confirm_public_title" msgid="649252654496577680">"Formateatu memoria eramangarri gisa"</string>
     <string name="storage_wizard_format_confirm_public_body" msgid="6219883780307218266">"Hori egiteko, <xliff:g id="NAME_0">^1</xliff:g> formateatu egin behar da. \n\n"<b>"Formateatuz gero, <xliff:g id="NAME_1">^1</xliff:g> gailuko datu guztiak ezabatuko dira."</b>" Datuak ez galtzeko, babeskopiak egitea gomendatzen dugu."</string>
     <string name="storage_wizard_format_confirm_next" msgid="4412063054982084056">"Ezabatu eta formateatu"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Berrezarri dira sareko ezarpenak"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Ezin da ezabatu SIM txarteletako eduki guztia"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Ezin da ezabatu deskargatutako SIM txartelen edukia errore bat gertatu delako.\n\nBerrabiarazi gailua eta saiatu berriro."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Ezabatu datu guztiak (berrezarri jatorrizkoak)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Ezabatu datu guztiak (berrezarri jatorrizkoak)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Tabletaren "<b>"barneko memoriako"</b>" datu guztiak ezabatuko dira, besteak beste:\n\n"<li>"Google kontua,"</li>\n<li>"sistemako eta aplikazioetako datuak eta ezarpenak,"</li>\n<li>"deskargatutako aplikazioak."</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Telefonoaren "<b>"barneko memoriako"</b>" datu guztiak ezabatuko dira, besteak beste:\n\n"<li>"Google-ko kontua"</li>\n<li>"Sistemako eta aplikazioetako datuak eta ezarpenak"</li>\n<li>"Deskargatutako aplikazioak"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Kontu hauetan hasi duzu saioa:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Badaude erabiltzaile gehiago gailu honetan.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Musika"</li>\n<li>"Argazkiak"</li>\n<li>"Bestelako erabiltzaile-datuak"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM txartelak"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Horrek ez du utziko bertan behera operadorearekin kontratatuta duzun zerbitzu-plana."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Musika, irudiak eta bestelako erabiltzaile-datuak garbitzeko, "<b>"USB bidezko memoria"</b>" ezabatu behar da."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Musika, irudiak eta bestelako erabiltzaile-datuak garbitzeko, "<b>"SD txartela"</b>" ezabatu behar da."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Ezabatu datu guztiak (berrezarri jatorrizkoak)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Ezabatu datu guztiak (berrezarri jatorrizkoak)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Tabletaren "<b>"barneko memoriako"</b>" datu guztiak ezabatuko dira, besteak beste:\n\n"<li>"Google-ko kontua,"</li>\n<li>"sistemako eta aplikazioetako datuak eta ezarpenak,"</li>\n<li>"deskargatutako aplikazioak."</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Telefonoaren "<b>"barneko memoriako"</b>" datu guztiak ezabatuko dira, besteak beste:\n\n"<li>"Google-ko kontua,"</li>\n<li>"sistemako eta aplikazioetako datuak eta ezarpenak,"</li>\n<li>"deskargatutako aplikazioak."</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Kontu hauetan hasi duzu saioa:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Badaude erabiltzaile gehiago gailu honetan.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Musika"</li>\n<li>"Argazkiak"</li>\n<li>"Bestelako erabiltzaile-datuak"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM txartelak"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Ez da utziko bertan behera operadorearekin kontratatuta duzun zerbitzu-plana."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Musika, irudiak eta bestelako erabiltzaile-datuak garbitzeko, "<b>"USB bidezko memoriako"</b>" eduki guztia ezabatu behar da."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Musika, irudiak eta bestelako erabiltzaile-datuak garbitzeko, "<b>"SD txarteleko"</b>" eduki guztia ezabatu behar da."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Ezabatu USB bidezko memoria"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Ezabatu SD txartela"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Ezabatu USB bidezko barneko memoriako datu guztiak; adibidez, musika edo argazkiak"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Ezabatu SD txarteleko datu guztiak, besteak beste, musika edo argazkiak."</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Ezabatu datu guztiak"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Ezabatu datu guztiak"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Informazio pertsonal guztia eta deskargatutako aplikazioak ezabatuko dira. Ezin da desegin ekintza hori."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Informazio pertsonal guztia ezabatuko da, deskargatutako aplikazioak eta SIM txartelak barne. Ezin da desegin ekintza hori."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Ezabatu guztia"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Ez da berrezartzerik gauzatu, sistema garbitzeko zerbitzua ez dagoelako erabilgarri."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Datu guztiak ezabatu nahi dituzu?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Erabiltzaileak ez du jatorrizko datuak berrezartzeko baimenik"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Ezabatzen"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Itxaron, mesedez…"</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Ezabatu datu guztiak"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Ezabatu datu guztiak"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Informazio pertsonal guztia eta deskargatutako aplikazioak ezabatuko dira. Ezin da desegin ekintza."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Informazio pertsonal guztia ezabatuko da, deskargatutako aplikazioak eta SIM txartelak barne. Ezin da desegin ekintza."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Datu guztiak ezabatu nahi dituzu?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Erabiltzaileak ez du jatorrizko datuak berrezartzeko baimenik"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Eduki guztia ezabatzen"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Itxaron, mesedez…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Dei-ezarpenak"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Konfiguratu erantzungailua, dei-desbideratzea, deia zain uzteko eginbidea, deien identifikazio-zerbitzua."</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Konexioa partekatzea (USB)"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Ezin da <xliff:g id="MAXCONNECTION">%1$d</xliff:g> gailurekin baino gehiagorekin konexioa partekatu."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> gailuko konexioa amaituko da."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Konexioa Ethernet bidez partekatzea"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Partekatu telefonoaren Interneteko konexioa USB Ethernet bidez"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Partekatu telefonoaren Interneteko konexioa Ethernet bidez"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Erabili wifi-gunea eta konexioa partekatzea beste gailuei Interneteko konexioa emateko zure datu-konexioaren bidez. Halaber, aplikazioek wifi-guneak sor ditzakete, edukia inguruko gailuekin partekatzeko."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Erabili wifi-guneak eta konexioa partekatzeko aukera beste gailu batzuei Interneteko konexioa emateko wifi- edo datu-konexioaren bidez. Aplikazioek ere wifi-guneak sor ditzakete edukia inguruko gailuekin partekatzeko."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Laguntza"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Azpitituluen hobespenak"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Lupa"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Handitutako zatia"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Gaitu lupa"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Aukeratu pantailako zer zati handitu behar diren pantaila handitzean"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Pantaila osoa"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Pantailaren zati bat"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Pantaila osoa eta pantailaren zati bat"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Handitu pantaila osoa"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Handitu pantailaren zati bat"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Erabilerraztasun-botoia erabili nahi duzu?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Hiru aldiz sakatzen baduzu pantailaren zati bat lupaz ikusteko, idazketa eta beste ekintza batzuk atzeratu egingo dira.\n\nErabilerraztasun-botoia erabili nahi duzu lupaz ikusteko?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Erabili erabilerraztasun-botoia"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Mantendu hiru aldiz sakatzeko ekintza lupaz ikusteko"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Luparen ezarpenak"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Handitzeko, sakatu hiru aldiz"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Handitu pantaila lasterbidearekin"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Amaitu deiak pizteko etengailuarekin"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Saguaren erakusle handia"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Kendu animazioak"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Audio monofonikoa"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Konbinatu kanalak audioa erreproduzitzean"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Audioaren oreka"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Ezkerrekoa"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Eskuinekoa"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Audio monofonikoa"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Konbinatu kanalak audioa erreproduzitzean"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Audioaren oreka"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Ezkerrekoa"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Eskuinekoa"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Lehenetsia"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 segundo"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 segundo"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Jakinarazpenen dardara"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Tonuaren dardara"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Ukipen bidezko interakzioa"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Erabili <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Ireki <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Erabili koloreen zuzenketa"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Erakutsi azpitituluak"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Bateragarriak diren aplikazioetarako bakarrik"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Erabili <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Ireki <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Erabili koloreen zuzenketa"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Erakutsi azpitituluak"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Bateragarriak diren aplikazioetarako bakarrik"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Azpitituluen tamaina eta estiloa"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Testuaren tamaina: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Aukera gehiago"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Daltonismoa"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanopia"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanopia"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Grisen eskala"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Gorri-berdea"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Gorri-berdea"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Urdin-horia"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Atzeko planoan erabiltzeko murriztapena"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Eman atzeko planoan exekutatzeko baimena aplikazioari"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Aplikazioak ez du baimenik atzeko planoan exekutatzeko"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Ezin da mugatu atzeko planoko erabilera"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Ezin da mugatu atzeko planoko erabilera"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Atzeko planoko jarduerak mugatu nahi dituzu?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Aplikazio baten atzeko planoko jarduerak mugatzen badituzu, baliteke aplikazioak behar bezala ez funtzionatzea"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Aplikazio hau bateria optimizatzeko konfiguratuta ez dagoenez, ezin duzu mugatu.\n\nMugatzeko, aktibatu bateriaren optimizazioa."</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Ezarri programazioa"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Luzatu bateriaren iraupena"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Desaktibatu kargatuta dagoenean"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Telefonoaren bateria <xliff:g id="PERCENT">%1$s</xliff:g> denean, desaktibatu egiten da bateria-aurrezlea"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Tabletaren bateria <xliff:g id="PERCENT">%1$s</xliff:g> denean, desaktibatu egiten da bateria-aurrezlea"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Gailuaren bateria <xliff:g id="PERCENT">%1$s</xliff:g> denean, desaktibatu egiten da bateria-aurrezlea"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Telefonoaren bateria <xliff:g id="PERCENT">%1$s</xliff:g> baino gehiago kargatu denean, desaktibatu egiten da bateria-aurrezlea"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Tabletaren bateria <xliff:g id="PERCENT">%1$s</xliff:g> baino gehiago kargatu denean, desaktibatu egiten da bateria-aurrezlea"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Gailuaren bateria <xliff:g id="PERCENT">%1$s</xliff:g> baino gehiago kargatu denean, desaktibatu egiten da bateria-aurrezlea"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Aktibatu"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Berrezarri"</string>
     <string name="tts_play" msgid="2945513377250757221">"Erreproduzitu"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Sareko konexio egokitua"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Bateriaren iraupena luzatzen, eta gailuaren errendimendua hobetzen du sareko konexioak automatikoki kudeatuz."</string>
     <string name="credentials_title" msgid="7535942196886123656">"Kredentzialen biltegia"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Instalatu ziurtagiri bat"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Instalatu ziurtagiriak biltegitik"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Erabiltzaile-kredentzialak"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Ikusi eta aldatu gordetako kredentzialak"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Aurreratuak"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Biltegiratze mota"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardwarean gordetakoa"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Softwarean soilik"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Erabiltzaile honek ez dauka kredentzialik"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN konexioarekin eta aplikazioekin erabiltzeko instalatuta"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi konexioarekin erabiltzeko instalatuta"</string>
@@ -2783,7 +2783,7 @@
     <string name="really_remove_account_message" product="device" msgid="5241756807386611084">"Kontua kentzen baduzu, bertako mezu, kontaktu eta bestelako datu guztiak ezabatuko dira gailutik!"</string>
     <string name="remove_account_failed" msgid="3709502163548900644">"Administratzaileak ez du eman aldaketa egiteko baimena"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Ezin da eskuz sinkronizatu"</string>
-    <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Elementua ezin da unean desgaitu. Ezarpena aldatzeko, aktibatu atzeko planoko datuak eta sinkronizazio automatikoa aldi baterako."</string>
+    <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Elementua ezin da une honetan desgaitu. Ezarpena aldatzeko, aktibatu atzeko planoko datuak eta sinkronizazio automatikoa aldi baterako."</string>
     <string name="enter_password" msgid="6327051330258595331">"Android-eko gailua abiarazteko, idatzi pasahitza"</string>
     <string name="enter_pin" msgid="1029287617551232681">"Android-eko gailua abiarazteko, idatzi PIN kodea"</string>
     <string name="enter_pattern" msgid="1747316785866742960">"Android-eko gailua abiarazteko, marraztu eredua"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Terminalean ordaintzea"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Konfiguratu ordaintzeko aplikazioa. Ondoren, jarri telefonoaren atzeko aldea kontakturik gabeko sistemaren ikurra duen terminalaren aurrean."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Ados"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Gehiago…"</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Gehiago…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Ezarri ordainketak egiteko aplikazio lehenetsia"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Eguneratu ordainketak egiteko aplikazio lehenetsia"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Kontakturik gabeko ordainketa-terminaletan, erabili <xliff:g id="APP">%1$s</xliff:g> ordainketak egiteko"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Erabili beti hau deietarako"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Hautatu datuetarako SIM txartela"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Hautatu SMSetarako SIMa"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Datuetarako erabili beharreko SIMa aldatzen ari da. Minutu oso bat behar izan daiteke horretarako…"</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Datuetarako erabili beharreko SIMa aldatzen ari gara. Minutu bat inguru beharko dugu…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Deitu SIM honekin:"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Hautatu SIM txartela"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"<xliff:g id="CARD_NUMBER">%1$d</xliff:g>. SIM txartela"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"ohitura, ordutegia, programazioa, programatu, bateria-aurrezlea, aurreztu bateria, bateria automatikoa, ehunekoa"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, deitzeko aukera aurreratuak, 4G bidezko deiak"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"gehitu hizkuntza, gehitu hizkuntza bat"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"testuaren tamaina"</string>
     <string name="default_sound" msgid="6604374495015245195">"Soinu lehenetsia"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Deien tonuaren eta jakinarazpenen bolumena: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Bolumena, dardara, ez molestatzeko modua"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Pizteko soinuak"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Istanteko azpitituluak"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Ezarri azpitituluak automatikoki"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Bat ere ez"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> programazio ezarri dira</item>
-      <item quantity="one">1 programazio ezarri da</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Bat ere ez}=1{1 programazio ezarri da}other{# programazio ezarri dira}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Ez molestatzeko modua"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Jaso jende eta aplikazio garrantzitsuen jakinarazpenak soilik"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Mugatu etenaldiak"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Lehentasuna dutenak soilik"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Aktibatuta / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Desaktibatuta / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Desaktibatuta"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Aktibatuta"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Galdetu beti"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Zuk desaktibatu arte"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> ordu</item>
-      <item quantity="one">1 ordu</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minutu"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> programazio aktiba daitezke automatikoki</item>
-      <item quantity="one">1 programazio aktiba daiteke automatikoki</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 ordu}other{# ordu}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minutu}other{# minutu}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Desaktibatuta}=1{Desaktibatuta / 1 programazio aktiba daiteke automatikoki}other{Desaktibatuta / # programazio aktiba daitezke automatikoki}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Ez molestatzeko modua eten dezaketenak"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Jendea"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Aplikazioak"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Ezarri lehentasun txikiagoko jakinarazpenak soinurik gabeko jakinarazpen gisa automatikoki"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Jakinarazpenen sailkapen doigarria"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Sailkatu jakinarazpenak automatikoki garrantziaren arabera"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Jakinarazpen doigarriei buruzko iritzia"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Adierazi jakinarazpenetan egindako doikuntzak eta erakutsi sistemara iritzia bidaltzeko aukera"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Ekintza eta erantzun iradokiak"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Erakutsi automatikoki ekintza eta erantzun iradokiak"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Erakutsi azken jakinarazpenak eta atzeratutakoak"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Ez molestatzeko modurako sarbidea"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Eman ez molestatzeko modua atzitzeko baimena"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Ez dago ez molestatzeko modurako sarbidea eskatu duen aplikaziorik"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Aplikazioak kargatzen…"</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Aplikazioak kargatzen…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Zure eskaerari jarraikiz, aplikazio honen jakinarazpenak gailu honetan erakustea galarazten ari da Android"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Zure eskaerari jarraikiz, jakinarazpen-kategoria hau gailu honetan erakustea galarazten ari da Android"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Zure eskaerari jarraikiz, jakinarazpen talde hau gailu honetan erakustea galarazten ari da Android"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Elkarrizketa guztiak"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Lehentasunezko elkarrizketak"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Bat ere ez"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> elkarrizketa</item>
-      <item quantity="one">1 elkarrizketa</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Bat ere ez"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Bat ere ez}=1{1 elkarrizketa}other{# elkarrizketa}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Eten zaitzaketen pertsonak"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Deiak"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Deiak"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Baimendutako deiak jasotzean soinua entzuten dela ziurtatzeko, egiaztatu gailua tonua jotzeko ezarrita dagoela"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"“<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>” arauan, blokeatuta dago deiak jasotzeko aukera. Lagunak, familia eta beste kontaktu batzuk zurekin harremanetan jartzeko aukera izan dezaten, aldatu ezarpenak."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Kontaktu izardunak"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other">beste <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="one">beste bat</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Bat ere ez"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Bat ere ez}=1{{contact_1}}=2{{contact_1} eta {contact_2}}=3{{contact_1}, {contact_2} eta {contact_3}}other{{contact_1}, {contact_2} eta beste #}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Mezuak"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"Mezu"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Mezuak"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"“<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>” antolaketan, blokeatuta dago mezuak jasotzeko aukera. Lagunak, familia eta beste kontaktu batzuk zurekin harremanetan jartzeko aukera izan dezaten, aldatu ezarpenak."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Mezu guztiak iritsiko zaizkizu"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Dei guztiak iritsiko zaizkizu"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Bat ere ez"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontaktu</item>
-      <item quantity="one">1 kontaktu</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Bat ere ez}=1{1 kontaktu}other{# kontaktu}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Edonor"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Kontaktuak"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Kontaktu izardunak"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Jakinarazpen guztiak"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Jakinarazpen batzuk"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Aplikazioek jarduera eteteko baimenik ez badute ere, hautatzen duzun jendea salbuetsita geratuko da"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> aplikazioek eten dezakete</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> aplikazioak eten dezake</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"Beste <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Ez dago eten dezakeen aplikaziorik}=1{{app_1} aplikazioak eten dezake}=2{{app_1} eta {app_2} aplikazioek eten dezakete}=3{{app_1}, {app_2} eta {app_3} aplikazioek eten dezakete}other{\"{app_1}\", \"{app_2}\" eta beste # soinuk eten dezakete}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Aplikazioak"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Jakinarazpen guztiak"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Jakinarazpen batzuk"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Jarduera eten dezaketen jakinarazpenak"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Eman baimena jakinarazpen guztiei"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other">Eten dezaketenak: <xliff:g id="SOUND_CATEGORIES">%s</xliff:g></item>
-      <item quantity="one">Eten dezaketenak: <xliff:g id="SOUND_CATEGORY">%s</xliff:g></item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Ez dago eten dezakeen ezer"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"Beste <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Ez dago eten dezakeen ezer}=1{\"{sound_category_1}\" soinuak eten dezake}=2{\"{sound_category_1}\" eta \"{sound_category_2}\" soinuek eten dezakete}=3{\"{sound_category_1}\", \"{sound_category_2}\" eta \"{sound_category_3}\" soinuek eten dezakete}other{\"{sound_category_1}\", \"{sound_category_2}\" eta beste # soinuk eten dezakete}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Ez dago eten dezakeen ezer"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Ezin du inork eten"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Pertsona batzuek eten dezakete"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Edonork eten dezake"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"Honek kontrolatzen du USB bidezko konexioa:"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Konektatutako gailua"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Gailu hau"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Aldatzen…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Aldatzen…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Ezin izan da aldatu"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Gailua kargatzen"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Konektatutako gailua kargatzea"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Ikusi xehetasunak"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Datu-aurrezlea"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Datuen erabilera mugagabea"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Atzeko planoko datuak desaktibatuta daude"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Atzeko planoko datuak desaktibatuta daude"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Aktibatuta"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Desaktibatuta"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Erabili datu-aurrezlea"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Gailua blokeatuta badago, eragotzi jakinarazpenetan erantzunak edo beste edozer idaztea"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Zuzentzaile lehenetsia"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Aukeratu zuzentzailea"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Erabili ortografia-zuzentzailea"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Erabili ortografia-zuzentzailea"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Hautatu gabe"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(bat ere ez)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Memorian tokia egiteko, babeskopiak dituzten argazkiak eta bideoak gailutik kentzen ditu memoria-kudeatzaileak."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Kendu argazkiak eta bideoak"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Memoria-kudeatzailea"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Erabili Memoria-kudeatzailea"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Erabili biltegi-kudeatzailea"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automatikoa"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Eskuzko ezarpenak"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Egin tokia"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Sakatu birritan telefonoa pantailako informazioa ikusteko"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Sakatu birritan tableta bertan dagoela ikusteko"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Sakatu birritan gailua bertan dagoela ikusteko"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Pasatu hatza jakinarazpenak ikusteko"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Pantailaren beheko ertzean, pasatu hatza behera, jakinarazpenak ager daitezen"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Esku bakarreko modua"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Erabili esku bakarreko modua"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Irten aplikazioa aldatzean"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Denbora-muga"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 segundo"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 segundo"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 segundo"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"irisgarritasuna"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Ordua, jakinarazpenak eta bestelako informazioa ikusteko, sakatu pantaila birritan."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Jaso telefonoa pantailako informazioa ikusteko"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Jaso tableta bertan dagoela ikusteko"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Sakatu tableta egiaztatzeko"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Sakatu gailua egiaztatzeko"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Ordua, jakinarazpenak eta bestelako informazioa ikusteko, sakatu pantaila."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Izu-botoia"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Larrialdi-ekintzak abiarazteko, sakatu etengailua azkar bost aldiz."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Abisu-soinua"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Jo alerta bat ekintzak abiarazi aurretik"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Larrialdietarako kontaktuak"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Pasatu hatza sentsoretik jakinarazpenak ikusteko"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Pasatu hatza sentsoretik"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Jakinarazpenei begiratu bat emateko, pasatu hatza behera telefonoaren atzealdeko hatz-marken sentsorean."</string>
@@ -4511,7 +4497,7 @@
     <string name="account_sync_title" msgid="7036067017433297574">"Kontuaren sinkronizazioa"</string>
     <string name="account_sync_summary_some_on" msgid="911460286297968724">"<xliff:g id="ID_1">%1$d</xliff:g>/<xliff:g id="ID_2">%2$d</xliff:g> elementuk aktibatuta daukate sinkronizazioa"</string>
     <string name="account_sync_summary_all_on" msgid="2953682111836599841">"Elementu guztiek aktibatuta daukate sinkronizazioa"</string>
-    <string name="account_sync_summary_all_off" msgid="6378301874540507884">"Elementu guztiek desaktibatuta dute sinkronizazioa"</string>
+    <string name="account_sync_summary_all_off" msgid="6378301874540507884">"Elementu guztiek desaktibatuta daukate sinkronizazioa"</string>
     <string name="enterprise_privacy_settings" msgid="786350385374794180">"Gailu kudeatuaren informazioa"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5471858290610344646">"Erakundeak kudeatzen dituen aldaketak eta ezarpenak"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="1315413275836515937">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> erakundeak kudeatzen dituen aldaketak eta ezarpenak"</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Gaitu aplikazio guztietan"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Hautatu grafikoen kontrolatzailea"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Lehenetsia"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Jokoen kontrolatzailea"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Jokoen kontrolatzailea"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Developer Driver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Sistemaren grafikoen kontrolatzailea"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Ezin izan da aurkitu sarerik. Saiatu berriro."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(debekatuta)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Ez dago SIM txartelik"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM txartela"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Ez dago SIM txartelik"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Bat ere ez"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"SIM txartela behar da konektatzeko"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"<xliff:g id="WIRELESS_CARRIER">%s</xliff:g> operadorearen SIM txartela behar da konektatzeko"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Sare modu hobetsia: WCDMA hobetsita"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Sare modu hobetsia: GSM soilik"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Sare modu hobetsia: WCDMA soilik"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Datu-konexioa"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Atzitu datuak datu-konexioaren bidez"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Barrutian dagoenean, automatikoki aldatuko da telefonoa operadore honetara"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Ez dago SIM txartelik erabilgarri"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Deien hobespena"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS mezuen hobespena"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Galdetu beti"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Eman pantailetan gainjartzeko baimena ezarpenetan"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Eman ezarpenenen pantailetan gainjartzeko baimena aplikazioen gainean bistara daitezkeen aplikazioei"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Multimedia-edukia"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Ezkutatu erreproduzigailua multimedia-saioa amaitzean"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Erreproduzigailuari esker, saioei berrekin diezaiekezu Ezarpen bizkorrak panel zabaldutik."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Multimedia-erreproduzigailua Ezarpen bizkorrak atalean"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Erreprodukzioari modu errazean berrekiteko, erakutsi multimedia-erreproduzigailua luzaroan"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Ezkutatu erreproduzigailua"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Erakutsi erreproduzigailua"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Ez dago erreproduzigailurik erabilgarri"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Baimenduta dauden aplikazioak"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"multimedia-edukia"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth bidezko konexioa aktibatuko da"</string>
 </resources>
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index bc7c51d..bf7bbe6 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"متوسط"</item>
     <item msgid="6740026006576843477">"طولانی"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"کوتاه"</item>
+    <item msgid="7397961711906421599">"متوسط"</item>
+    <item msgid="4079132024502041928">"طولانی"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"پیش‌فرض"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"جهانی"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"‏فقط TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"سراسری"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index c9793dd..4973f80 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"نمایش اطلاعات نمایه در صفحه قفل"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"حساب‌ها"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"مکان"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"استفاده از مکان"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"استفاده از مکان"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"خاموش"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">فعال - <xliff:g id="COUNT_1">%1$d</xliff:g> برنامه به مکان شما دسترسی دارند</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"استفاده از چهره‌تان برای احراز هویت"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"شروع"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"‏اگر «بازگشایی با چهره» درحالت دسترس‌پذیری خاموش باشد، ممکن است برخی مراحل راه‌اندازی به‌خوبی با TalkBack کار نکنند."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"برگشت"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"ادامه راه‌اندازی"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"استفاده از تنظیمات دسترس‌پذیری"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="other">باید کمتر از <xliff:g id="NUMBER_1">%d</xliff:g> رقم باشد</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"سرپرست دستگاه اجازه استفاده از پین اخیر را نمی‌دهد"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"پین‌های رایج توسط سرپرست فناوری اطلاعات شما مسدود شده‌اند. پین متفاوتی را امتحان کنید."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"نمی‌تواند نویسه نامعتبر داشته باشد"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"باید حداقل یک حرف داشته باشد"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"باید حداقل یک عدد داشته باشد"</string>
@@ -653,7 +655,6 @@
       <item quantity="other">باید حداقل <xliff:g id="COUNT">%d</xliff:g> نویسه غیرعددی داشته باشد</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"سرپرست دستگاه اجازه استفاده از گذرواژه اخیر را نمی‌دهد"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"گذرواژه‌های رایج توسط سرپرست فناوری اطلاعات شما مسدود شده‌اند. گذرواژه متفاوتی را امتحان کنید."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"ترتیب صعودی، نزولی یا تکراری ارقام مجاز نیست"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"تأیید"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"لغو"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"‏روشن کردن Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"‏استفاده از Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"‏استفاده از Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"‏تنظیمات Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"تنظیم و مدیریت نقاط دسترسی بی سیم"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"‏برای اتصال به «<xliff:g id="SSID">%1$s</xliff:g>»،‌ کد QR را در مرکز پنجره زیر قرار دهید"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"‏با اسکن کردن کد QR، به Wi‑Fi بپیوندید"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"‏استفاده مشترک از Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"‏برای اتصال به «<xliff:g id="SSID">%1$s</xliff:g>»، این کد QR را اسکن کنید و گذرواژه مربوطه را هم‌رسانی کنید"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"‏برای پیوستن به «<xliff:g id="SSID">%1$s</xliff:g>»، این کد QR را با دستگاه دیگری اسکن کنید"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"‏برای اتصال به «<xliff:g id="SSID">%1$s</xliff:g>»، این کد QR را اسکن کنید"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"دوباره امتحان کنید. اگر مشکل همچنان ادامه دارد، با سازنده دستگاه تماس بگیرید"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"مشکلی رخ داده است"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"‏گذرواژه Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"گذرواژه نقطه اتصال: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"اتصال خودکار"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"به تلفن اجازه داده شود نزدیک این شبکه به‌طور خودکار متصل شود"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"به رایانه لوحی اجازه داده شود نزدیک این شبکه به‌طور خودکار متصل شود"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"مجاز کردن اتصال به این شبکه (وقتی در محدوده باشد)"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"افزودن دستگاه"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"‏برای افزودن دستگاه به این شبکه، از کد QR استفاده کنید"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"‏کد QR، قالب معتبری نیست"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"استفاده از گواهی‌های سیستم"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"ارائه نشود"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"راستی‌آزمایی نشود"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"مجوزی مشخص نشده است. اتصال شما خصوصی نخواهد بود."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"نام شبکه خیلی طولانی است."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"باید دامنه‌ای مشخص کنید."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"به گواهینامه نیاز است."</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"اتصال"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"‏Wi-Fi روشن شد"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"به <xliff:g id="NETWORK_NAME">%1$s</xliff:g> متصل شد"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"درحال اتصال به <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"درحال اتصال…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"اتصال به شبکه برقرار نشد"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"شبکه در محدوده نیست"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"برنامه محتوا را هم‌رسانی می‌کند. برای هم‌رسانی اتصال اینترنت، نقطه اتصال را خاموش و سپس روشن کنید"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"گذرواژه‌ای تنظیم نشده است"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"نام نقطه اتصال"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"درحال روشن کردن <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"درحال روشن کردن <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"سایر دستگاه‌ها می‌توانند به <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> متصل شوند."</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"گذرواژه نقطه اتصال"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"‏باند AP"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"نمایشگر روان"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"به‌طور خودکار سرعت بازخوانی را برای بعضی محتواها، از ۶۰ هرتز تا ۹۰ هرتز بالا می‌برد. مصرف باتری را افزایش می‌دهد."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"نمایشگر روان"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"اجباری کردن نرخ بازخوانی ۹۰ هرتز"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"بالاترین نرخ بازخوانی برای پاسخ‌گویی بهبودیافته لمس و کیفیت پویانمایی. مصرف باتری را افزایش می‌دهد."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"توجه به صفحه"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"روشن / تازمانی‌که درحال تماشای صفحه‌نمایش باشید، صفحه خاموش نخواهد شد"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"‏نسخهٔ Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"‏به‌روزرسانی امنیتی Android"</string>
     <string name="model_info" msgid="8997566254717810904">"مدل"</string>
-    <string name="model_summary" msgid="2246651782442466213">"‏مدل: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"مدل و سخت‌افزار"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"نسخه سخت‌افزار"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"شناسه دستگاه"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"تنظیمات شبکه بازنشانی شد"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"سیم‌کارت‌ها پاک‌سازی نشدند"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"به‌دلیل بروز خطا، سیم‌کارت‌های بارگیری‌شده پاک‌سازی نشدند.\n\nدستگاه را بازراه‌اندازی کنید و دوباره امتحان کنید."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"پاک کردن همه داده‌ها (بازنشانی کارخانه‌ای)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"پاک کردن همه داده‌ها (بازنشانی کارخانه‌ای)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"‏با این کار همه داده‌های "<b>"حافظه داخلی"</b>" رایانه لوحی‌تان پاک می‌شود، از جمله:\n\n"<li>"حساب Google شما"<li>\n</li>"داده‌ها و تنظیمات سیستم و برنامه "<li>\n</li>"برنامه‌های بارگیری‌شده"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"‏با این کار همه داده‌های "<b>"حافظه داخلی"</b>" تلفنتان پاک می‌شود، از جمله: \n\n"<li>"حساب Google شما"</li>\n<li>"تنظیمات و داده‌های سیستم و برنامه"</li>\n<li>"برنامه‌های بارگیری‌شده"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"شما در حال حاضر به حساب‌های زیر وارد شده‌اید:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"کاربران دیگری در این دستگاه وجود دارند.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"موسیقی"</li>\n<li>"عکس ها"</li>\n<li>"سایر اطلاعات کاربر"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"سیم‌کارت داخلی"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"با این کار طرح سرویس تلفن همراهتان لغو نخواهد شد."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">"‏\n\nبرای پاک کردن موسیقی، عکس‌ها و سایر داده‌های کاربر، "<b>"حافظهٔ USB"</b>" باید پاک شود."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">"‏\n\nبرای پاک کردن موسیقی، عکس‌ها و سایر داده‌های کاربر، "<b>"کارت SD"</b>" باید پاک شود."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"پاک کردن همه داده‌ها (بازنشانی کارخانه‌ای)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"پاک کردن همه داده‌ها (بازنشانی کارخانه‌ای)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"‏با این کار همه داده‌های "<b>"حافظه داخلی"</b>" رایانه لوحی‌تان پاک می‌شود، ازجمله:\n\n"<li>"«حساب Google» شما"<li>\n</li>"داده‌ها و تنظیمات سیستم و برنامه "<li>\n</li>"برنامه‌های بارگیری‌شده"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"‏با این کار همه داده‌های "<b>"حافظه داخلی"</b>" تلفنتان پاک می‌شود، ازجمله: \n\n"<li>"«حساب Google» شما"</li>\n<li>"تنظیمات و داده‌های سیستم و برنامه"</li>\n<li>"برنامه‌های بارگیری‌شده"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"درحال‌حاضر به سیستم حساب‌های زیر وارد شده‌اید:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"کاربران دیگری در این دستگاه وجود دارند.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"موسیقی"</li>\n<li>"عکس"</li>\n<li>"دیگر اطلاعات کاربر"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"سیم‌کارت داخلی"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"با این کار طرح خدمات تلفن همراهتان لغو نخواهد شد."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">"‏\n\nبرای پاک کردن فایل‌های موسیقی، تصاویر، و دیگر داده‌های کاربر، "<b>"حافظه USB"</b>" باید پاک شود."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">"‏\n\nبرای پاک کردن فایل‌های موسیقی، تصاویر، و دیگر داده‌های کاربر، "<b>"کارت SD"</b>" باید پاک شود."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"‏پاک کردن حافظهٔ USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"‏پاک کردن کارت SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"‏همه داده‌های موجود در حافظهٔ USB داخلی مانند موسیقی یا عکس‌ها را پاک کنید"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"‏همه داده‌های موجود در کارت SD از جمله موسیقی یا عکس‌ها حذف می‌شوند"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"پاک کردن تمام داده‌ها"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"پاک کردن تمام داده‌ها"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"همه اطلاعات شخصی و برنامه‌های بارگیری‌شده حذف خواهد شد. این کنش واگرد نمی‌شود."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"همه اطلاعات شخصی‌تان، ازجمله برنامه‌ها و سیم‌کارت‌های بارگیری‌شده، حذف می‌شود. این کنش واگرد نمی‌شود."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"پاک کردن همه موارد"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"هیچ بازنشانی انجام نشد زیرا سرویس پاکسازی سیستم در دسترس نیست."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"همه داده‌ها پاک شود؟"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"بازنشانی به تنظیمات کارخانه برای این کاربر در دسترس نیست"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"در حال پاک کردن"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"لطفاً صبر کنید..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"پاک کردن تمام داده‌ها"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"پاک کردن تمام داده‌ها"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"همه اطلاعات شخصی و برنامه‌های بارگیری‌شده حذف خواهد شد. این کنش واگردشدنی نیست."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"همه اطلاعات شخصی‌تان، ازجمله سیم‌کارت‌ها و برنامه‌های بارگیری‌شده، حذف می‌شود. این کنش واگردشدنی نیست."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"همه داده‌ها پاک شود؟"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"بازنشانی کارخانه‌ای برای این کاربر دردسترس نیست"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"درحال پاک‌سازی"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"لطفاً منتظر بمانید…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"تنظیمات تماس"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"تنظیم پست صوتی، هدایت تماس، انتظار تماس، شناسه تماس‌گیرنده"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"‏اشتراک‌گذاری اینترنت با USB"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"اتصال اینترنتی با تلفن همراه به بیش از <xliff:g id="MAXCONNECTION">%1$d</xliff:g> دستگاه امکان‌پذیر نیست."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> از اتصال اینترنتی با تلفن همراه قطع می‌شود."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"اشتراک‌گذاری اینترنت با اترنت"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"‏هم‌رسانی اتصال اینترنت تلفن ازطریق «اترنت USB»"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"هم‌رسانی اتصال اینترنت تلفن ازطریق اترنت"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"برای ارائه اینترنت به سایر دستگاه‌ها ازطریق اتصال داده تلفن همراهتان، از نقطه اتصال و اشتراک‌گذاری اینترنت استفاده کنید. همچنین برنامه‌ها می‌توانند نقطه اتصالی ایجاد کنند تا محتوا را با دستگاه‌های اطراف هم‌رسانی کند."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"‏برای ارائه اینترنت به سایر دستگاه‌ها ازطریق اتصال داده تلفن همراه یا Wi-Fi، از نقطه اتصال و اشتراک‌گذاری اینترنت استفاده کنید. برنامه‌ها همچنین می‌تواند نقطه اتصالی ایجاد کند تا محتوا را با دستگاه‌های اطراف هم‌رسانی کند."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"راهنمایی"</string>
@@ -2027,24 +2024,24 @@
     <string name="spellchecker_quick_settings" msgid="6449414356743946577">"تنظیمات"</string>
     <string name="spellchecker_language" msgid="8905487366580285282">"زبان"</string>
     <string name="keyboard_and_input_methods_category" msgid="5296847777802891649">"صفحه‌کلیدها"</string>
-    <string name="virtual_keyboard_category" msgid="2339505603075527212">"صفحه‌کلید روی صفحه"</string>
+    <string name="virtual_keyboard_category" msgid="2339505603075527212">"صفحه‌کلید مجازی"</string>
     <string name="keywords_virtual_keyboard" msgid="1494726424879503434">"Gboard"</string>
-    <string name="available_virtual_keyboard_category" msgid="6930012948152749337">"صفحه‌کلیدِ دردسترسِ روی صفحه"</string>
+    <string name="available_virtual_keyboard_category" msgid="6930012948152749337">"صفحه‌کلید مجازی دردسترس است"</string>
     <string name="add_virtual_keyboard" msgid="2515850206289352606">"مدیریت صفحه‌کلیدهای روی صفحه"</string>
     <string name="keyboard_assistance_category" msgid="7320599809770932032">"دستیار صفحه‌کلید"</string>
     <string name="physical_keyboard_title" msgid="3328134097512350958">"صفحه‌کلید فیزیکی"</string>
-    <string name="show_ime" msgid="4334255501724746849">"استفاده از صفحه‌کلید روی صفحه"</string>
+    <string name="show_ime" msgid="4334255501724746849">"استفاده از صفحه‌کلید مجازی"</string>
     <string name="show_ime_summary" msgid="7293345791727205975">"وقتی صفحه‌کلید فیزیکی فعال است این ویرایشگر را روی صفحه نگه‌می‌دارد"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"میان‌برهای صفحه‌کلید"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="8649760728213630156">"میان‌برهای در دسترس نمایشگر"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"نمایه کاری صفحه‌کلیدها و ابزارها"</string>
-    <string name="virtual_keyboards_for_work_title" msgid="786459157034008675">"صفحه‌کلید روی صفحه برای کار"</string>
+    <string name="virtual_keyboards_for_work_title" msgid="786459157034008675">"صفحه‌کلید مجازی برای کار"</string>
     <string name="default_keyboard_layout" msgid="8690689331289452201">"پیش‌فرض"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"سرعت اشاره‌گر"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"دسته کنترل بازی"</string>
     <string name="vibrate_input_devices" msgid="5192591087864449142">"تغییر مسیر لرزش"</string>
     <string name="vibrate_input_devices_summary" msgid="8791680891376689823">"وقتی متصل شد، لرزش به دسته کنترل بازی ارسال شود"</string>
-    <string name="keyboard_layout_dialog_title" msgid="8770130364048089954">"انتخاب طرح‌بندی صفحه‌کلید"</string>
+    <string name="keyboard_layout_dialog_title" msgid="8770130364048089954">"انتخاب جانمایی صفحه‌کلید"</string>
     <string name="keyboard_layout_dialog_setup_button" msgid="6546245862744626706">"تنظیم طرح‌بندی‌های صفحه‌کلید"</string>
     <string name="keyboard_layout_dialog_switch_hint" msgid="3303564123674979354">"‏برای تغییر، Control-کلید فاصله را فشار هید"</string>
     <string name="keyboard_layout_default_label" msgid="6078569989261528039">"پیش‌فرض"</string>
@@ -2084,7 +2081,7 @@
     <string name="input_method_settings_button" msgid="5145039044301426311">"تنظیمات"</string>
     <string name="input_methods_settings_label_format" msgid="5809693308957109022">"<xliff:g id="IME_NAME">%1$s</xliff:g> تنظیمات"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="8940326108334307057">"انتخاب روش‌های ورودی فعال"</string>
-    <string name="onscreen_keyboard_settings_summary" msgid="3975358507879701606">"تنظیمات صفحه‌کلید روی صفحه"</string>
+    <string name="onscreen_keyboard_settings_summary" msgid="3975358507879701606">"تنظیمات صفحه‌کلید مجازی"</string>
     <string name="builtin_keyboard_settings_title" msgid="5096171620714179661">"صفحه‌کلید فیزیکی"</string>
     <string name="builtin_keyboard_settings_summary" msgid="4332792334499933856">"تنظیمات صفحه‌کلید فیزیکی"</string>
     <string name="gadget_picker_title" msgid="7615902510050731400">"انتخاب اسبابک"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"اولویت‌های زیرنویس"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"بزرگ‌نمایی"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"ناحیه بزرگ‌نمایی"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"فعال کردن بزرگ‌نمایی"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"ناحیه(های) بزرگ‌نمایی موردنظر را برای استفاده هنگام بزرگ‌نمایی صفحه‌نمایش انتخاب کنید"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"تمام‌صفحه"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"بخشی از صفحه"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"تمام‌صفحه و بخشی از صفحه"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"بزرگ‌نمایی تمام صفحه"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"بزرگ‌نمایی بخشی از صفحه"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"به دکمه دسترس‌پذیری می‌روید؟"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"استفاده از سه ضربه برای درشت‌نمایی بخشی از صفحه، باعث می‌شود تایپ کردن و دیگر کنش‌ها با تأخیر انجام شوند.\n\nمی‌خواهید به استفاده از دکمه دسترس‌پذیری برای درشت‌نمایی بروید؟"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"رفتن به دکمه دسترس‌پذیری"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"ادامه استفاده از سه ضربه برای درشت‌نمایی"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"تنظیمات بزرگ‌نمایی"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"درشت‌نمایی با سه ضربه"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"درشت‌نمایی بااستفاده از میان‌بر"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"قطع تماس با دکمه روشن/خاموش"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"اشاره‌گر موشواره بزرگ"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"برداشتن پویانمایی‌ها"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"صدای مونو"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"ترکیب کانال‌ها هنگام پخش صدا"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"توازن صوتی"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"چپ"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"راست"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"صدای مونو"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"ترکیب کانال‌ها هنگام پخش صوت"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"توازن صوتی"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"چپ"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"راست"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"پیش‌فرض"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"۱۰ ثانیه"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"۳۰ ثانیه"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"لرزش برای اعلان"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"لرزش هنگام زنگ خوردن"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"بازخورد لمسی"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"استفاده از <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"باز کردن <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"استفاده از تصحیح رنگ"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"نشان دادن زیرنویس"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"فقط برای برنامه پشتیبانی‌شده"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"استفاده از <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"باز کردن <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"استفاده از تصحیح رنگ"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"نشان دادن زیرنویس ناشنوایان"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"فقط برای برنامه پشتیبانی‌شده"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"اندازه و سبک زیرنویس"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"اندازه نوشتار <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"گزینه‌های دیگر"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"سبزدشواربینی"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"قرمزدشواربینی"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"آبی‌دشواربینی"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"سیاه‌وسفید"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"قرمز-سبز"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"قرمز-سبز"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"آبی-زرد"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"محدودیت پس‌زمینه"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"به برنامه اجازه دهید در پس‌زمینه اجرا شود"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"به برنامه اجازه اجرا شدن در پس‌زمینه داده نشد"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"استفاده در پس‌زمینه نمی‌تواند محدود شود"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"استفاده در پس‌زمینه نمی‌تواند محدود شود"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"فعالیت پس‌زمینه محدود شود؟"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"محدود کردن فعالیت پس‌زمینه برای برنامه ممکن است باعث عملکرد نادرست آن شود."</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"از آنجا که این برنامه برای بهینه کردن باتری تنظیم نشده است، نمی‌توانید آن را محدود کنید.\n\nبرای محدود کردن برنامه، ابتدا بهینه‌سازی باتری را روشن کنید."</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"تنظیم زمان‌بندی"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"افزایش عمر باتری"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"وقتی شارژ شد خاموش شود"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"وقتی شارژ تلفن <xliff:g id="PERCENT">%1$s</xliff:g> شود، «بهینه‌سازی باتری» خاموش می‌شود"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"وقتی شارژ رایانه لوحی <xliff:g id="PERCENT">%1$s</xliff:g> باشد، «بهینه‌سازی باتری» خاموش می‌شود"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"وقتی شارژ دستگاه <xliff:g id="PERCENT">%1$s</xliff:g> باشد، «بهینه‌سازی باتری» خاموش می‌شود"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"وقتی شارژ تلفن بیشتر از <xliff:g id="PERCENT">%1$s</xliff:g> شود، «بهینه‌سازی باتری» خاموش می‌شود"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"وقتی شارژ رایانه لوحی بیشتر از <xliff:g id="PERCENT">%1$s</xliff:g> شود، «بهینه‌سازی باتری» خاموش می‌شود"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"وقتی شارژ دستگاه بیشتر از <xliff:g id="PERCENT">%1$s</xliff:g> شود، «بهینه‌سازی باتری» خاموش می‌شود"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"روشن کردن"</string>
@@ -2611,7 +2612,7 @@
     <string name="process_stats_type_background" msgid="4094034441562453522">"پس‌زمینه"</string>
     <string name="process_stats_type_foreground" msgid="5043049335546793803">"پیش‌زمینه"</string>
     <string name="process_stats_type_cached" msgid="129788969589599563">"در حافظه پنهان"</string>
-    <string name="process_stats_os_label" msgid="2096501347732184886">"‏سیستم عامل Android"</string>
+    <string name="process_stats_os_label" msgid="2096501347732184886">"‏سیستم‌عامل Android"</string>
     <string name="process_stats_os_native" msgid="794547105037548539">"داخلی"</string>
     <string name="process_stats_os_kernel" msgid="5626269994512354996">"مرکزی"</string>
     <string name="process_stats_os_zram" msgid="3067278664868354143">"Z-Ram"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"بازنشانی"</string>
     <string name="tts_play" msgid="2945513377250757221">"پخش"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"اتصال تطبیقی"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"با مدیریت خودکار اتصال‌های شبکه، عمر باتری را افزایش می‌دهد و عملکرد دستگاه را بهبود می‌بخشد"</string>
     <string name="credentials_title" msgid="7535942196886123656">"حافظه اطلاعات کاربری"</string>
     <string name="credentials_install" msgid="3933218407598415827">"نصب گواهینامه"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"نصب گواهی‌ها از حافظه"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"اطلاعات کاربری"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"مشاهده و تغییر اطلاعات کاربری ذخیره‌شده"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"پیشرفته"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"نوع فضای ذخیره‌سازی"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"سخت‌افزاری"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"فقط نرم‌افزاری"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"اطلاعات کاربری این کاربر در دسترس نیست"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"‏نصب‌شده برای VPN و برنامه‌ها"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"‏نصب‌شده برای Wi-Fi"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"پرداخت در پایانه"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"یک برنامه پرداخت تنظیم کنید. سپس کافی است پشت تلفنتان را بالای هر پایانه دارای نشان «بدون تماس» نگه دارید."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"متوجه شدم"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"بیشتر..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"بیشتر…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"تنظیم برنامه پرداخت پیش‌فرض"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"به‌روزرسانی برنامه پرداخت پیش‌فرض"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"در پایانه «غیرلمسی»، با <xliff:g id="APP">%1$s</xliff:g> پرداخت شود"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"همیشه این سیم برای تماس‌‌ها استفاده شود"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"یک سیم کارت برای داده‌ انتخاب کنید"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"انتخاب سیم‌کارت برای پیامک"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"در حال تغییر سیم‌کارت داده، این کار ممکن است تا یک دقیقه طول بکشد..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"درحال عوض کردن سیم‌کارت داده، این کار ممکن است تا یک دقیقه طول بکشد…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"تماس با"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"انتخاب سیم‌کارت"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"سیم‌کارت <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"روال، زمان‌بندی، بهینه‌سازی باتری، بهینه‌سازی نیرو، باتری، خودکار، درصد"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"‏volte، تماس پیشرفته، تماس 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"افزودن زبان، افزودن یک زبان"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"اندازه نوشتار"</string>
     <string name="default_sound" msgid="6604374495015245195">"صدای پیش‌فرض"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"میزان صدای زنگ و اعلان <xliff:g id="PERCENTAGE">%1$s</xliff:g> است"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"میزان صدا، لرزش، «مزاحم نشوید»"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"صدای راه‌اندازی"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"زیرنویس زنده"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"رسانه زیرنویس خودکار"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"هیچ‌کدام"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> زمان‌بندی تنظیم شد</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> زمان‌بندی تنظیم شد</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{هیچ‌کدام}=1{۱ زمان‌بندی تنظیم شد}one{# زمان‌بندی تنظیم شده است}other{# زمان‌بندی تنظیم شده است}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"مزاحم نشوید"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"فقط در ارتباط با افراد و برنامه‌های مهم اعلان دریافت کنید"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"محدود کردن وقفه‌ها"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"فقط اولویت‌دار"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"روشن / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"خاموش / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"خاموش"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"روشن"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"هربار پرسیده شود"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"تا زمانی‌که آن را خاموش کنید"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> ساعت</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> ساعت</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> دقیقه"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> زمان‌بندی می‌تواند به‌طور خودکار روشن شود</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> زمان‌بندی می‌تواند به‌طور خودکار روشن شود</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{۱ ساعت}one{# ساعت}other{# ساعت}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{۱ دقیقه}one{# دقیقه}other{# دقیقه}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{خاموش}=1{خاموش / ۱ زمان‌بندی می‌تواند به‌طور خودکار روشن شود}one{خاموش / # زمان‌بندی می‌تواند به‌طور خودکار روشن شود}other{خاموش / # زمان‌بندی می‌تواند به‌طور خودکار روشن شود}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"مواردی که می‌توانند در حالت «مزاحم نشوید» وقفه ایجاد کنند"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"افراد"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"برنامه‌ها"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"اعلان‌های دارای اولویت پایین‌تر به‌طور خودکار روی آرام تنظیم شود"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"رتبه‌بندی اعلان تطبیقی"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"رتبه‌بندی خودکار اعلان‌ها براساس ارتباط"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"بازخورد اعلان تطبیقی"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"تنظیمات انجام‌شده برای اعلان‌ها را مشخص می‌کند و گزینه مربوط به ارائه بازخورد به سیستم را نمایش می‌دهد"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"پاسخ‌ها و اقدامات پیشنهادی"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"نمایش خودکار اقدامات و پاسخ‌های پیشنهادی"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"نمایش اعلان‌های اخیر و به‌تعویق افتاده"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"دسترسی به «مزاحم نشوید»"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"مجاز کردن «مزاحم نشوید»"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"هیچ برنامه نصب شده‌ای دسترسی به «مزاحم نشوید» را درخواست نکرده است"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"در حال بارگیری برنامه..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"درحال بارگیری برنامه‌‌ها…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"‏طبق درخواست شما، Android اعلان‌های این برنامه را مسدود می‌کند تا در این دستگاه نشان داده نشوند"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"‏طبق درخواست شما، Android این دسته از اعلان‌ها را مسدود می‌کند تا در این دستگاه نشان داده نشوند"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"‏طبق درخواست شما، Android این گروه از اعلان‌ها را مسدود می‌کند تا در این دستگاه نشان داده نشوند"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"همه مکالمه‌ها"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"مکالمه‌های اولویت‌دار"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"هیچ‌کدام"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> مکالمه</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> مکالمه</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"هیچ‌کدام"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{هیچ‌کدام}=1{۱ مکالمه}one{# مکالمه}other{# مکالمه}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"افرادی که می‌توانند وقفه ایجاد کنند"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"تماس‌ها"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"تماس‌ها"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"برای اطمینان از اینکه تماس‌های مجاز صدا داشته باشند، بررسی کنید دستگاه روی زنگ زدن تنظیم شده باشد"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"تماس‌های ورودی برای «<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>» مسدود می‌شود. برای اینکه به دوستان و خانواده و سایر مخاطبین امکان دسترسی به خودتان بدهید، می‌توانید تنظیمات را تغییر دهید."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"مخاطبین ستاره‌دار"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one"><xliff:g id="NUM_PEOPLE">%d</xliff:g> نفر دیگر</item>
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> نفر دیگر</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"موردی وجود ندارد"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{هیچ‌کدام}=1{{contact_1}}=2{{contact_1} و {contact_2}}=3{{contact_1}، {contact_2} و {contact_3}}one{{contact_1}، {contact_2}، و # نفر دیگر}other{{contact_1}، {contact_2}، و # نفر دیگر}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"پیام‌ها"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"پیام‌ها"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"پیام‌ها"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"پیام‌های ورودی برای «<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>» مسدود شده‌اند. برای اینکه به دوستان و خانواده و سایر مخاطبین امکان دهید به شما دسترسی داشته باشند، می‌توانید تنظیمات را تغییر دهید."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"همه پیام‌ها را می‌توانید دریافت کنید."</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"همه تماس‌ها را می‌توانید دریافت کنید."</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"موردی وجود ندارد"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> مخاطب</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> مخاطب</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{هیچ‌کدام}=1{۱ مخاطب}one{# مخاطب}other{# مخاطب}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"همه"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"مخاطبین"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"مخاطبین ستاره‌دار"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"همه اعلان‌ها"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"برخی از اعلان‌ها"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"افراد انتخاب‌شده همچنان می‌توانند با شما ارتباط برقرار کنند، حتی اگر به برنامه‌ها اجازه ایجاد وقفه نداده باشید"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one"><xliff:g id="APP_NAMES">%s</xliff:g> می‌تواند وقفه ایجاد کند</item>
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> می‌توانند وقفه ایجاد کند</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> برنامه دیگر"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{هیچ برنامه‌ای نمی‌تواند وقفه ایجاد کند}=1{{app_1} می‌تواند وقفه ایجاد کند}=2{{app_1} و {app_2} می‌توانند وقفه ایجاد کنند}=3{{app_1}، {app_2}، و {app_3} می‌توانند وقفه ایجاد کنند}one{{app_1}، {app_2}، و # برنامه دیگر می‌توانند وقفه ایجاد کنند}other{{app_1}، {app_2}، و # برنامه دیگر می‌توانند وقفه ایجاد کنند}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"برنامه‌ها"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"همه اعلان‌ها"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"برخی اعلان‌ها"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"اعلان‌هایی که می‌توانند وقفه ایجاد کنند"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"مجاز بودن همه اعلان‌ها"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> می‌تواند وقفه ایجاد کند</item>
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> می‌توانند وقفه ایجاد کند</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"هیچ موردی نمی‌تواند وقفه ایجاد کند"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> صدای دیگر"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{هیچ موردی نمی‌تواند وقفه ایجاد کند}=1{{sound_category_1} می‌تواند وقفه ایجاد کند}=2{{sound_category_1} و {sound_category_2} می‌توانند وقفه ایجاد کنند}=3{{sound_category_1}، {sound_category_2}، و {sound_category_3} می‌توانند وقفه ایجاد کنند}one{{sound_category_1}، {sound_category_2}، و # مورد دیگر می‌توانند وقفه ایجاد کنند}other{{sound_category_1}، {sound_category_2}، و # مورد دیگر می‌توانند وقفه ایجاد کنند}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"هیچ موردی نمی‌تواند وقفه ایجاد کند"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"هیچ فردی نمی‌تواند وقفه ایجاد کند"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"بعضی از افراد می‌توانند وقفه ایجاد کنند"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"همه افراد می‌توانند وقفه ایجاد کنند"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"‏USB تحت کنترل"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"دستگاه متصل‏"</string>
     <string name="usb_control_device" msgid="527916783743021577">"این دستگاه"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"درحال تغییر وضعیت…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"درحال رفتن به…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"تغییر وضعیت انجام نشد"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"درحال شارژ کردن این دستگاه"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"شارژ دستگاه متصل‌‌شده"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"مشاهده جزئیات"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"صرفه‌جویی داده"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"داده نامحدود"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"داده‌های پس‌زمینه خاموش است"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"داده پس‌زمینه خاموش است"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"روشن"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"خاموش"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"استفاده از صرفه‌جویی داده"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"درصورت قفل بودن دستگاه، از تایپ پاسخ یا نوشتارهای دیگر در اعلان‌ها جلوگیری شود"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"غلط‌گیر املای پیش‌فرض"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"انتخاب غلط‌گیر املا"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"استفاده از غلط‌گیر املا"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"استفاده از غلط‌گیر املا"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"انتخاب نشده"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(خالی)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"برای کمک به خالی کردن فضای ذخیره‌سازی، مدیر ذخیره‌سازی عکس‌ها و ویدیوهای پشتیبان‌گیری‌شده را از دستگاهتان پاک می‌کند."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"پاک کردن عکس‌ها و ویدئوها"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"مدیر فضای ذخیره‌سازی"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"استفاده از «مدیر فضای ذخیره‌سازی»"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"استفاده از مدیر فضای ذخیره‌سازی"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"خودکار"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"دستی"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"هم‌اکنون فضا را خالی کنید"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"دو ضربه برای چک کردن تلفن"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"برای بررسی رایانه لوحی، دو ضربه سریع بزنید"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"برای بررسی دستگاه، دو ضربه سریع بزنید"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"کشیدن برای دیدن اعلان‌ها"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"برای نمایش اعلان‌ها، در قسمت پایین لبه صفحه تند به پایین بکشید"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"حالت تک حرکت"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"استفاده از حالت تک حرکت"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"خروج وقتی‌که بین برنامه‌ها جابه‌جا می‌شوید"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"درنگ"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"۴ ثانیه"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"۸ ثانیه"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"۱۲ ثانیه"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"قابلیت دسترسی"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"برای بررسی زمان، اعلان‌ها و اطلاعات دیگر، روی صفحه‌نمایش دو ضربه سریع بزنید."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"بررسی تلفن با برداشتن"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"برای بررسی رایانه لوحی، آن را بردارید"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"ضربه زدن برای بررسی رایانه لوحی"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"ضربه زدن برای بررسی دستگاه"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"برای بررسی زمان، اعلان‌ها و اطلاعات دیگر، روی صفحه‌نمایش ضربه بزنید."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"دکمه وحشت"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"با پنج‌بار فشار دادن سریع دکمه روشن/خاموش، کنش‌های مربوط به درخواست کمک اضطراری را شروع کنید."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"صدای هشدار"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"اعلام هشدار پیش از شروع کنش‌ها"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"مخاطبین اضطراری"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"تند کشیدن اثر انگشت برای اعلان‌ها"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"تند کشیدن اثر انگشت"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"برای بررسی اعلان‌ها، انگشتتان را روی حسگر اثر انگشت (در پشت تلفن) تند به پایین بکشید."</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"فعال کردن برای همه برنامه‌ها"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"انتخاب درایور گرافیک"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"پیش‌فرض"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"درایور بازی"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"درایور بازی"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"درایور برنامه‌نویس"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"درایور گرافیک سیستم"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"شبکه‌ها پیدا نشدند. دوباره امتحان کنید."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(ممنوع است)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"سیم‌کارت موجود نیست"</string>
+    <string name="sim_card" msgid="6381158752066377709">"سیم‌کارت"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"سیم‌کارتی وجود ندارد"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"موردی وجود ندارد"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"وجود سیم‌کارت برای اتصال لازم است"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"وجود سیم‌کارت <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> برای اتصال لازم است"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"‏حالت شبکه برگزیده: WCDMA برگزیده"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"‏حالت شبکه برگزیده: فقط GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"‏حالت شبکه برگزیده: فقط WCDMA"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"داده تلفن همراه"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"دسترسی به داده‌ها با استفاده از شبکه تلفن همراه"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"تلفن، وقتی در محدوده باشد، به‌طور خودکار به این شرکت مخابراتی جابه‌جا می‌شود"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"سیم‌کارت موجود نیست"</string>
     <string name="calls_preference" msgid="2166481296066890129">"تنظیمات ترجیحی تماس‌ها"</string>
     <string name="sms_preference" msgid="7742964962568219351">"اولویت‌ها پیامک"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"هربار پرسیده شود"</string>
@@ -4925,7 +4917,7 @@
     <string name="device_controls_setting_toggle" msgid="8972005569207737469">"نمایش کنترل‌های دستگاه"</string>
     <string name="cards_passes_setting_toggle" msgid="3380984848045396695">"نمایش کارت‌ها و مجوزها"</string>
     <string name="device_controls_setting_subtitle" msgid="4388544861427973600">"برای دسترسی به کنترل‌های دستگاه‌های متصل، دکمه روشن/خاموش را نگه دارید"</string>
-    <string name="cards_passes_setting_subtitle" msgid="4427459738229697469">"برای دسترسی به مواردی مانند روش‌های پرداخت و کارت پرواز، دکمه «روشن/خاموش» را فشار دهید و نگه‌دارید."</string>
+    <string name="cards_passes_setting_subtitle" msgid="4427459738229697469">"برای دسترسی به مواردی مانند روش‌های پرداخت و کارت پرواز، دکمه روشن/خاموش را فشار دهید و نگه‌دارید."</string>
     <string name="rtt_settings_title" msgid="7049259598645966354"></string>
     <string name="rtt_settings_no_visible" msgid="7440356831140948382"></string>
     <string name="rtt_settings_visible_during_call" msgid="7866181103286073700"></string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"مجاز کردن هم‌پوشانی صفحه‌ها در «تنظیمات»"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"مجاز کردن برنامه‌هایی که برای همپوشانی صفحه‌های «تنظیمات» می‌توانند روی برنامه‌های دیگر نمایش داده شوند"</string>
     <string name="media_controls_title" msgid="403271085636252597">"رسانه"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"پس از اتمام جلسه رسانه، پخش‌کننده پنهان شود"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"پخش‌کننده به شما اجازه می‌دهد جلسه‌ای را از پانل «تنظیمات فوری» گسترده‌ ازسر بگیرید."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"پخش‌کننده رسانه در «تنظیمات فوری»"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"پخش‌کننده رسانه برای مدت‌زمان طولانی‌تری نشان داده می‌شود تا به‌آسانی بتوانید بازپخش را ازسر بگیرید."</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"پنهان کردن پخش‌کننده"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"نمایش دادن پخش‌کننده"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"پخش‌کننده‌ای دردسترس نیست"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"برنامه‌های مجاز"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"رسانه‌"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"بلوتوث روشن می‌شود"</string>
 </resources>
diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml
index 92a3668..69d51cf 100644
--- a/res/values-fi/arrays.xml
+++ b/res/values-fi/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Keskipitkä"</item>
     <item msgid="6740026006576843477">"Pitkä"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Lyhyt"</item>
+    <item msgid="7397961711906421599">"Keskipitkä"</item>
+    <item msgid="4079132024502041928">"Pitkä"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Oletus"</item>
     <item msgid="4234707448428002595">"Sans Serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Maailmanlaajuinen"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Vain TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Yleiset"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index cd450e9..a1b86b7 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Näytä profiilin tiedot lukitusnäytöllä"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Tilit"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Sijainti"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Käytä sijaintia"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Käytä sijaintia"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Pois päältä"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">Päällä – <xliff:g id="COUNT_1">%1$d</xliff:g> sovelluksella on sijainnin käyttöoikeus</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Todennus kasvojen avulla"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Aloita"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Jos esteettömyyden Face Unlock on poissa päältä, jotkin käyttöönottovaiheet eivät välttämättä toimi oikein TalkBackilla."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Palaa"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Jatka käyttöönottoa"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Käytä esteettömyysvalintoja"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="one">PIN-koodissa saa olla enintään <xliff:g id="NUMBER_0">%d</xliff:g> numero.</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Järjestelmänvalvoja esti PIN-koodin, koska sitä on käytetty hiljattain."</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"IT-järjestelmänvalvoja on estänyt yleiset PIN-koodit. Kokeile eri PIN-koodia."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Salasanassa ei saa olla virheellisiä merkkejä."</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Salasanassa täytyy olla vähintään yksi kirjain."</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Salasanassa täytyy olla vähintään yksi numero."</string>
@@ -653,7 +655,6 @@
       <item quantity="one">Salasanassa on oltava vähintään 1 merkki, joka ei ole numero</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Järjestelmänvalvoja esti salasanan, koska sitä on käytetty hiljattain."</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"IT-järjestelmänvalvoja on estänyt yleiset salasanat. Kokeile eri salasanaa."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Nousevat, laskevat tai toistuvat numerosarjat on kielletty."</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Vahvista"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Peruuta"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Ota Wi-Fi käyttöön"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Käytä Wi-Fiä"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Käytä Wi-Fi-yhteyttä"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wi-Fi-asetukset"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Ota käyttöön ja hallinnoi langattoman yhteyden tukiasemia"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Keskitä QR-koodi alle yhdistääksesi <xliff:g id="SSID">%1$s</xliff:g>:iin"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Yhdistä Wi-Fi-verkkoon lukemalla QR-koodi."</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Jaa Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Yhdistä <xliff:g id="SSID">%1$s</xliff:g>:iin lukemalla tämä QR-koodi ja jaa salasana."</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Yhdistä <xliff:g id="SSID">%1$s</xliff:g> lukemalla tämä QR-koodi toisella laitteella"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Yhdistä <xliff:g id="SSID">%1$s</xliff:g> skannaamalla tämä QR-koodi"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Yritä uudelleen. Jos ongelma ei ratkea, ota yhteyttä laitteen valmistajaan"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Jotain meni pieleen"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi-Fi-verkon salasana: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Hotspotin salasana: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Automaattinen yhdistäminen"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Salli puhelimen yhdistää automaattisesti tämän verkon lähellä"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Salli tabletin yhdistää automaattisesti tämän verkon lähellä"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Salli tähän verkkoon yhdistäminen sen kantoalueella ollessa"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Lisää laite"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Lisää laite tähän verkkoon QR-koodin avulla"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR-koodin muoto ei kelpaa"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Käytä järjestelmän varmenteita"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Älä anna"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Älä vahvista"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Ei määritettyä varmennetta. Yhteytesi ei ole yksityinen."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Verkon nimi on liian pitkä."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Määritä verkkotunnus."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Varmenne vaaditaan."</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Yhdistä"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi on käytössä"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Yhdistetty verkkoon <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Yhdistetään: <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Yhdistetään…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Yhteyden muodostaminen verkkoon epäonnistui."</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Verkko ei ole kantoalueella"</string>
@@ -1030,7 +1030,7 @@
     <string name="wifi_p2p_disconnect_title" msgid="96361896458072463">"Katkaistaanko yhteys?"</string>
     <string name="wifi_p2p_disconnect_message" msgid="1208761239498807208">"Jos katkaiset yhteyden, yhteys laitteeseen <xliff:g id="PEER_NAME">%1$s</xliff:g> katkaistaan."</string>
     <string name="wifi_p2p_disconnect_multiple_message" msgid="4490648217799144078">"Jos kosketat Katkaise yhteys, yhteys laitteeseen <xliff:g id="PEER_NAME">%1$s</xliff:g> ja <xliff:g id="PEER_COUNT">%2$s</xliff:g> muuhun laitteeseen katkaistaan."</string>
-    <string name="wifi_p2p_cancel_connect_title" msgid="8476985132989357041">"Peruutetaanko kutsu?"</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="8476985132989357041">"Perutaanko kutsu?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="2409074184473879809">"Haluatko peruuttaa laitteelle <xliff:g id="PEER_NAME">%1$s</xliff:g> lähetetyn yhteydenmuodostuskutsun?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="4880242270742385699">"Unohdetaanko tämä ryhmä?"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="1549663436920597006">"Wi‑Fi-hotspot"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Sovellus jakaa sisältöä – jos haluat jakaa internetyhteyden, sammuta hotspot ja käynnistä se uudelleen"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Ei salasanaa"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Hotspotin nimi"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Käynnistetään <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Laitetaan <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> päälle…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> on muiden laitteiden käytettävissä."</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Hotspotin salasana"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP-taajuus"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Nostaa tietyn sisällön päivitysvälin automaattisesti 60 hertsistä 90:een. Lisää akun käyttöä."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Pakota 90 Hz:n päivitysväli"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Korkein päivitysväli parantaa kosketukseen vastaamista ja animaatioiden laatua. Lisää akun käyttöä."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Huomionäyttö"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Päällä / näyttö ei sammu, kun katsot sitä"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android-versio"</string>
     <string name="security_patch" msgid="4071756145347865382">"Androidin tietoturvapäivitys"</string>
     <string name="model_info" msgid="8997566254717810904">"Malli"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Malli: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Malli ja laitteisto"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Laitteistoversio"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Varustetunnus"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Verkkoasetuksesi on nollattu."</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"SIM-korttien tyhjennys ei onnistu"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Ladattuja SIM-kortteja ei voi poistaa virheen vuoksi.\n\nKäynnistä laite uudelleen ja yritä sitten uudelleen."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Poista kaikki tiedot (palauta tehdasasetukset)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Poista data (tehdasasetuksiin)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Tämä poistaa kaiken datan tabletin "<b>"sisäisestä tallennustilasta"</b>", esimerkiksi\n\n"<li>"Google-tilisi"</li>\n<li>"järjestelmän ja sovellusten datan ja asetukset"</li>\n<li>"ladatut sovellukset"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Tämä poistaa kaiken datan puhelimen "<b>"sisäisestä tallennustilasta"</b>", esimerkiksi\n\n"<li>"Google-tilisi"</li>\n<li>"järjestelmän ja sovellusten datan ja asetukset"</li>\n<li>"ladatut sovellukset"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Olet kirjautunut sisään seuraaviin tileihin:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Tällä laitteella on muita paikalla olevia käyttäjiä.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Musiikki"</li>\n<li>"Valokuvat"</li>\n<li>"Muut käyttäjän tiedot"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIMit"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Tämä ei peruuta mobiilipalvelupakettiasi."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Jos haluat poistaa musiikin, kuvat ja muut käyttäjän tiedot, "<b>"USB-tallennustila"</b>" tulee tyhjentää."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Jos haluat poistaa musiikin, kuvat ja muut käyttäjän tiedot, "<b>"SD-kortti"</b>" tulee tyhjentää."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Poista data (tehdasasetuksiin)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Poista data (tehdasasetuksiin)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Tämä poistaa tabletin "<b>"sisäisestä tallennustilasta"</b>" kaiken datan, esimerkiksi\n\n"<li>"Google-tilisi"</li>\n<li>"järjestelmän ja sovellusten datan ja asetukset"</li>\n<li>"ladatut sovellukset"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Tämä poistaa puhelimen "<b>"sisäisestä tallennustilasta"</b>" kaiken datan, esimerkiksi\n\n"<li>"Google-tilisi"</li>\n<li>"järjestelmän ja sovellusten datan ja asetukset"</li>\n<li>"ladatut sovellukset"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Olet kirjautunut sisään seuraaville tileille:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Muut käyttävät laitetta parhaillaan.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Musiikki"</li>\n<li>"Valokuvat"</li>\n<li>"Muu käyttäjädata"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIMit"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Tämä ei peruuta mobiilipalvelupakettiasi."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Jos haluat poistaa musiikin, kuvat ja muun käyttäjädatan, tyhjennä "<b>"USB-tallennustila"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Jos haluat poistaa musiikin, kuvat ja muun käyttäjädatan, tyhjennä "<b>"SD-kortti"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Tyhjennä USB-tallennustila"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Tyhjennä SD-kortti"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Poista kaikki sisäisen USB-tallennustilan tiedot, kuten musiikki tai valokuvat."</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Poista kaikki SD-kortin tiedot, kuten musiikki tai valokuvat."</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Pyyhi kaikki tiedot"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Pyyhi kaikki tiedot"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Kaikki henkilökohtaiset tietosi ja ladatut sovellukset poistetaan. Toimintoa ei voi kumota."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Kaikki henkilökohtaiset tietosi poistetaan, mukaan lukien ladatut sovellukset ja SIM-kortit. Toimintoa ei voi kumota."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Poista kaikki"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Palauttamista ei suoritettu, koska System Clear -palvelu ei ole käytettävissä."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Poistetaanko kaikki data?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Tämä käyttäjä ei voi palauttaa tehdasasetuksia"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Tyhjennetään"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Odota…"</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Poista kaikki data"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Poista kaikki data"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Kaikki henkilökohtaiset tietosi ja ladatut sovellukset poistetaan. Toimintoa ei voi kumota."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Kaikki henkilökohtaiset tietosi poistetaan, mukaan lukien ladatut sovellukset ja SIM-kortit. Toimintoa ei voi kumota."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Poistetaanko kaikki data?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Tämä käyttäjä ei voi palauttaa tehdasasetuksia"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Poistetaan"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Odota…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Puheluasetukset"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Ota käyttöön puhelinvastaaja, soitonsiirrot, koputuspalvelu, soittajan tunnus"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Jaettu yhteys USB:n kautta"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Voidaan yhdistää korkeintaan <xliff:g id="MAXCONNECTION">%1$d</xliff:g> laitteeseen."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Jaettu internetyhteys katkaistaan laitteesta <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ethernetin jakaminen"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Jaa puhelimen internetyhteys USB-Ethernetillä"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Jaa puhelimen internetyhteys Ethernetillä"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Hotspot- ja yhteyden jako ‑ominaisuuksien avulla voit jakaa internetyhteyden muille laitteille mobiilidatayhteydellä. Sovellukset voivat myös luoda hotspotin ja jakaa sisältöä lähellä olevien laitteiden kanssa."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Jaa internetyhteys muille laitteille Wi-Fin tai mobiilidatan avulla hotspotilla tai käyttämällä puhelinta modeemina. Sovellukset voivat myös luoda hotspotin ja jakaa sisältöä lähellä olevien laitteiden kanssa."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Ohjeet"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Tekstitysvalinnat"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Suurennus"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Suurennettava alue"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Suurennuksen käyttöönotto"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Valitse alueet, joihin näytön suurennusta käytetään"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Koko näyttö"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Osa näytöstä"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Koko näyttö ja osa näytöstä"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Suurenna koko näyttö"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Suurenna osa näytöstä"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Vaihdetaanko esteettömyyspainikkeeseen?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Jos käytät kolmoisnapautusta näytön osan suurentamiseen, kirjoittamisessa ja muissa toiminnoissa voi esiintyä viivettä.\n\nHaluatko suurentaa jatkossa esteettömyyspainikkeella?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Vaihda esteettömyyspainikkeeseen"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Jatka suurentamista kolmoisnapautuksella"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Suurennusasetukset"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Suurenna kolmoisnapautuksella"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Suurenna pikanäppäimellä"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Puhelun katkaisu virtapainikkeella"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Suuri hiiren osoitin"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Poista animaatiot"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Monoääni"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Yhdistä kanavat ääntä toistettaessa"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Äänitasapaino"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Vasen"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Oikea"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Monoaudio"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Yhdistä kanavat audiota toistettaessa"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Audiotasapaino"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Vasen"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Oikea"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Oletus"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 sekuntia"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 sekuntia"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Ilmoitusvärinä"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Soittoäänen värinä"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Kosketuspalaute"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Valitse <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Avaa <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Käytä värinkorjausta"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Näytä tekstitykset"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Vain tuetuille sovelluksille"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> käytössä"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Avaa <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Käytä värinkorjausta"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Näytä tekstitykset"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Vain tuetuille sovelluksille"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Tekstitysten koko ja tyyli"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Tekstin koko: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Lisää asetuksia"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomalia"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomalia"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomalia"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Harmaasävy"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Puna-vihersokeus"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Puna-vihersokeus"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Sini-keltasokeus"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Taustakäytön rajoitus"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Salli sovelluksen toimia taustalla"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Sovellus ei saa toimia taustalla."</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Taustakäyttöä ei voi rajoittaa."</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Taustakäyttöä ei voi rajoittaa"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Rajoitetaanko toimintaa taustalla?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Jos rajoitat sovelluksen toimintaa taustalla, se voi alkaa toimia virheellisesti."</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Sovellusta ei voi rajoittaa, koska akun optimointi ei ole käytössä.\n\nOta optimointi käyttöön rajoittamista varten."</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Luo aikataulu"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Pidennä akunkestoa"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Laita pois päältä, kun lataus on valmis"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Virransäästö menee pois päältä, kun puhelimen varaus on <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Virransäästö menee pois päältä, kun tabletin varaus on <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Virransäästö menee pois päältä, kun laitteen varaus on <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Virransäästö menee pois päältä, kun puhelimen varaus on yli <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Virransäästö menee pois päältä, kun tabletin varaus on yli <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Virransäästö menee pois päältä, kun laitteen varaus on yli <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Ota käyttöön"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Nollaa"</string>
     <string name="tts_play" msgid="2945513377250757221">"Toista"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Mukautuvat yhteydet"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Parantaa akunkestoa ja laitteen suorituskykyä hallinnoimalla automaattisesti verkkoyhteyksiäsi"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Kirjautumistietojen tallennustila"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Varmenteen asentaminen"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Asenna varmenteet tallennustilasta."</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Käyttäjän kirjautumistiedot"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Tarkastele ja muokkaa tallennettuja kirjautumistietoja."</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Lisäasetukset"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Tallennustilan tyyppi"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Laitteiston tukema"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Vain ohjelmisto"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Kirjautumistunnukset eivät ole tämän käyttäjän käytettävissä"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Asennettu VPN:ää ja sovelluksia varten"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Asennettu Wi-Fiä varten"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Maksaminen päätteellä"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Asenna maksusovellus. Maksa ostoksesi pitämällä puhelimen takaosaa lähimaksupäätettä vasten."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Selvä"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Lisää…"</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Lisää…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Valitse oletusmaksusovellus"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Päivitä oletusmaksusovellus"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Maksa lähimaksupäätteellä tällä sovelluksella: <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Käytä kaikille puheluille"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Valitse SIM-kortti tiedonsiirtoon"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Valitse SIM-kortti tekstiviesteille"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Vaihdetaan tiedonsiirron SIM-korttia, odota hetki…"</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Vaihdetaan datan SIM-korttia, hetkinen…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Valitse puhelinoperaattori:"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"SIM-kortin valinta"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM-kortti <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"ohjelma, aikataulu, virransäästö, virran säästäminen, akku, automaattinen, prosentti"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, puhelujen lisävaihtoehdot, 4g-puhelut"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"lisää kieli"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"tekstin koko"</string>
     <string name="default_sound" msgid="6604374495015245195">"Oletusääni"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Soittoäänen ja ilmoitusten äänenvoimakkuus <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Äänenvoimakkuus, värinä, Älä häiritse"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Käynnistysäänet"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Live-tekstitys"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Tekstitä media automaattisesti"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Ei mitään"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> aikataulua luotu</item>
-      <item quantity="one">1 aikataulu luotu</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Ei yhtään}=1{1 aikataulu luotu}other{# aikataulua luotu}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Älä häiritse"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Salli ilmoitukset vain tärkeiltä ihmisiltä ja sovelluksilta"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Keskeytysten rajoittaminen"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Vain tärkeät"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Päällä / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Pois päältä / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Pois päältä"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Päällä"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Kysy aina"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Kunnes laitat pois päältä"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> tuntia</item>
-      <item quantity="one">1 tunti</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minuuttia"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> aikataulua voi käynnistyä automaattisesti</item>
-      <item quantity="one">1 aikataulu voi käynnistyä automaattisesti</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 tunti}other{# tuntia}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minuutti}other{# minuuttia}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Pois päältä}=1{Pois päältä / 1 aikataulu voi käynnistyä automaattisesti}other{Pois päältä / # aikataulua voi käynnistyä automaattisesti}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Mikä voi keskeyttää Älä häiritse ‑tilan"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Ihmiset"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Sovellukset"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Aseta alemman prioriteetin ilmoitukset automaattisesti varovaisiksi."</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Ilmoitusten mukautuva järjestäminen"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Järjestä ilmoitukset automaattisesti olennaisuuden mukaan"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Mukautuva ilmoituspalaute"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Näytä ilmoituksiin tehdyt muutokset ja miten järjestelmästä voi antaa palautetta"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Toiminta- ja vastausehdotukset"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Näytä toiminta- ja vastausehdotukset automaattisesti."</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Näytä viimeaikaiset ja myöhemmäksi siirretyt ilmoitukset"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Älä häiritse -pääsy"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Salli Älä häiritse ‑tila"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Yksikään asennettu sovellus ei ole pyytänyt Älä häiritse -tilan käyttöoikeutta."</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Ladataan sovelluksia…"</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Ladataan sovelluksia…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Android estää pyynnöstäsi tämän sovelluksen ilmoituksien näyttämisen tällä laitteella."</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Android estää pyynnöstäsi tähän luokkaan kuuluvien ilmoituksien näyttämisen tällä laitteella."</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Android estää pyynnöstäsi tähän ryhmään kuuluvien ilmoituksien näyttämisen tällä laitteella."</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Kaikki keskustelut"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Tärkeät keskustelut"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"–"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> keskustelua</item>
-      <item quantity="one">1 keskustelu</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"–"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Ei yhtään}=1{1 keskustelu}other{# keskustelua}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Kuka saa keskeyttää"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Puhelut"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Puhelut"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Varmista sallittujen puhelujen kuuluminen tarkistamalla, että laitteen tilana on soittoääni"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Saapuvat puhelut estetään: <xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>. Voit määrittää asetukset niin, että ystävät, perheenjäsenet tai muut yhteyshenkilöt saavat sinuun yhteyden."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Tähdelliset yhteystiedot"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> muuta</item>
-      <item quantity="one">1 muu</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"–"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Ei yhtään}=1{{contact_1}}=2{{contact_1} ja {contact_2}}=3{{contact_1}, {contact_2} ja {contact_3}}other{{contact_1}, {contact_2} ja # muuta}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Viestit"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"viestit"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Viestit"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Saapuvat viestit estetään: <xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>. Voit määrittää asetukset niin, että ystävät, perheenjäsenet tai muut yhteyshenkilöt saavat sinuun yhteyden."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Näet kaikki viestit"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Saat kaikki puhelut"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"–"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontaktia</item>
-      <item quantity="one">1 kontakti</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Ei yhtään}=1{1 kontakti}other{# kontaktia}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Kaikki"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Kontaktit"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Tähdellä merkityt kontaktit"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Kaikki ilmoitukset"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Osa ilmoituksista"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Valitsemasi ihmiset voivat edelleen ottaa sinuun yhteyttä, vaikka et anna sovellusten keskeyttää"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> voivat keskeyttää</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> voi keskeyttää</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> muuta"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Mitkään sovellukset eivät voi keskeyttää}=1{{app_1} voi keskeyttää}=2{{app_1} ja {app_2} voivat keskeyttää}=3{{app_1}, {app_2} ja {app_3} voivat keskeyttää}other{{app_1}, {app_2} ja # muuta voivat keskeyttää}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Sovellukset"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Kaikki ilmoitukset"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Osa ilmoituksista"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Ilmoitukset, jotka saavat keskeyttää"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Salli kaikki ilmoitukset"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> voivat keskeyttää</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> voi keskeyttää</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Mikään ei voi keskeyttää"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> muuta"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Mikään ei voi keskeyttää}=1{{sound_category_1} voi keskeyttää}=2{{sound_category_1} ja {sound_category_2} voivat keskeyttää}=3{{sound_category_1}, {sound_category_2} ja {sound_category_3} voivat keskeyttää}other{{sound_category_1}, {sound_category_2} ja # muuta voivat keskeyttää}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Mikään ei voi keskeyttää"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Kukaan ei voi keskeyttää"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Jotkut voivat keskeyttää"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Kaikki käyttäjät voivat keskeyttää"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB-yhteyttä ohjaa"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Yhdistetty laite"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Tämä laite"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Vaihdetaan…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Vaihdetaan…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Vaihtaminen epäonnistui"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Laitteen lataaminen"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Yhdistetyn laitteen lataaminen"</string>
@@ -4117,7 +4088,7 @@
     <string name="zen_access_warning_dialog_title" msgid="6323325813123130154">"Myönnetäänkö Älä häiritse -tilan käyttöoikeus sovellukselle <xliff:g id="APP">%1$s</xliff:g>?"</string>
     <string name="zen_access_warning_dialog_summary" msgid="8468714854067428987">"Sovellus voi ottaa Älä häiritse -tilan käyttöön tai poistaa sen käytöstä sekä muokata siihen liittyviä asetuksia."</string>
     <string name="zen_access_disabled_package_warning" msgid="6565908224294537889">"Tämän täytyy olla käytössä, sillä ilmoitusten käyttöoikeus on myönnetty."</string>
-    <string name="zen_access_revoke_warning_dialog_title" msgid="7377261509261811449">"Peruutetaanko sovellukselta <xliff:g id="APP">%1$s</xliff:g> Älä häiritse -tilan käyttöoikeus?"</string>
+    <string name="zen_access_revoke_warning_dialog_title" msgid="7377261509261811449">"Perutaanko sovellukselta <xliff:g id="APP">%1$s</xliff:g> Älä häiritse -tilan käyttöoikeus?"</string>
     <string name="zen_access_revoke_warning_dialog_summary" msgid="8689801842914183595">"Kaikki tämän sovelluksen luomat Älä häiritse -säännöt poistetaan."</string>
     <string name="ignore_optimizations_on" msgid="6865583039303804932">"Älä optimoi"</string>
     <string name="ignore_optimizations_off" msgid="9186557038453586295">"Optimoi"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Näytä tiedot"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Data Saver"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Rajoittamaton data"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Taustatiedonsiirto ei käytössä"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Taustatiedot on poistettu käytöstä"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Päällä"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Pois päältä"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Käytä virransäästöä"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Estä vastausten ja muun tekstin kirjoittaminen ilmoituksiin, kun laite on lukittu."</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Oletusarvoinen oikoluku"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Valitse oikoluku"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Tarkista oikeinkirjoitus"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Käytä oikolukua"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Ei valittu"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(ei mitään)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Tallennustilan hallinta vapauttaa tilaa poistamalla varmuuskopioituja kuvia ja videoita laitteeltasi."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Poista kuvia ja videoita"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Tallennustilan hallinta"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Käytä tallennustilan hallintaa"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Käytä tallennustilan ylläpitoa"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automaattinen"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Manuaalinen"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Vapauta tilaa"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Tarkista ilmoitukset kaksoisnapauttamalla puhelimen näyttöä"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Tarkista ilmoitukset kaksoisnapauttamalla tabletin näyttöä"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Tarkista ilmoitukset kaksoisnapauttamalla laitteen näyttöä"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Ilmoitukset pyyhkäisyllä"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Näytä ilmoitukset pyyhkäisemällä alas näytön alareunasta"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Yhden käden moodi"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Käytä yhden käden moodia"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Poistu, kun sovellusta vaihdetaan"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Aikaraja"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 sekuntia"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 sekuntia"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 sekuntia"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"tavoitettavuus"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Kaksoisnapauta näyttöä, niin näet ajan, ilmoitukset ja muita tietoja."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Tarkista nostamalla"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Tarkista ilmoitukset nostamalla tablettisi"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Tarkista tabletin ilmoitukset napauttamalla"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Tarkista laitteen ilmoitukset napauttamalla"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Napauta näyttöä, niin näet ajan, ilmoitukset ja muita tietoja."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Paniikkinappula"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Aloita hätätilannepalvelujen käyttö painamalla virtapainiketta nopeasti viisi kertaa."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Varoitusääni"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Ilmoita ennen aloittamista"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Hätäyhteyshenkilöt"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Pyyhkäise ilmoitukset esiin"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Sormenjäljen pyyhkäisy"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Voit katsoa ilmoitukset pyyhkäisemällä puhelimen takaosassa olevasta sormenjälkitunnistimesta alaspäin."</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Ota käyttöön kaikissa sovelluksissa"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Valitse grafiikkaohjain"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Oletus"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Peliajuri"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Peliajuri"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Kehittäjän ajuri"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Järjestelmän grafiikkaohjain"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Verkkoja ei löytynyt. Yritä uudelleen."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(kielletty)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Ei SIM-korttia"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM-kortti"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Ei SIM-korttia"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Ei mitään"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Yhdistämiseen tarvitaan SIM-kortti"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Yhdistämiseen tarvitaan SIM-kortti (<xliff:g id="WIRELESS_CARRIER">%s</xliff:g>)"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Ensisijainen verkkotila: ensisijaisesti WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Ensisijainen verkkotila: vain GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Ensisijainen verkkotila: vain WCDMA"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobiilidata"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Käytä mobiiliverkon dataa"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Puhelin vaihtaa automaattisesti tähän operaattoriin, kun se on kantoalueella."</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Ei SIM-korttia käytettävissä"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Puheluasetus"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Tekstiviestiasetus"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Kysy aina"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Salli näytön peitto Asetukset-sovelluksessa"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Anna sovellusten, jotka voivat näkyä muiden sovellusten päällä, peittää Asetukset-sovelluksen näytöt"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Media"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Piilota soitin kun median käyttökerta on päättynyt"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Tällä soittimella voit jatkaa käyttökertaa laajennetusta pika-asetuspaneelista."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Mediasoitin pika-asetuksissa"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Pidä mediasoitin näkyvillä pitkään, niin voit jatkaa toistoa helposti"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Piilota soitin"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Näytä soitin"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Soittimia ei saatavilla"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Sallitut sovellukset"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"media"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth käynnistyy."</string>
 </resources>
diff --git a/res/values-fr-rCA/arrays.xml b/res/values-fr-rCA/arrays.xml
index 70688e9..cf4b15d 100644
--- a/res/values-fr-rCA/arrays.xml
+++ b/res/values-fr-rCA/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Moyen"</item>
     <item msgid="6740026006576843477">"Long"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Court"</item>
+    <item msgid="7397961711906421599">"Moyen"</item>
+    <item msgid="4079132024502041928">"Long"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Par défaut"</item>
     <item msgid="4234707448428002595">"Sans empattement"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA uniquement"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Mondial"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 3a144f9..7df7f10 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Afficher infos de profil sur écran de verrouillage"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Comptes"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Position"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Utiliser ma position"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Utiliser ma position"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Désactivé"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">Activé : <xliff:g id="COUNT_1">%1$d</xliff:g> application a accès à la position</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Utiliser son visage pour s\'authentifier"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Démarrer"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Si la fonctionnalité de déverr. par reconnaissance faciale est désactivée, certaines étapes de configuration pourraient ne pas fonctionner avec TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Retour"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Poursuivre configur."</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Utiliser config. d\'accessibilité"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="other">Doit contenir moins de <xliff:g id="NUMBER_1">%d</xliff:g> chiffres</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"L\'administrateur de l\'appareil ne permet pas l\'utilisation d\'un NIP récent"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Les NIP communs sont bloqués par l\'administrateur de votre service informatique. Essayez un NIP différent."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Vous ne pouvez pas inclure de caractère non valide"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Doit contenir au moins une lettre"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Doit contenir au moins un chiffre"</string>
@@ -653,7 +655,6 @@
       <item quantity="other">Doit contenir au moins <xliff:g id="COUNT">%d</xliff:g> caractères non numériques</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"L\'administrateur de l\'appareil ne permet pas l\'utilisation d\'un mot de passe récent"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Les mots de passe communs sont bloqués par l\'administrateur de votre service informatique. Essayez un mot de passe différent."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Les suites croissantes, décroissantes ou répétitives de chiffres ne sont pas autorisées"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Confirmer"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Annuler"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Activer le Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Utiliser le Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Utiliser le Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Paramètres Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Configurer et gérer les points d\'accès sans fil"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Centrez le code QR ci-dessous pour vous connecter à « <xliff:g id="SSID">%1$s</xliff:g> »"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Connectez-vous au Wi-Fi en numérisant un code QR"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Partager le Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Numérisez ce code QR pour établir la connexion au réseau « <xliff:g id="SSID">%1$s</xliff:g> » et partager le mot de passe"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Numérisez ce code QR avec un autre appareil pour vous connecter à « <xliff:g id="SSID">%1$s</xliff:g> »"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Numérisez ce code QR pour établir la connexion au réseau « <xliff:g id="SSID">%1$s</xliff:g> »"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Réessayez. Si le problème persiste, communiquez avec le fabricant de l\'appareil"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Un problème s\'est produit"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Mot de passe Wi-Fi : <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Mot de passe du point d\'accès : <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Connexion automatique"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Autoriser le téléphone à se connecter automatiquement lorsqu\'il est à proximité de ce réseau"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Autoriser la tablette à se connecter automatiquement lorsqu\'elle est à proximité de ce réseau"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Autoriser la connexion à ce réseau lorsqu\'il est à portée"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Ajouter un appareil"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Utiliser un code QR pour ajouter un appareil à ce réseau"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"Le format du code QR est incorrect"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Utiliser les certificats système"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Ne pas fournir"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Ne pas valider"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Aucun certificat indiqué. Votre connexion ne sera pas privée."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Le nom du réseau est trop long."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Vous devez spécifier un domaine."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Certificat obligatoire."</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Connexion"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi activé"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Connecté à <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Connexion à <xliff:g id="NETWORK_NAME">%1$s</xliff:g> en cours…"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Connexion en cours…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Échec de la connexion au réseau."</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Réseau hors de portée"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"L\'application partage du contenu. Pour partager la connexion Internet, désactivez puis réactivez le point d\'accès."</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Aucun mot de passe défini"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Nom du point d\'accès"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Activation du point d\'accès <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> en cours…"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Activation du point d\'accès <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> en cours…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"D\'autres appareils peuvent se connecter à <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Mot de passe du point d\'accès"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Bande du point d\'accès"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Affichage fluide"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Augmente automatiquement la fréquence d\'actualisation de 60 Hz à 90 Hz pour certains contenus. Cette fonctionns sollicite davantage la pile de l\'appareil."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Affichage fluide"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Forcer le taux d\'actualisation de 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Taux d\'actualisation supérieur pour une amélioration de la réactivité tactile et de la fluidité des animations. Cette fonction sollicite davantage la pile de l\'appareil."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Écran attentif"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Activé : L\'écran ne s\'éteint pas pendant que vous le regardez"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Version d\'Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Mise à jour de sécurité Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Modèle"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Modèle : %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Modèle et matériel"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Version du matériel"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Equipment ID"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Les paramètres réseau ont été réinitialisés"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Impossible d\'effacer les cartes SIM"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Les cartes SIM téléchargées ne peuvent pas être effacées en raison d\'une erreur.\n\nRedémarrez votre appareil et réessayez."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Effacer toutes les données (réinitialisation d\'usine)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Effac. ttes données (réinit.)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Cette action effacera toutes les données de la "<b>"mémoire de stockage interne"</b>" de votre tablette, y compris :\n\n"<li>"Votre compte Google"</li>\n<li>"Les données et paramètres du système et de l\'application"</li>\n<li>"Les applications téléchargées"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Cette action effacera toutes les données de la "<b>"mémoire de stockage interne"</b>" de votre téléphone, y compris :\n\n"<li>"Votre compte Google"</li>\n<li>"Les données et paramètres du système et de l\'application"</li>\n<li>"Les applications téléchargées"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Vous êtes actuellement connecté aux comptes suivants :\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"D\'autres personnes utilisent cet appareil.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Musique"</li>\n<li>"Photos"</li>\n<li>"Autres données utilisateur"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"Cartes eSIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Cela n\'annulera pas votre forfait de services cellulaires."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Pour supprimer la musique, les photos et les autres données utilisateur, vous devez effacer la "<b>"mémoire de stockage USB"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Pour supprimer la musique, les photos et les autres données utilisateur, vous devez effacer la "<b>"carte SD"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Effacer toutes les données (réinitialisation des paramètres par défaut)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Effacer toutes les données"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Cette action effacera toutes les données de la "<b>"mémoire de stockage interne"</b>" de votre tablette, y compris :\n\n"<li>"Votre compte Google"</li>\n<li>"Les données et paramètres du système et de l\'application"</li>\n<li>"Les applications téléchargées"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Cette action effacera toutes les données de la "<b>"mémoire de stockage interne"</b>" de votre téléphone, y compris :\n\n"<li>"Votre compte Google"</li>\n<li>"Les données et paramètres du système et de l\'application"</li>\n<li>"Les applications téléchargées"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Vous êtes actuellement connecté aux comptes suivants :\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"D\'autres personnes utilisent cet appareil.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Musique"</li>\n<li>"Photos"</li>\n<li>"Autres données de l\'utilisateur"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"Modules eSIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Cela n\'annulera pas votre forfait de services cellulaires."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Pour supprimer la musique, les photos et les autres données de l\'utilisateur, vous devez effacer la "<b>"mémoire de stockage USB"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Pour supprimer la musique, les photos et les autres données de l\'utilisateur, vous devez effacer la "<b>"carte SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Effacer la mémoire de stockage USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Effacer la carte SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Effacer toutes les données de la mémoire de stockage USB interne, telles que la musique ou les photos"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Effacer toutes les données de la carte SD, telles que la musique ou les photos"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Effacer toutes les données"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Effacer toutes les données"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Tous vos renseignements personnels et les applications téléchargées seront supprimés. Vous ne pouvez pas annuler cette action."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Tous vos renseignements personnels, y compris les applications et les cartes SIM téléchargées, seront supprimées. Vous ne pouvez pas annuler cette action."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Tout effacer"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Les données n\'ont pas été réinitialisées, car le service de nettoyage du système n\'est pas disponible."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Effacer toutes les données?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Le rétablissement de la configuration d\'usine n\'est pas possible pour cet utilisateur"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Suppression en cours..."</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Veuillez patienter..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Effacer toutes les données"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Effacer toutes les données"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Tous vos renseignements personnels et les applications téléchargées seront supprimés. Vous ne pouvez pas annuler cette action."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Tous vos renseignements personnels, y compris les applications téléchargées et les modules SIM, seront supprimés. Vous ne pouvez pas annuler cette action."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Effacer toutes les données?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"La réinitialisation aux paramètres par défaut n\'est pas possible pour cet utilisateur"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Suppression en cours…"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Veuillez patienter…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Paramètres d\'appel"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Configurer la messagerie vocale, le transfert d\'appel, la mise en attente d\'appels, le numéro de l\'appelant"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Partage de connexion par USB"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Partage connexion impossible au-delà de <xliff:g id="MAXCONNECTION">%1$d</xliff:g> appareils."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Le partage de connexion avec <xliff:g id="DEVICE_NAME">%1$s</xliff:g> va être annulé."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Partage connexion Ethernet"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Partager la connexion Internet du téléphone par connexion Ethernet USB"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Partager la connexion Internet du téléphone par connexion Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Utilisez un point d\'accès et le partage de connexion pour fournir un accès Internet à d\'autres appareils par l\'intermédiaire de votre connexion cellulaire. Les applications peuvent aussi créer un point d\'accès pour partager du contenu avec d\'autres appareils à proximité."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Utilisez un point d\'accès et le partage de connexion pour fournir un accès Internet à d\'autres appareils par l\'intermédiaire de votre connexion de données Wi-Fi ou cellulaire. Les applications peuvent aussi créer un point d\'accès pour partager du contenu avec d\'autres appareils à proximité."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Aide"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Préférences de sous-titres"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Zoom"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Région d\'agrandissement"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Activer l\'agrandissement"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Choisir la ou les régions d\'agrandissement que vous voulez utiliser quand vous agrandissez l\'écran"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Plein écran"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Partie de l\'écran"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Plein écran et partie de l\'écran"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Agrandir l\'écran entier"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Agrandir une partie de l\'écran"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Passer au bouton d\'accessibilité?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"L\'utilisation du triple toucher pour agrandir une partie de l\'écran aura pour effet de retarder l\'entrée et les autres actions.\n\nSouhaitez-vous passer à l\'utilisation du bouton d\'accessibilité pour agrandir?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Passer au bouton d\'accessibilité"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Conserver le triple toucher pour agrandir"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Paramètres d\'agrandissement"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Agrandir en touchant 3 fois"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Agrandir avec un raccourci"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Interrupteur pour raccrocher"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Grand curseur de souris"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Supprimer les animations"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Audio mono"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Combiner les chaînes lors de la lecture audio"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Équilibre sonore"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Gauche"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Droite"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Audio mono"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Combiner les chaînes lors de la lecture audio"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Équilibre sonore"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Gauche"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Droite"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Par défaut"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 secondes"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 secondes"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Vibration pour les notifications"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Vibration pour la sonnerie"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Retour tactile"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Utiliser <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Ouvrir <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Utiliser la correction des couleurs"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Afficher les sous-titres"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Pour l\'application prise en charge seulement"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Utiliser <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Ouvrir <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Utiliser la correction des couleurs"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Afficher les sous-titres"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Pour l\'application prise en charge seulement"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Taille et style des sous-titres"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Taille du texte : <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Autres options"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deutéranomalie"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomalie"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomalie"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Nuances de gris"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Rouge-vert"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Rouge-vert"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Bleu-jaune"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Restriction de l\'utilisation en arrière-plan"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Autoriser l\'application à fonctionner en arrière-plan"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"L\'application n\'est pas autorisée à fonctionner en arrière-plan"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Impossible de restreindre l\'utilisation en arrière-plan"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Impossible de restreindre l\'utilisation en arrière-plan"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Limiter l\'activité en arrière-plan?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Si vous limitez l\'activité en arrière-plan d\'une application, cela peut provoquer un fonctionnement instable"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Comme cette appli n\'est pas config. pour optim. la pile, vous ne pouvez pas la restr.\n\nPour la restr., activez l\'optim. de pile."</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Configurer un horaire"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Prolonger l\'autonomie de la pile"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Désactiver lorsque l\'appareil est chargé"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Le mode Économiseur de pile se désactive lorsque le niveau de charge de la pile atteint <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Le mode Économiseur de pile se désactive lorsque le niveau de charge de la pile atteint <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Le mode Économiseur de pile se désactive lorsque le niveau de charge de la pile atteint <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Le mode Économiseur de pile se désactive lorsque le niveau de charge de la pile atteint <xliff:g id="PERCENT">%1$s</xliff:g> sur votre téléphone"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Le mode Économiseur de pile se désactive lorsque le niveau de charge de la pile atteint <xliff:g id="PERCENT">%1$s</xliff:g> sur votre tablette"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Le mode Économiseur de pile se désactive lorsque le niveau de charge de la pile atteint <xliff:g id="PERCENT">%1$s</xliff:g> sur votre appareil"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Activer"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Réinitialiser"</string>
     <string name="tts_play" msgid="2945513377250757221">"Lire"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"RPV"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Connectivité adaptative"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Prolonge l\'autonomie de la pile et améliore la performance de l\'appareil en gérant automatiquement vos connexions réseau"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Stockage des identifiants"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Installer un certificat"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Installer les certificats à partir de la mémoire de stockage"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Authentifiants d\'utilisateur"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Afficher et modifier les authentifiants stockés"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Avancés"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Type de stockage"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Intégré au matériel"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Uniquement logiciel"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Les identifiants ne sont pas accessibles pour cet utilisateur"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Installé pour le RPV et les applications"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Installé pour le Wi-Fi"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Paiement à un terminal"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Configurez une application de paiement. Il suffit ensuite de poser l\'arrière de votre téléphone sur n\'importe quel terminal disposant du symbole Sans contact."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"OK"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Plus..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Plus…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Définissez l\'application de paiement par défaut"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Mettez à jour l\'application de paiement par défaut"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"À un terminal sans contact, payer avec <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Toujours l\'utiliser pour les appels"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Sélectionnez une carte SIM pour données"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Sélectionnez la carte SIM pour les textos"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Changement de carte SIM pour les données, cela peut prendre jusqu\'à une minute..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Changement de carte SIM pour les données, cela peut prendre jusqu\'à une minute…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Appeler avec"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Sélectionnez une carte SIM"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"Carte SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"routine, horaire, économiseur de pile, économie d\'énergie, pile, automatique, pour cent"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, appels avancés, appels 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"ajouter langue, ajoutez une langue"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"taille du texte"</string>
     <string name="default_sound" msgid="6604374495015245195">"Son par défaut"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Le volume pour la sonnerie et les notifications est réglé à <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Volume, vibration, Ne pas déranger"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Activation par les sons"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Transcription instantanée"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Ajouter automatiquement des sous-titres aux contenus multimédias"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Aucun"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> horaire programmé</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> horaires programmés</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Aucun}=1{1 horaire programmé}one{# horaire programmé}other{# horaires programmés}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Ne pas déranger"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Recevez uniquement les notifications des personnes et des applications importantes"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limiter les interruptions"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Priorités seulement"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Activé/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Désactivé : <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Désactivé"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Activé"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Toujours demander"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Jusqu\'à la désactivation"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> heure</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> heures</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minutes"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> horaire peut s\'activer automatiquement</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> horaires peuvent s\'activer automatiquement</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 heure}one{# heure}other{# heures}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minute}one{# minute}other{# minutes}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Désactivé}=1{Désactivé : 1 horaire peut s\'activer automatiquement}one{Désactivé : # horaire peut s\'activer automatiquement}other{Désactivé : # horaires peuvent s\'activer automatiquement}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Ce qui peut interrompre le mode Ne pas déranger"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Personnes"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Applications"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Définir automatiquement les notifications à faible priorité sur Discrètes"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Classement adaptatif des notifications"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Classer automatiquement les notifications par pertinence"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Commentaires à propos des notifications adaptatives"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Indiquer les ajustements apportés aux notifications et afficher l\'option de fournir des commentaires au système"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Suggestions d\'actions et de réponses"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Afficher automatiquement les suggestions d\'actions et de réponses"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Afficher les notifications récentes et reportées"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Accès à Ne pas déranger"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Autoriser le mode Ne pas déranger"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Aune application installée n\'a demandé l\'accès au mode « Ne pas déranger »"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Chargement des applications en cours..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Chargement des applications en cours…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"À votre demande, Android empêche les notifications de cette application de s\'afficher sur cet appareil"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"À votre demande, Android empêche cette catégorie de notifications de s\'afficher sur cet appareil"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"À votre demande, Android empêche ce groupe de notifications de s\'afficher sur cet appareil"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Toutes les conversations"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Conversations prioritaires"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Aucune"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> conversation</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> conversations</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Aucune"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Aucune}=1{1 conversation}one{# conversation}other{# conversations}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Qui peut provoquer des interruptions"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Appels"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Appels"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Pour vous assurer que les appels autorisés émettent un son, vérifiez si votre appareil est réglé pour sonner"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Pendant « <xliff:g id="SCHEDULE_NAME">%1$s</xliff:g> », les appels entrants sont bloqués. Vous pouvez régler les paramètres pour permettre à vos amis, à votre famille ou à d\'autres contacts de vous joindre."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Contacts marqués d\'une étoile"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one"><xliff:g id="NUM_PEOPLE">%d</xliff:g> autre personne</item>
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> autres personnes</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Aucun"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Aucun}=1{{contact_1}}=2{{contact_1} et {contact_2}}=3{{contact_1}, {contact_2} et {contact_3}}one{{contact_1}, {contact_2} et # autre}other{{contact_1}, {contact_2} et # autres}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Messages"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"messages"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Messages"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Pendant « <xliff:g id="SCHEDULE_NAME">%1$s</xliff:g> », les messages entrants sont bloqués. Vous pouvez régler les paramètres pour permettre à vos amis, à votre famille ou à d\'autres contacts de vous joindre."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Tous les messages peuvent vous parvenir"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Tous les appels peuvent vous parvenir"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Aucun"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> contact</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> contacts</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Aucun}=1{1 contact}one{# contact}other{# contacts}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Tout le monde"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Contacts"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Contacts marqués d\'une étoile"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Toutes les notifications"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Quelques notifications"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Les personnes sélectionnées peuvent toujours vous joindre, même si vous n\'autorisez pas les applications à provoquer des interruptions"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one"><xliff:g id="APP_NAMES">%s</xliff:g> peut provoquer des interruptions</item>
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> peuvent provoquer des interruptions</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> autres"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Aucune application ne peut provoquer d\'interruption}=1{{app_1} peut provoquer des interruptions}=2{{app_1} et {app_2} peuvent provoquer des interruptions}=3{{app_1}, {app_2} et {app_3} peuvent provoquer des interruptions}one{{app_1}, {app_2} et # autre application peuvent provoquer des interruptions}other{{app_1}, {app_2} et # autres applications peuvent provoquer des interruptions}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Applications"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Toutes les notifications"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Quelques notifications"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Notifications qui peuvent provoquer des interruptions"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Autoriser toutes les notifications"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> peut provoquer des interruptions</item>
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> peuvent provoquer des interruptions</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Rien ne peut provoquer d\'interruption"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> autres"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Rien ne peut provoquer d\'interruption}=1{{sound_category_1} peut provoquer des interruptions}=2{{sound_category_1} et {sound_category_2} peuvent provoquer des interruptions}=3{{sound_category_1}, {sound_category_2} et {sound_category_3} peuvent provoquer des interruptions}one{{sound_category_1}, {sound_category_2} et # autre application peuvent provoquer des interruptions}other{{sound_category_1}, {sound_category_2} et # autres applications peuvent provoquer des interruptions}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Rien ne peut provoquer d\'interruption"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Personne ne peut provoquer d\'interruption"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Certaines personnes peuvent provoquer des interruptions"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Tout le monde peut provoquer des interruptions"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB contrôlé par"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Appareil connecté"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Cet appareil"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Changement en cours…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Changement en cours…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Impossible de changer de mode"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Chargement de l\'appareil"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Chargement de l\'appareil connecté"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Afficher les détails"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Économiseur de données"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Données sans restrictions"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Les données en arrière-plan sont désactivées"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Les données en arrière-plan sont désactivées"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Activé"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Désactivé"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Utiliser l\'économiseur de données"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Si l\'appareil est verrouillé, empêcher l\'entrée de réponses ou de texte dans les notifications"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Correcteur ortho par défaut"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Sélectionner correcteur ortho"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Utiliser le correcteur orthographique"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Utiliser le correcteur orthographique"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Non sélectionné"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(aucun)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">" : "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Pour vous aider à libérer de l\'espace, le Gestionnaire de stockage supprime les photos et les vidéos sauvegardées sur votre appareil."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Supprimer les photos et les vidéos"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Gestionnaire de stockage"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Utiliser le gestionnaire de stockage"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Utiliser le gestionnaire de stockage"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automatique"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Manuel"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Libérer de l\'espace maintenant"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Toucher deux fois le téléphone pour le consulter"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Touchez l\'écran deux fois pour consulter votre tablette"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Touchez l\'écran deux fois pour consulter votre appareil"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Glisser un doigt pour afficher les notifications"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Balayez vers le bas le bord inférieur de l\'écran pour afficher vos notifications"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Mode Une main"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Utiliser le mode Une main"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Quitter lors du changement d\'application"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Expiration du délai"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 secondes"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 secondes"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 secondes"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"accessibilité"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Pour vérifier l\'heure, vos notifications et d\'autres renseignements, toucher deux fois l\'écran."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Saisir le téléphone pour le consulter"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Saisissez la tablette pour consulter les notifications"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Toucher pour vérifier la tablette"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Toucher pour vérifier l\'appareil"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Pour vérifier l\'heure, vos notifications et d\'autres renseignements, touchez l\'écran."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Bouton de panique"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Démarrez les actions de SOS d\'urgence en appuyant rapidement cinq fois sur l\'interrupteur."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Son d\'avertissement"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Émettre une alerte avant de démarrer les actions"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Contacts d\'urgence"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Balayer le lecteur d\'empreintes pour voir les notifications"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Balayer empreinte digit."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Pour consulter vos notifications, passer votre doigt de haut en bas sur le capteur d\'empreintes digitales à l\'arrière du téléphone."</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Activer pour toutes les applications"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Sélectionner un pilote graphique"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Par défaut"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Pilote du jeu"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Pilote du jeu"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Pilote pour concepteurs"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Pilote graphique du système"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Impossible de trouver des réseaux. Réessayez."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(interdit)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Aucune carte SIM"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Aucune carte SIM"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Aucune"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Une carte SIM est requise pour établir la connexion"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Une carte SIM de <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> est requise pour établir la connexion"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Mode réseau préféré : WCDMA de préférence"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Mode réseau préféré : GSM uniquement"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Mode réseau préféré : WCDMA uniquement"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Données cellulaires"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Accéder aux données sur réseau cellulaire"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Le téléphone passera automatiquement sur le réseau de ce fournisseur de services lorsqu\'il se trouve dans sa zone de couverture"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Aucune carte SIM n\'est accessible"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Préférences d\'appel"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Préférences de messagerie texte"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Toujours demander"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Autoriser les superpos. d\'écran pour les paramètres"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Autorisez les applications qui peuvent se superposer à d\'autres à afficher du contenu par-dessus les écrans des paramètres"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Commandes multimédias"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Masquer le lecteur à la fin de la session multimédia"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Le lecteur vous permet de reprendre une session à partir du panneau Paramètres rapides développé."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Lecteur multimédia dans le menu Paramétres rapides"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Afficher le lecteur multimédia pendant une période prolongée pour reprendre la lecture facilement"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Masquer le lecteur"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Afficher le lecteur"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Aucun lecteur n\'a été trouvé"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Applications autorisées"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"commandes multimédias"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Le Bluetooth sera activé."</string>
 </resources>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index 93d84fd..5ddfb13 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Moyen"</item>
     <item msgid="6740026006576843477">"Long"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Court"</item>
+    <item msgid="7397961711906421599">"Moyen"</item>
+    <item msgid="4079132024502041928">"Long"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Par défaut"</item>
     <item msgid="4234707448428002595">"Sans Serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Général"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA uniquement"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Global"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 42542c7..8b770e9 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Afficher infos de profil sur écran de verrouillage"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Comptes"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Localisation"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Utiliser ma position"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Utiliser ma position"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Désactivé"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">Activée - <xliff:g id="COUNT_1">%1$d</xliff:g> application a accès à votre position</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Vous authentifier avec votre visage"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Démarrer"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Si Face Unlock avec l\'option Accessibilité est désactivée, certaines étapes de configuration risquent de ne pas fonctionner correctement avec TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Retour"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Poursuivre configuration"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Utiliser config. d\'accessibilité"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="other">Le code doit contenir moins de <xliff:g id="NUMBER_1">%d</xliff:g> chiffres</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"L\'administrateur de l\'appareil n\'autorise pas l\'utilisation d\'un code récent"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Les codes courants sont bloqués par votre administrateur informatique. Choisissez un autre code."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Vous ne pouvez pas inclure de caractère non valide."</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Veuillez inclure au moins une lettre."</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Veuillez inclure au moins un chiffre."</string>
@@ -653,7 +655,6 @@
       <item quantity="other">Doit contenir au moins <xliff:g id="COUNT">%d</xliff:g> caractères non numériques</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"L\'administrateur de l\'appareil n\'autorise pas l\'utilisation d\'un mot de passe récent"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Les mots de passe courants sont bloqués par votre administrateur informatique. Choisissez un autre mot de passe."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Les suites de chiffres croissantes, décroissantes ou répétitives ne sont pas autorisées"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Confirmer"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Annuler"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Activer le Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Utiliser le Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Utiliser le Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Paramètres Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Configurer et gérer les points d\'accès sans fil"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Centrez le code QR ci-dessous pour établir la connexion à \"<xliff:g id="SSID">%1$s</xliff:g>\"."</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Connectez-vous au Wi-Fi en scannant un code QR."</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Partager le Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Scannez ce code QR pour vous connecter à \"<xliff:g id="SSID">%1$s</xliff:g>\" et partager le mot de passe."</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Scannez ce code QR avec un autre appareil pour vous connecter à \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Scannez ce code QR pour vous connecter à \"<xliff:g id="SSID">%1$s</xliff:g>\"."</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Réessayez. Si le problème persiste, contactez le fabricant de l\'appareil"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Un problème est survenu"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Mot de passe Wi-Fi : <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Mot de passe du point d\'accès : <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Connexion automatique"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Autoriser le téléphone à se connecter automatiquement lorsqu\'il se trouve à proximité de ce réseau"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Autoriser la tablette à se connecter automatiquement lorsqu\'elle se trouve à proximité de ce réseau"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Autoriser la connexion à ce réseau lorsqu\'il est à portée"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Ajouter un appareil"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Utiliser un code QR pour ajouter un appareil à ce réseau"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"Le format de code QR n\'est pas valide"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Utiliser les certificats du système"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Ne pas fournir"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Ne pas valider"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Aucun certificat indiqué. Votre connexion ne sera pas privée."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Le nom du réseau est trop long."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Vous devez spécifier un domaine."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Certificat requis."</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Se connecter"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi activé"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Connecté à <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Connexion à <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Connexion…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Échec de la connexion au réseau."</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Réseau hors de portée"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"L\'application partage du contenu. Pour partager la connexion Internet, désactivez le point d\'accès, puis réactivez-le"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Aucun mot de passe défini"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Nom du point d\'accès"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Activation du point d\'accès \"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>\"…"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Activation du point d\'accès <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"D\'autres appareils peuvent se connecter au point d\'accès \"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>\""</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Mot de passe du point d\'accès"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Bande du point d\'accès"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Affichage fluide"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Augmente automatiquement la fréquence d\'actualisation de 60 à 90 Hz pour certains contenus. Accroît l\'utilisation de la batterie."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Affichage fluide"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Forcer la fréquence d\'actualisation à 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Fréquence d\'actualisation la plus élevée pour améliorer la réactivité au toucher et la qualité d\'animation. Accroît l\'utilisation de la batterie."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Regard sur écran"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Activé - L\'écran ne s\'éteint pas pendant que vous le regardez"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Version d\'Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Mise à jour de sécurité Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Modèle"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Modèle : %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Modèle et matériel"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Version du matériel"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ID de l\'équipement"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Les paramètres réseau ont bien été réinitialisés."</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Impossible d\'effacer les cartes SIM"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Une erreur empêche d\'effacer les cartes SIM téléchargées.\n\nRedémarrez votre appareil et réessayez."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Effacer toutes les données (rétablir la configuration d\'usine)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Effacer données (rétablir config. d\'usine)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Cette action effacera toutes les données de la "<b>"mémoire de stockage interne"</b>" de votre tablette, y compris :\n\n"<li>"Votre compte Google"</li>\n<li>"Les données et paramètres du système et des applications"</li>\n<li>"Les applications téléchargées"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Cette action effacera toutes les données de la "<b>"mémoire de stockage interne"</b>" de votre téléphone, y compris :\n\n"<li>"Votre compte Google"</li>\n<li>"Les données et paramètres du système et des applications"</li>\n<li>"Les applications téléchargées"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Vous êtes actuellement connecté aux comptes suivants :\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"D\'autres personnes utilisent cet appareil.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"La musique"</li>\n<li>"Les photos"</li>\n<li>"Les autres données utilisateur"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"Les cartes eSIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Cette opération n\'annulera pas votre forfait mobile."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Pour supprimer la musique, les photos et les autres données utilisateur, vous devez effacer la "<b>"mémoire de stockage USB"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Pour supprimer la musique, les photos et les autres données utilisateur, vous devez formater la "<b>"carte SD"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Effacer toutes les données (rétablir la configuration d\'usine)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Effacer données (rétablir config. d\'usine)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Cette action effacera toutes les données de la "<b>"mémoire de stockage interne"</b>" de votre tablette, y compris :\n\n"<li>"Votre compte Google"</li>\n<li>"Les données et paramètres du système et des applications"</li>\n<li>"Les applications téléchargées"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Cette action effacera toutes les données de la "<b>"mémoire de stockage interne"</b>" de votre téléphone, y compris :\n\n"<li>"Votre compte Google"</li>\n<li>"Les données et paramètres du système et des applications"</li>\n<li>"Les applications téléchargées"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Vous êtes actuellement connecté aux comptes suivants :\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"D\'autres personnes utilisent cet appareil.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"La musique"</li>\n<li>"Les photos"</li>\n<li>"Les autres données utilisateur"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"Les cartes eSIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Cette opération n\'annulera pas votre forfait mobile."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Pour supprimer la musique, les photos et les autres données utilisateur, vous devez effacer la "<b>"mémoire de stockage USB"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Pour supprimer la musique, les photos et les autres données utilisateur, vous devez formater la "<b>"carte SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Effacer la mémoire USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Formater la carte SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Effacer toutes les données de la mémoire de stockage USB interne, telles que la musique ou les photos"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Effacer toutes les données de la carte SD, telles que la musique ou les photos"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Effacer toutes les données"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Effacer toutes les données"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Toutes vos informations personnelles et les applications téléchargées seront supprimées. Cette action est irréversible."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Toutes vos informations personnelles, y compris les applications et les cartes SIM téléchargées, seront supprimées. Cette action est irréversible."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Tout effacer"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Les données n\'ont pas été réinitialisées, car le service de nettoyage du système n\'est pas disponible."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Effacer toutes les données ?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Le rétablissement de la configuration d\'usine n\'est pas disponible pour cet utilisateur."</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Suppression en cours"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Veuillez patienter..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Effacer toutes les données"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Effacer toutes les données"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Toutes vos informations personnelles et les applications téléchargées seront supprimées. Cette action est irréversible."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Toutes vos informations personnelles, y compris les applications et les cartes SIM téléchargées, seront supprimées. Cette action est irréversible."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Effacer toutes les données ?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Le rétablissement de la configuration d\'usine n\'est pas disponible pour cet utilisateur"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Suppression en cours"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Veuillez patienter…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Paramètres d\'appel"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Messagerie vocale, transferts d\'appel, mise en attente, numéro de l\'appelant"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Partage de connexion via USB"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Partage connexion impossible au-delà de <xliff:g id="MAXCONNECTION">%1$d</xliff:g> appareils."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Le partage connexion avec <xliff:g id="DEVICE_NAME">%1$s</xliff:g> va être annulé."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Partage connexion Ethernet"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Partager la connexion Internet du téléphone via un câble Ethernet USB"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Partager la connexion Internet du téléphone via Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Utilisez un point d\'accès et le partage de connexion pour fournir un accès à Internet à d\'autres appareils via votre connexion de données mobiles. Les applications peuvent également créer un point d\'accès pour partager du contenu avec des appareils à proximité."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Utilisez un point d\'accès et le partage de connexion pour fournir un accès à Internet à d\'autres appareils via votre Wi-Fi ou votre connexion de données mobiles. Les applications peuvent également créer un point d\'accès pour partager du contenu avec des appareils à proximité."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Aide"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Préférences pour les sous-titres"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Agrandissement"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Zone à agrandir"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Activer l\'agrandissement"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Sélectionnez la ou les zones de l\'écran que vous souhaitez pouvoir agrandir"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Tout l\'écran"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Partie de l\'écran"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Tout ou partie de l\'écran"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Agrandir tout l\'écran"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Agrandir une partie de l\'écran"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Passer au bouton Accessibilité ?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Si vous appuyez trois fois pour agrandir une partie de l\'écran, la saisie et d\'autres actions pourront être retardées.\n\nVoulez-vous utiliser le bouton Accessibilité pour agrandir ?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Passer au bouton Accessibilité"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Continuer à appuyer trois fois pour agrandir"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Paramètres d\'agrandissement"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Agrandir en appuyant trois fois"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Agrandir avec un raccourci"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Bouton Marche/Arrêt pour raccrocher"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Grand curseur de souris"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Supprimer les animations"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Audio mono"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Combiner les chaînes lors de la lecture audio"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Balance audio"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Gauche"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Droite"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Audio mono"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Combiner les chaînes lors de la lecture audio"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Balance audio"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Gauche"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Droite"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Par défaut"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 secondes"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 secondes"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Vibreur des notifications"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Vibreur de la sonnerie"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Retour tactile"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Utiliser <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Ouvrir la fonctionnalité <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Utiliser la correction des couleurs"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Afficher les sous-titres"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Pour les applications compatibles uniquement"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Utiliser <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Ouvrir <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Utiliser la correction des couleurs"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Afficher les sous-titres"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Pour les applications compatibles uniquement"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Style et taille des sous-titres"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Taille de la police : <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Autres options"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deutéranomalie"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomalie"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomalie"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Nuances de gris"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Rouge-vert"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Rouge-vert"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Bleu-jaune"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Restriction en arrière-plan"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Autoriser l\'application à s\'exécuter en arrière-plan"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Application non autorisée à s\'exécuter en arrière-plan"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"L\'utilisation en arrière-plan ne peut pas être restreinte"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"L\'utilisation en arrière-plan ne peut pas être restreinte"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Limiter l\'activité en arrière-plan ?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Si vous limitez l\'activité en arrière-plan d\'une application, cela peut provoquer son dysfonctionnement"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Cette appli n\'étant pas configurée pour optimiser batterie, vous ne pouvez pas la limiter.\n\nActivez optimisation batterie."</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Définir un programme"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Prolonger l\'autonomie de la batterie"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Désactiver quand la batterie est chargée"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"L\'économiseur de batterie se désactive lorsque votre téléphone atteint un niveau de charge de <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"L\'économiseur de batterie se désactive lorsque votre tablette atteint un niveau de charge de <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"L\'économiseur de batterie se désactive lorsque votre appareil atteint un niveau de charge de <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Désactiver l\'économiseur de batterie quand le téléphone est chargé à plus de <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Désactiver l\'économiseur de batterie quand la tablette est chargée à plus de <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Désactiver l\'économiseur de batterie quand l\'appareil est chargé à plus de <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Activer"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Réinitialiser"</string>
     <string name="tts_play" msgid="2945513377250757221">"Lecture"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Connectivité adaptative"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Prolonge l\'autonomie de la batterie et améliore les performances de l\'appareil en gérant automatiquement vos connexions réseau"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Stockage des identifiants"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Installer un certificat"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Installer les certificats depuis la mémoire de stockage"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Identifiants de l\'utilisateur"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Afficher et modifier les identifiants enregistrés"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Paramètres avancés"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Type de stockage"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Intégré au matériel"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Uniquement logiciel"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Les identifiants ne sont pas disponibles pour cet utilisateur."</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Installé pour le VPN et les applications"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Installé pour le Wi-Fi"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Paiement à un terminal"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Configurez une application de paiement. Il suffit ensuite d\'approcher l\'arrière de votre appareil de n\'importe quel terminal disposant du symbole Sans contact."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"OK"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Plus..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Plus…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Définir l\'application de paiement par défaut"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Modifier l\'application de paiement par défaut"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Application à utiliser au terminal de paiement sans contact : <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Toujours l\'utiliser pour les appels"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Sélectionnez carte SIM pour les données"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Sélectionnez une carte SIM pour les SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Changement de carte SIM en cours… Cela peut prendre jusqu\'à une minute."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Changement de carte SIM… Cela peut prendre jusqu\'à une minute."</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Appeler avec"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Sélectionnez une carte SIM"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"Carte SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"routine, planning, économiseur de batterie, économiseur d\'énergie, batterie, automatique, pourcentage"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, appel avancé, appel en 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"ajouter langue, ajouter une langue"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"taille du texte"</string>
     <string name="default_sound" msgid="6604374495015245195">"Son par défaut"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Volume des sonneries et notifications à <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Volume, vibreur, Ne pas déranger"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Sons de mise en route"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Sous-titres instantanés"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Sous-titres automatiques"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Aucune"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> horaire défini</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> horaires définis</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Aucune}=1{1 planification définie}one{# planification définie}other{# planifications définies}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Ne pas déranger"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Ne recevoir des notifications que des personnes et applications importantes"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limiter les interruptions"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Prioritaires uniquement"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Activé - <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Désactivé - <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Désactivé"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Activé"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Toujours demander"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Jusqu\'à la désactivation"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> heure</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> heures</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minute"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> horaire peut être activé automatiquement</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> horaires peuvent être activés automatiquement</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 heure}one{# heure}other{# heures}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minute}one{# minute}other{# minutes}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Désactivé}=1{Désactivé/1 planification peut être activée automatiquement}one{Désactivé/# planification peut être activée automatiquement}other{Désactivé/# planifications peuvent être activées automatiquement}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Ce qui peut interrompre le mode Ne pas déranger"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Personnes"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Applications"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Définir automatiquement les notifications à faible priorité sur Discret"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Classement intelligent des notifications"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Classer automatiquement les notifications par pertinence"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Commentaires sur les notifications intelligentes"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Indiquer les ajustements apportés aux notifications et afficher l\'option pour fournir des commentaires au système"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Actions et réponses suggérées"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Afficher automatiquement les actions et réponses suggérées"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Afficher les notifications récentes et répétées"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Accès au mode \"Ne pas déranger\""</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Autoriser le mode Ne pas déranger"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Aucune demande d\'accès \"Ne pas déranger\" n\'a été envoyée par les applications installées."</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Chargement des applications en cours…"</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Chargement des applications…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"À votre demande, Android bloque l\'affichage des notifications de cette application sur cet appareil"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"À votre demande, Android bloque l\'affichage de cette catégorie de notifications sur cet appareil"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"À votre demande, Android bloque l\'affichage de ce groupe de notifications sur cet appareil"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Toutes les conversations"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Conversations prioritaires"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Aucune"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> conversation</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> conversations</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Aucune"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Aucune}=1{1 conversation}one{# conversation}other{# conversations}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Personnes qui peuvent interrompre le mode Ne pas déranger"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Appels"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Appels"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Pour que le téléphone sonne lorsque vous recevez un appel autorisé, assurez-vous d\'avoir activé la sonnerie"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Les appels entrants sont bloqués pendant la plage horaire \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\". Vous pouvez ajuster les paramètres pour que vos proches ou d\'autres contacts puissent quand même vous joindre."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Contacts favoris"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one"><xliff:g id="NUM_PEOPLE">%d</xliff:g> autre</item>
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> autres</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Aucun"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Aucun}=1{{contact_1}}=2{{contact_1} et {contact_2}}=3{{contact_1}, {contact_2} et {contact_3}}one{{contact_1}, {contact_2} et # autre contact favori}other{{contact_1}, {contact_2} et # autres contacts favoris}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Messages"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"messages"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Messages"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Les messages entrants sont bloqués pour \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\". Vous pouvez ajuster les paramètres pour que vos proches ou d\'autres contacts puissent quand même vous joindre."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Vous recevez tous les messages"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Vous recevez tous les appels"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Aucun"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> contact</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> contacts</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Aucun}=1{1 contact}one{# contact}other{# contacts}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Tout le monde"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Contacts"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Contacts favoris"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Toutes les notifications"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Certaines notifications"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Les personnes sélectionnées peuvent vous contacter, même si vous n\'autorisez pas les applications à interrompre le mode Ne pas déranger"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one"><xliff:g id="APP_NAMES">%s</xliff:g> peut interrompre le mode Ne pas déranger</item>
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> peuvent interrompre le mode Ne pas déranger</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> autre(s)"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Aucune application ne peut interrompre le mode Ne pas déranger}=1{{app_1} peut interrompre le mode Ne pas déranger}=2{{app_1} et {app_2} peuvent interrompre le mode Ne pas déranger}=3{{app_1}, {app_2} et {app_3} peuvent interrompre le mode Ne pas déranger}one{{app_1}, {app_2} et # autre application peuvent interrompre le mode Ne pas déranger}other{{app_1}, {app_2} et # autres applications peuvent interrompre le mode Ne pas déranger}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Applications"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Toutes les notifications"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Certaines notifications"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Notifications qui peuvent interrompre le mode Ne pas déranger"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Autoriser toutes les notifications"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> peut interrompre le mode Ne pas déranger</item>
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> peuvent interrompre le mode Ne pas déranger</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Rien ne peut interrompre le mode Ne pas déranger"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> autre(s)"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Rien ne peut interrompre le mode Ne pas déranger}=1{{sound_category_1} peut interrompre le mode Ne pas déranger}=2{{sound_category_1} et {sound_category_2} peuvent interrompre le mode Ne pas déranger}=3{{sound_category_1}, {sound_category_2} et {sound_category_3} peuvent interrompre le mode Ne pas déranger}one{{sound_category_1}, {sound_category_2} et # autre son peuvent interrompre le mode Ne pas déranger}other{{sound_category_1}, {sound_category_2} et # autres sons peuvent interrompre le mode Ne pas déranger}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Rien ne peut interrompre le mode Ne pas déranger"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Personne ne peut interrompre le mode Ne pas déranger"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Certaines personnes peuvent interrompre le mode Ne pas déranger"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Toutes les personnes peuvent interrompre le mode Ne pas déranger"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB contrôlé par"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Appareil connecté"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Cet appareil"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Changement…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Changement…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Échec du changement"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Recharge de l\'appareil"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Recharge de l\'appareil connecté"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Afficher les détails"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Économiseur de données"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Données sans restrictions"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Les données en arrière-plan sont désactivées."</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Les données en arrière-plan sont désactivées"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Activé"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Désactivé"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Utiliser l\'économiseur de données"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Si l\'appareil est verrouillé, empêcher la saisie des réponses ou de texte dans les notifications"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Correcteur par défaut"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Sélectionner le correcteur"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Utiliser le correcteur orthographique"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Utiliser le correcteur orthographique"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Non sélectionné"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(aucun)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">" : "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Pour libérer de l\'espace de stockage, le gestionnaire d\'espace de stockage supprime des photos et des vidéos sauvegardées sur votre appareil."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Supprimer des photos et des vidéos"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Gestionnaire d\'espace de stockage"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Utiliser le gestionnaire d\'espace de stockage"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Utiliser le gestionnaire d\'espace de stockage"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automatique"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Manuels"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Libérer de l\'espace maintenant"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Appuyer deux fois sur le téléphone pour le consulter"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Appuyez deux fois sur la tablette pour la consulter"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Appuyez deux fois sur l\'appareil pour le consulter"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Balayer pour notifications"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Balayez l\'écran vers le bas pour afficher vos notifications"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Mode une main"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Utiliser le mode une main"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Quitter le mode lors du changement d\'applications"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Délai inactivité"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 secondes"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 secondes"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 secondes"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"accessibilité"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Pour afficher l\'heure, les notifications et d\'autres informations, appuyez deux fois sur l\'écran."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Saisir le téléphone pour le consulter"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Saisir la tablette pour la consulter"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Appuyer pour vérifier la tablette"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Appuyer pour vérifier l\'appareil"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Pour afficher l\'heure, les notifications et d\'autres informations, appuyez sur l\'écran."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Bouton d\'appel d\'urgence"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Appelez les services d\'urgence en appuyant rapidement cinq fois sur le bouton Marche/Arrêt."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Son d\'avertissement"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Alerter avant de démarrer les actions"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Contacts à joindre en cas d\'urgence"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Balayer le lecteur d\'empreinte digitale pour voir les notifications"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Balayer lecteur empreinte"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Pour consulter vos notifications, passez votre doigt de haut en bas sur le lecteur d\'empreinte digitale à l\'arrière du téléphone."</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Activer pour toutes les applications"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Sélectionner un pilote graphique"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Par défaut"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Pilote de jeu"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Pilote de jeu"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Pilote pour les développeurs"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Pilote graphique du système"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Réseaux introuvables. Veuillez réessayer."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(interdit)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Pas de carte SIM"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Aucune carte SIM"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Aucune information"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"SIM requise pour la connexion"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"SIM <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> requise pour la connexion"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Mode réseau préféré : WCDMA de préférence"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Mode réseau préféré : GSM uniquement"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Mode réseau préféré : WCDMA uniquement"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Données mobiles"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Accéder aux données via le réseau mobile"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Le téléphone basculera automatiquement sur cet opérateur lorsqu\'il sera à portée"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Aucune carte SIM disponible"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Préférences pour les appels"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Préférences pour les SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Toujours demander"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Autoriser superpositions d\'écran dans paramètres"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Autoriser les applications pouvant se superposer à d\'autres à se superposer aux écrans de paramètres"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Multimédia"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Masquer le lecteur à la fin de la session multimédia"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Le lecteur vous permet de reprendre une session depuis la fenêtre de configuration rapide une fois celle-ci développée."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Lecteur multimédia dans la fenêtre de configuration rapide"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Afficher le lecteur multimédia pendant une période prolongée pour reprendre la lecture facilement"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Masquer le lecteur"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Afficher le lecteur"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Aucun lecteur disponible"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Applications autorisées"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"Multimédia"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Le Bluetooth sera activé"</string>
 </resources>
diff --git a/res/values-gl/arrays.xml b/res/values-gl/arrays.xml
index 7aa91b8..8db0ce1 100644
--- a/res/values-gl/arrays.xml
+++ b/res/values-gl/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Medio"</item>
     <item msgid="6740026006576843477">"Longo"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Curto"</item>
+    <item msgid="7397961711906421599">"Medio"</item>
+    <item msgid="4079132024502041928">"Longo"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Predeterminado"</item>
     <item msgid="4234707448428002595">"Sans Serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA e LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Só TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Global"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index f6888bb..193b76c 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Mostrar info do perfil na pantalla de bloqueo"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Contas"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Localización"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Usar a localización"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Usar localización"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Desactivada"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">Opción activada: <xliff:g id="COUNT_1">%1$d</xliff:g> aplicacións teñen acceso á localización</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Utilizar a autenticación facial"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Comezar"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Se o desbloqueo facial da accesibilidade está desactivado, é posible que algúns pasos da configuración non funcionen ben con TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Atrás"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Continuar"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Usar axustes de accesibilidade"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="one">Debe conter menos de <xliff:g id="NUMBER_0">%d</xliff:g> díxito</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"O administrador de dispositivos non permite o uso dun PIN recente"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"O teu administrador de TI bloqueou os PIN comúns. Proba cun PIN diferente."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Non pode conter un carácter non válido"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Debe conter polo menos unha letra"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Debe conter polo menos un díxito"</string>
@@ -653,7 +655,6 @@
       <item quantity="one">Debe conter polo menos 1 carácter que non sexa un número</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"O administrador de dispositivos non permite o uso dun contrasinal recente"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"O teu administrador de TI bloqueou os contrasinais comúns. Proba cun contrasinal diferente."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Non se permite unha secuencia de díxitos ascendente, descendente nin repetida"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Confirmar"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Cancelar"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wifi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Activar a wifi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wifi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Usar rede wifi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Usar wifi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Configuración da wifi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wifi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Configura e xestiona puntos de acceso sen fíos"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Centra o código QR que aparece debaixo para establecer conexión con “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Conéctate á wifi escaneando un código QR"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Compartir wifi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Escanea este código QR para conectarte a “<xliff:g id="SSID">%1$s</xliff:g>” e compartir o contrasinal"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Escanea este código QR con outro dispositivo para conectarte á rede <xliff:g id="SSID">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Escanea este código QR para conectarte a “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Téntao de novo. Se o problema continúa, contacta co fabricante do dispositivo"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Produciuse un erro"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Contrasinal da rede wifi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Contrasinal da zona wifi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Conectar automaticamente"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Permite que o teléfono se conecte automaticamente a esta rede cando estea preto dela"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Permite que a tableta se conecte automaticamente a esta rede cando estea preto dela"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Permite que o dispositivo se conecte a esta rede cando estea dentro da súa zona de cobertura"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Engadir dispositivo"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Utiliza un código QR para engadir un dispositivo a esta rede"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"O formato do código QR non é válido"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Utilizar certificados do sistema"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Non fornecer"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Non validar"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Non se especificou ningún certificado. A túa conexión non será privada."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"O nome da rede é demasiado longo."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Debe especificarse un dominio."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Necesítase un certificado."</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Conectar"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"A wifi está activada"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Conectácheste á rede <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Conectando con <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Conectando…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Erro ao conectar á rede"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Estás fóra da zona de cobertura da rede"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"A aplicación está compartindo contido. Para compartir a conexión a Internet, desactiva a zona wifi e volve activala"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Non hai ningún contrasinal definido"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Nome da zona wifi"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Activando a zona wifi <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Activando <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Outros dispositivos poden conectarse á zona wifi <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Contrasinal da zona wifi"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Banda do punto de acceso"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Incrementa automaticamente a frecuencia de actualización de 60 a 90 Hz en determinados tipos de contido. Aumenta o uso da batería."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Forzar taxa de actualización de 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"A taxa de actualización máis alta para mellorar a resposta aos toques e a calidade das animacións. Aumenta o uso da batería."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Atención á pantalla"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Activado/A pantalla non se apagará se miras para ela"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Versión de Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Actualización de seguranza de Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Modelo"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Modelo: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Modelo e hardware"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Versión de hardware"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ID de equipamento"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Restableceuse a configuración da rede"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Non se puideron borrar as SIM"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"As SIM descargadas non se poden borrar debido a un erro.\n\nReinicia o dispositivo e téntao de novo."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Borrar todos os datos (restablecemento de fábrica)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Borrar todos os datos"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Con esta acción borraranse todos os datos do "<b>"almacenamento interno"</b>" da túa tableta, entre os que se inclúen:\n\n"<li>"A túa Conta de Google"</li>\n<li>"Os datos e a configuración do sistema e das aplicacións"</li>\n<li>"As aplicacións descargadas"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Con esta acción borraranse todos os datos do "<b>"almacenamento interno"</b>" do teléfono, entre os que se inclúen:\n\n"<li>"A túa Conta de Google"</li>\n<li>"Os datos e a configuración do sistema e das aplicacións"</li>\n<li>"As aplicacións descargadas"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Actualmente tes sesión iniciada nas seguintes contas:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Hai outros usuarios presentes neste dispositivo.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Música"</li>\n<li>"Fotos"</li>\n<li>"Outros datos do usuario"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Con esta acción non se cancelará o teu plan de servizos móbiles."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Para borrar música, imaxes e outros datos do usuario, é necesario borrar o "<b>"almacenamento USB"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Para borrar música, imaxes e outros datos do usuario, é necesario borrar a "<b>"tarxeta SD"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Borrar todos os datos (restablecemento da configuración de fábrica)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Borrar todos os datos"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Con esta acción borraranse todos os datos do "<b>"almacenamento interno"</b>" da túa tableta, entre os que se inclúen:\n\n"<li>"A túa Conta de Google"</li>\n<li>"Os datos e a configuración do sistema e das aplicacións"</li>\n<li>"As aplicacións descargadas"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Con esta acción borraranse todos os datos do "<b>"almacenamento interno"</b>" do teléfono, entre os que se inclúen:\n\n"<li>"A túa Conta de Google"</li>\n<li>"Os datos e a configuración do sistema e das aplicacións"</li>\n<li>"As aplicacións descargadas"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Actualmente tes sesión iniciada nas seguintes contas:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Hai outros usuarios presentes neste dispositivo.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Música"</li>\n<li>"Fotos"</li>\n<li>"Outros datos do usuario"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Con esta acción non se cancelará o teu plan de servizos móbiles."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Para borrar música, imaxes e outros datos do usuario, é necesario borrar o "<b>"almacenamento USB"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Para borrar música, imaxes e outros datos do usuario, é necesario borrar a "<b>"tarxeta SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Borrar almacenamento USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Borrar tarxeta SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Borra todos os datos do almacenamento USB interno, como a música ou as fotos"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Borra todos os datos da tarxeta SD, como a música ou as fotos"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Borrar todos os datos"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Borrar todos os datos"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Eliminaranse as aplicacións descargadas e a túa información persoal. Non se pode desfacer esta acción."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Eliminarase toda a túa información persoal, entre a que se inclúen as aplicacións e as SIM descargadas. Non se pode desfacer esta acción."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Borrar todo"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Non se levou a cabo ningún restablecemento debido a que o servizo de borrado do sistema non está dispoñible."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Queres borrar todos os datos?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"O restablecemento de fábrica non está dispoñible para este usuario"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Borrando"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Agarda..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Borrar todos os datos"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Borrar todos os datos"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Eliminaranse as aplicacións descargadas e a túa información persoal. Non se pode desfacer esta acción."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Eliminarase toda a túa información persoal, entre a que se inclúen as aplicacións e as SIM descargadas. Non se pode desfacer esta acción."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Queres borrar todos os datos?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"O restablecemento da configuración de fábrica non está dispoñible para este usuario"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Borrando"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Agarda…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Configuración de chamada"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Configura o correo de voz, o desvío de chamadas, a chamada en espera e o identificador de chamada"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Conexión compart. por USB"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Non se pode compartir a conexión con máis de <xliff:g id="MAXCONNECTION">%1$d</xliff:g> dispositivos"</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Desactivarase a conexión compartida de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ethernet compartida"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Comparte a conexión a Internet do teléfono por Ethernet USB"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Comparte a conexión a Internet do teléfono por Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Utiliza a zona wifi e a conexión compartida para ofrecer acceso a Internet a outros dispositivos mediante a túa conexión de datos móbiles. As aplicacións tamén poden crear unha zona wifi para compartir contido cos dispositivos que están cerca."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Utiliza a zona wifi e a conexión compartida para ofrecer acceso a Internet a outros dispositivos mediante a túa wifi ou a túa conexión de datos móbiles. As aplicacións tamén poden crear unha zona wifi para compartir contido cos dispositivos que están cerca."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Axuda"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Preferencias dos subtítulos"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Ampliación"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Área de ampliación"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Activación da ampliación"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Escolle as áreas de ampliación que queres usar para ampliar a pantalla"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Pantalla completa"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Parte da pantalla"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Pantalla completa e parte da pantalla"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Ampliar a pantalla completa"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Ampliar parte da pantalla"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Queres cambiar ao botón de accesibilidade?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Cando se toca tres veces una parte da pantalla para ampliala, a escritura e outras accións funcionan con atraso.\n\nQueres pasar a usar o botón de accesibilidade para ampliar a pantalla?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Cambiar ao botón de accesibilidade"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Manter tres toques para ampliar"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Configuración da ampliación"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Ampliar ao tocar tres veces"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Ampliar con atallo"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Botón de acendido para colgar"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Punteiro do rato grande"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Eliminar animacións"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Audio en mono"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Combina canles ao reproducir audio"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Balance do audio"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Esquerda"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Dereita"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Audio en mono"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Combinar canles ao reproducir audio"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Balance do audio"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Esquerda"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Dereita"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Predeterminado"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 segundos"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 segundos"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Vibración das notificacións"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Vibración do ton"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Reacción aos toques"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Utilizar <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Abrir <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Usar corrección da cor"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Mostrar subtítulos"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Só para aplicacións compatibles"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Utilizar <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Abrir <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Usar corrección da cor"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Mostrar subtítulos"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Só para aplicacións compatibles"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Tamaño e estilo dos subtítulos"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Tamaño do texto: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Máis opcións"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomalía"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomalía"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomalía"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Escala de grises"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Vermello-verde"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Vermello-verde"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Azul-amarelo"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Restrición do uso en segundo plano"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Permite que a aplicación se execute en segundo plano"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Non se permite a execución da aplicación en segundo plano"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Non se pode restrinxir o uso en segundo plano"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Non se pode restrinxir o uso en segundo plano"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Queres limitar a actividade en segundo plano?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Si limitas a actividade en segundo plano para unha aplicación, é posible que non funcione correctamente"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Non podes limitar a aplicación porque non se configurou para optimizar a batería.\n\nPrimeiro activa a optimización da batería."</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Establecer unha planificación"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Aumenta a duración da batería"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Desactivar cando a batería estea cargada"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"A función Aforro de batería desactívase cando o nivel de batería do teu teléfono está ao <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"A función Aforro de batería desactívase cando o nivel de batería da túa tableta sexa o <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"A función Aforro de batería desactívase cando o nivel de batería do teu dispositivo sexa o <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"A función Aforro de batería desactívase cando a carga do teléfono é superior ao <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"A función Aforro de batería desactívase cando a carga da tableta é superior ao <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"A función Aforro de batería desactívase cando a carga do dispositivo é superior ao <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Activar"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Restablecer"</string>
     <string name="tts_play" msgid="2945513377250757221">"Reproducir"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Conectividade intelixente"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Aumenta a duración da batería e mellora o rendemento do dispositivo ao xestionar automaticamente as conexións de rede"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Almacenamento de credenciais"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Instalar un certificado"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Instala certificados desde o almacenamento"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Credenciais do usuario"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Mostra e modifica as credenciais almacenadas"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Configuración avanzada"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Tipo de almacenamento"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Almacenado en hardware"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Só software"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"As credenciais non están dispoñibles para este usuario"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Instalada para a VPN e as aplicacións"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Instalada para a wifi"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Pago no terminal"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Configura unha aplicación de pago. A continuación, coloca a parte traseira do teu teléfono sobre calquera terminal que teña o símbolo de pago sen contacto."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Entendido"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Máis..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Máis…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Define a aplicación de pagos predeterminada"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Actualiza a aplicación de pagos predeterminada"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Nos terminais sen contacto, pagar con <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Usar sempre para as chamadas"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Seleccionar unha SIM para datos"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Seleccionar unha SIM para as SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Cambiando SIM de datos. Este proceso pode tardar ata un minuto..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Cambiando SIM de datos. Este proceso pode tardar ata un minuto…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Chamar con"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Seleccionar unha tarxeta SIM"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"rutina, programación, aforro de batería, aforro de enerxía, batería, automático, porcentaxe"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"VoLTE, chamadas avanzadas, chamadas 4G"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"engadir idioma, engadir un idioma"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"tamaño do texto"</string>
     <string name="default_sound" msgid="6604374495015245195">"Son predeterminado"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Volume de notificacións e son ao <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Volume, vibración, Non molestar"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Sons de acendido"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Subtítulos instantáneos"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Crea subtítulos automáticos"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Ningunha"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other">Definíronse <xliff:g id="ON_COUNT">%d</xliff:g> planificacións</item>
-      <item quantity="one">Definiuse 1 planificación</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Ningunha planificación}=1{Definiuse 1 planificación}other{Definíronse # planificacións}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Non molestar"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Só se reciben notificacións de aplicacións e persoas importantes"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limitar as interrupcións"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Só prioridade"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Activado/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Desactivado/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Desactivado"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Activado"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Pregunta sempre"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Ata a desactivación"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> horas</item>
-      <item quantity="one">1 hora</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minutos"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> planificacións poden activarse automaticamente</item>
-      <item quantity="one">1 planificación pode activarse automaticamente</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 hora}other{# horas}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minuto}other{# minutos}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Desactivado}=1{Desactivado: 1 planificación pode activarse automaticamente}other{Desactivado: # planificacións poden activarse automaticamente}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Que pode interromper o modo Non molestar?"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Persoas"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Aplicacións"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Define automaticamente como discretas as notificacións de prioridade baixa"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Clasificación automática das notificacións"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Clasifica as notificacións automaticamente por relevancia"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Comentarios sobre notificacións intelixentes"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Indica axustes realizados nas notificacións e mostra a opción de enviar comentarios ao sistema"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Accións suxeridas e respostas"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Mostra automaticamente accións suxeridas e respostas"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Mostra as notificacións recentes e as adiadas"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Acceso a Non molestar"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Permitir modo Non molestar"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Ningunha aplicación instalada solicitou acceso en modo Non molestar"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Cargando aplicacións..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Cargando aplicacións…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Segundo solicitaches, Android bloquea a visualización de notificacións desta aplicación neste dispositivo."</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Segundo solicitaches, Android bloquea a visualización desta categoría de notificacións neste dispositivo."</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Segundo solicitaches, Android bloquea a visualización deste grupo de notificacións neste dispositivo."</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Todas as conversas"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Conversas prioritarias"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Ningunha"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> conversas</item>
-      <item quantity="one">1 conversa</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Ningunha"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Ningunha conversa}=1{1 conversa}other{# conversas}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Quen pode interromper"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Chamadas"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Chamadas"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Para asegurarte de que soen as chamadas permitidas, comproba que o dispositivo teña activado o son"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"As chamadas entrantes para \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" están bloqueadas. Podes axustar a configuración para permitir que os amigos, os familiares ou outros contactos se comuniquen contigo."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Contactos marcados con estrela"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> máis</item>
-      <item quantity="one">1 máis</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Ningún"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Ningún contacto}=1{{contact_1}}=2{{contact_1} e {contact_2}}=3{{contact_1}, {contact_2} e {contact_3}}other{{contact_1}, {contact_2} e # máis}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Mensaxes"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"mensaxes"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Mensaxes"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"As mensaxes entrantes para \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" están bloqueadas. Podes axustar a configuración para permitir que os amigos, os familiares ou outros contactos se comuniquen contigo."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Podes recibir todas as mensaxes"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Podes recibir todas as chamadas"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Ningún"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> contactos</item>
-      <item quantity="one">1 contacto</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Ningún contacto}=1{1 contacto}other{# contactos}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Calquera"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Contactos"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Contactos marcados con estrela"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Todas as notificacións"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Algunhas notificacións"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"As persoas seleccionadas seguirán podendo contactar contigo aínda que non permitas que as aplicacións te interrompan"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> teñen permiso para interromper o modo Non molestar</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> ten permiso para interromper o modo Non molestar</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> máis"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Ningunha aplicación pode interromper o modo Non molestar}=1{{app_1} pode interromper o modo Non molestar}=2{{app_1} e {app_2} poden interromper o modo Non molestar}=3{{app_1}, {app_2} e {app_3} poden interromper o modo Non molestar}other{{app_1}, {app_2} e # aplicacións máis poden interromper o modo Non molestar}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Aplicacións"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Todas as notificacións"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Algunhas notificacións"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Notificacións que poden interromper"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Permitir todas as notificacións"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> teñen permiso para interromper o modo Non molestar</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> ten permiso para interromper o modo Non molestar</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Nada pode interromper o modo Non molestar"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> máis"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Nada pode interromper o modo Non molestar}=1{{sound_category_1} pode interromper o modo Non molestar}=2{{sound_category_1} e {sound_category_2} poden interromper o modo Non molestar}=3{{sound_category_1}, {sound_category_2} e {sound_category_3} poden interromper o modo Non molestar}other{{sound_category_1}, {sound_category_2} e # sons máis poden interromper o modo Non molestar}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Nada pode interromper o modo Non molestar"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Ninguén pode interromper o modo Non molestar"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Algunhas persoas poden interromper o modo Non molestar"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Todas as persoas poden interromper o modo Non molestar"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB controlado por"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Dispositivo conectado"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Este dispositivo"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Cambiando…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Cambiando…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Non se puido facer o cambio"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Cargando este dispositivo"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Cargando o dispositivo conectado"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Ver detalles"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Aforro de datos"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Datos sen restricións"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Desactiváronse os datos en segundo plano"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Desactiváronse os datos en segundo plano"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Activado"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Desactivado"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Usar Aforro de datos"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Se o dispositivo está bloqueado, impide escribir respostas ou outro texto nas notificacións"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Corrector predeterminado"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Escoller corrector ortográfico"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Utilizar o corrector ortográfico"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Usar corrector ortográfico"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Non seleccionado"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(ningún)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Para axudar a liberar espazo de almacenamento, o xestor de almacenamento elimina as fotos e vídeos con copia de seguranza do teu dispositivo."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Eliminar fotos e vídeos"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Xestor de almacenamento"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Usar xestor de almacenamento"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Usar xestor de almacenamento"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automático"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Liberar espazo agora"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Dobre toque no teléfono para consultalo"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Tocar dúas veces para consultar a tableta"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Tocar dúas veces para consultar o dispositivo"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Pasar dedo para notific."</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Pasa o dedo cara abaixo no bordo inferior da pantalla para ver as notificacións"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Modo dunha soa man"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Usar modo dunha soa man"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Saír ao cambiar de aplicación"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Tempo de espera"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 segundos"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 segundos"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 segundos"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"fácil alcance"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Para consultar a hora, as notificacións e outra información, toca a pantalla dúas veces."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Levantar o teléfono para consultalo"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Levantar a tableta para consultala"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Toca para consultar a tableta"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Tocar para consultar o dispositivo"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Para consultar a hora, as notificacións e outra información, toca a pantalla."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Botón de pánico"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Inicia as accións SOS de emerxencia premendo rapidamente o botón de acendido 5 veces."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Son de advertencia"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Mostrar unha alerta antes de iniciar as accións"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Contactos de emerxencia"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Pasar o dedo polo sensor de impresións dixitais para ver as notificacións"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Pasar dedo polo sensor"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Para consultar as notificacións, pasa o dedo cara abaixo sobre o sensor de impresión dixital situado na parte traseira do teléfono."</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Activar para todas as aplicacións"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Seleccionar controlador de gráficos"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Predeterminado"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Controlador de xogos"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Controlador de videoxogos"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Controlador do programador"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Controlador de gráficos do sistema"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Non se puido encontrar ningunha rede. Téntao de novo."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(rede non-permitida)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Non hai ningunha tarxeta SIM"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Sen SIM"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Ningunha"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Require unha SIM para conectarse"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Require unha SIM de <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> para conectarse"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Modo de rede preferido: WCDMA preferido"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Modo de rede preferido: só GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Modo de rede preferido: só WCDMA"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Datos móbiles"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Accede aos datos cunha rede de telefonía móbil"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"O teléfono cambiará automaticamente a este operador cando esteas dentro da súa zona de cobertura"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Non hai ningunha tarxeta SIM dispoñible"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Preferencia para chamadas"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Preferencia para SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Preguntar sempre"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Permitir superposic. na pantalla en Configuración"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Permite que as aplicacións que se poden mostrar sobre outras se superpoñan nas pantallas da aplicación Configuración"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Contido multimedia"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Oculta o reprodutor ao rematar a sesión multimedia"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"O reprodutor permíteche retomar unha sesión cando se desprega o panel Configuración rápida."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Reprodutor multimedia en Configuración rápida"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Mostra o reprodutor multimedia durante un período de tempo prolongado para retomar a reprodución facilmente"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Ocultar reprodutor"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Mostrar reprodutor"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Non hai reprodutores dispoñibles"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Aplicacións permitidas"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"contido multimedia"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Activarase o Bluetooth"</string>
 </resources>
diff --git a/res/values-gu/arrays.xml b/res/values-gu/arrays.xml
index f019fd5..1c2cd5c 100644
--- a/res/values-gu/arrays.xml
+++ b/res/values-gu/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"મધ્યમ"</item>
     <item msgid="6740026006576843477">"લાંબો"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"બસ દબાવીને છોડી દો"</item>
+    <item msgid="7397961711906421599">"દબાવો અને છોડો"</item>
+    <item msgid="4079132024502041928">"દવાબી રાખો"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"ડિફૉલ્ટ"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"વૈશ્વિક"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"માત્ર TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"વૈશ્વિક"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index a81a812..598ada4 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"લૉક સ્ક્રીન પર પ્રોફાઇલ માહિતી બતાવો"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"એકાઉન્ટ"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"સ્થાન"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"સ્થાનનો ઉપયોગ કરો"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"સ્થાનનો ઉપયોગ કરો"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"બંધ છે"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">ચાલુ છે - <xliff:g id="COUNT_1">%1$d</xliff:g> ઍપ સ્થાનનો ઍક્સેસ ધરાવે છે</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"પ્રમાણિત કરવા તમારા ચહેરાનો ઉપયોગ કરો"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"શરૂ કરો"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"જો ઍક્સેસિબિલિટી ફેસ અનલૉકની સુવિધા બંધ કરવામાં આવે, તો ટૉકબૅક વડે સેટઅપના અમુક પગલાં યોગ્ય રીતે કામ કરી શકશે નહીં."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"પાછા ફરો"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"સેટઅપ ચાલુ રાખો"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"ઍક્સેસિબિલિટી સેટઅપનો ઉપયોગ કરો"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="other"><xliff:g id="NUMBER_1">%d</xliff:g> કરતાં ઓછા અંક હોવા જરૂરી છે</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"ઉપકરણ વ્યવસ્થાપક તાજેતરનાં પિનનો ઉપયોગ કરવાની મંજૂરી આપતા નથી"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"સામાન્ય પિન તમારા IT વ્યવસ્થાપક દ્વારા બ્લૉક કરવામાં આવે છે. એક અલગ પિન અજમાવી જુઓ."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"આમાં અમાન્ય અક્ષરોનો સમાવેશ થઈ શકતો નથી"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"ઓછામાં ઓછો એક વર્ણ હોવો આવશ્યક છે"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"ઓછામાં ઓછો એક અંક હોવો આવશ્યક છે"</string>
@@ -653,7 +655,6 @@
       <item quantity="other">ઓછામાં ઓછા <xliff:g id="COUNT">%d</xliff:g> અક્ષર એવા હોવા જોઈએ કે જે સંખ્યા ન હોય</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"ઉપકરણ વ્યવસ્થાપક તાજેતરનાં પાસવર્ડનો ઉપયોગ કરવાની મંજૂરી આપતા નથી"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"સામાન્ય પાસવર્ડ તમારા IT વ્યવસ્થાપક દ્વારા બ્લૉક કરવામાં આવે છે. એક અલગ પાસવર્ડ અજમાવી જુઓ."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"અંકોના ચઢતા ક્રમની, ઉતરતા ક્રમની અથવા પુનરાવર્તિત અનુક્રમની મંજૂરી નથી"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"કન્ફર્મ કરો"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"રદ કરો"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"વાઇ-ફાઇ"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"વાઇ-ફાઇ ચાલુ કરો"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"વાઇ-ફાઇ"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"વાઇ-ફાઇનો ઉપયોગ કરો"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"વાઇ-ફાઇનો ઉપયોગ કરો"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"વાઇ-ફાઇ સેટિંગ્સ"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"વાઇ-ફાઇ"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"વાયરલેસ ઍક્સેસ બિંદુઓને સેટ અને સંચાલિત કરો"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"“<xliff:g id="SSID">%1$s</xliff:g>” સાથે કનેક્ટ કરવા માટે QR કોડને નીચેની બાજુએ વચ્ચે રાખો"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"QR કોડ સ્કૅન કરીને વાઇ-ફાઇ સાથે જોડાઓ"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"વાઇ-ફાઇ શેર કરો"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"“<xliff:g id="SSID">%1$s</xliff:g>” સાથે કનેક્ટ કરવા માટે આ QR કોડને સ્કૅન કરો અને પાસવર્ડ શેર કરો"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"“<xliff:g id="SSID">%1$s</xliff:g>” સાથે જોડાવા માટે આ QR કોડને બીજા ડિવાઇસ વડે સ્કૅન કરો"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"“<xliff:g id="SSID">%1$s</xliff:g>” સાથે કનેક્ટ કરવા માટે આ QR કોડને સ્કૅન કરો"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"ફરી પ્રયાસ કરો. જો સમસ્યા ચાલુ રહે છે, તો ડિવાઇસ નિર્માતાનો સંપર્ક કરો"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"કંઈક ખોટું થયું હતું"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"વાઇ-ફાઇનો પાસવર્ડ: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"હૉટસ્પૉટનો પાસવર્ડ: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"ઑટોમૅટિક રીતે કનેક્ટ કરો"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"આ નેટવર્કની નજીક ફોનને ઑટોમૅટિક રીતે કનેક્ટ થવાની મંજૂરી આપો"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"આ નેટવર્કની નજીક ટૅબ્લેટને ઑટોમૅટિક રીતે કનેક્ટ થવાની મંજૂરી આપો"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"જ્યારે રેન્જમાં હોય, ત્યારે આ નેટવર્કના કનેક્શનની મંજૂરી આપો"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"ડિવાઇસ ઉમેરો"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"આ નેટવર્ક પર ડિવાઇસ ઉમેરવા માટે QR કોડનો ઉપયોગ કરો"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR કોડનું માન્ય ફોર્મેટ નથી"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"સિસ્ટમ પ્રમાણપત્રોનો ઉપયોગ કરો"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"પ્રદાન કરશો નહીં"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"માન્ય કરશો નહીં"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"કોઇ પ્રમાણપત્ર સ્પષ્ટ કરેલ નથી. તમારું કનેક્શન ખાનગી રહેશે નહીં."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"નેટવર્કનું નામ ખૂબ લાંબુ છે."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"ડોમેનનો ઉલ્લેખ કરવો આવશ્યક છે."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"પ્રમાણપત્ર જરૂરી છે."</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"કનેક્ટ કરો"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wifi ચાલુ કર્યું"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>થી કનેક્ટ થયા"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> સાથે કનેક્ટ કરી રહ્યાં છીએ"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"કનેક્ટ થઈ રહ્યું છે…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"નેટવર્ક સાથે કનેક્ટ કરવામાં નિષ્ફળ થયાં"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"નેટવર્ક રેન્જમાં નથી"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"ઍપ કન્ટેન્ટ શેર કરી રહી છે. ઇન્ટરનેટ કનેક્શન શેર કરવા માટે હૉટસ્પૉટને બંધ કરીને ફરી ચાલુ કરો"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"કોઈ પાસવર્ડ સેટ કરવામાં આવ્યો નથી"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"હૉટસ્પૉટનું નામ"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ચાલુ કરીએ છીએ..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ચાલુ કરી રહ્યાં છીએ…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> સાથે અન્ય ઉપકરણો પણ કનેક્ટ કરી શકાય છે"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"હૉટસ્પૉટનો પાસવર્ડ"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP બૅન્ડ"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"અમુક કન્ટેન્ટ માટે રિફ્રેશ થવાનો રેટ ઑટોમૅટિક રીતે 60થી વધારીને 90 Hz કરે છે. બૅટરીનો વપરાશ વધારે છે."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"90 Hz રિફ્રેશ રેટ ફરજિયાત બનાવો"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"સ્પર્શના પ્રતિભાવમાં સુધારણા અને ઍનિમેશનની ક્વૉલિટી માટે ઉચ્ચતમ રિફ્રેશ રેટ. આ સુવિધા બૅટરીનો વપરાશ વધારે છે."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"સ્ક્રીન અટેન્શન"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"ચાલુ / જો તમે સ્ક્રીન તરફ જોતા હો, તો તમારી સ્ક્રીન બંધ થશે નહીં"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android વર્ઝન"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android માટે સુરક્ષા અપડેટ"</string>
     <string name="model_info" msgid="8997566254717810904">"મોડલ"</string>
-    <string name="model_summary" msgid="2246651782442466213">"મૉડલ: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"મૉડલ અને હાર્ડવેર"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"હાર્ડવેર વર્ઝન"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"સાધન ID"</string>
@@ -1471,7 +1470,7 @@
     <string name="storage_internal_forget_confirm" msgid="5752634604952674123">"આ <xliff:g id="NAME">^1</xliff:g> પર સંગ્રહિત તમામ ઍપ્લિકેશનો, ફોટો અને ડેટા કાયમ માટે જતો રહેશે."</string>
     <string name="storage_detail_apps" msgid="5055911985540355324">"ઍપ્લિકેશનો"</string>
     <string name="storage_detail_images" msgid="6003883845718804371">"છબીઓ"</string>
-    <string name="storage_detail_videos" msgid="9079894412680404208">"વિડિઓઝ"</string>
+    <string name="storage_detail_videos" msgid="9079894412680404208">"વીડિયો"</string>
     <string name="storage_detail_audio" msgid="234272983148223114">"ઑડિયો"</string>
     <string name="storage_detail_cached" msgid="4066364341463331199">"કેશ્ડ ડેટા"</string>
     <string name="storage_detail_other" msgid="3821329310612285961">"અન્ય"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"નેટવર્ક સેટિંગ્સ ફરીથી સેટ કરવામાં આવી છે"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"સિમ કાઢી નાખી શકાતાં નથી"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"ડાઉનલોડ કરેલાં સિમ ભૂલને કારણે કાઢી નાખી શકાતાં નથી.\n\nતમારું ડિવાઇસ ફરી શરૂ કરો અને ફરી પ્રયાસ કરો."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"બધો ડેટા કાઢી નાખો (ફેક્ટરી રીસેટ)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"બધો ડેટા કાઢી નાખો (ફેક્ટરી રીસેટ)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"આ ક્રિયા તમારા ટૅબ્લેટના "<b>"આંતરિક સ્ટોરેજ"</b>"માંથી બધો ડેટા કાઢી નાખશે, જેમાં આનો સમાવેશ થાય છે:\n\n"<li>"તમારું Google એકાઉન્ટ"</li>\n<li>"સિસ્ટમ તેમજ ઍપ ડેટા અને સેટિંગ"</li>\n<li>"ડાઉનલોડ કરેલી ઍપ"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"આ ક્રિયા તમારા ફોનના "<b>"આંતરિક સ્ટોરેજ"</b>"માંથી બધો ડેટા કાઢી નાખશે, જેમાં આનો સમાવેશ થાય છે:\n\n"<li>"તમારું Google એકાઉન્ટ"</li>\n<li>"સિસ્ટમ તેમજ ઍપ ડેટા અને સેટિંગ"</li>\n<li>"ડાઉનલોડ કરેલી ઍપ"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"તમે હાલમાં નીચેના એકાઉન્ટ્સમાં સાઇન ઇન થયેલાં છો:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"આ ઉપકરણ પર અન્ય વપરાશકર્તા હાજર છે.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"સંગીત"</li>\n<li>"ફોટા"</li>\n<li>"અન્ય વપરાશકર્તા ડેટા"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"ઇ-સિમ"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"આનાથી તમારો મોબાઇલ સેવા પ્લાન રદ થશે"</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"સંગીત, ચિત્રો અને અન્ય વપરાશકર્તા ડેટા સાફ કરવા માટે, "<b>"USB સંગ્રહ"</b>"ને કાઢી નાખવાની જરૂર છે."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"સંગીત, ચિત્રો અને અન્ય વપરાશકર્તા ડેટા સાફ કરવા માટે, "<b>"SD કાર્ડ"</b>"ને કાઢી નાખવાની જરૂર છે."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"બધો ડેટા કાઢી નાખો (ફેક્ટરી રીસેટ)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"બધો ડેટા કાઢી નાખો (ફેક્ટરી રીસેટ)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"આ ક્રિયા તમારા ટૅબ્લેટના "<b>"આંતરિક સ્ટોરેજ"</b>"માંથી બધો ડેટા કાઢી નાખશે, જેમાં આનો સમાવેશ થાય છે:\n\n"<li>"તમારું Google એકાઉન્ટ"</li>\n<li>"સિસ્ટમ તેમજ ઍપ ડેટા અને સેટિંગ"</li>\n<li>"ડાઉનલોડ કરેલી ઍપ"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"આ ક્રિયા તમારા ફોનના "<b>"આંતરિક સ્ટોરેજ"</b>"માંથી બધો ડેટા કાઢી નાખશે, જેમાં આનો સમાવેશ થાય છે:\n\n"<li>"તમારું Google એકાઉન્ટ"</li>\n<li>"સિસ્ટમ તેમજ ઍપ ડેટા અને સેટિંગ"</li>\n<li>"ડાઉનલોડ કરેલી ઍપ"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"તમે અત્યારે નીચેના એકાઉન્ટમાં સાઇન ઇન થયેલા છો:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"આ ડિવાઇસ પર અન્ય વપરાશકર્તાઓ હાજર છે.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"મ્યુઝિક"</li>\n<li>"ફોટા"</li>\n<li>"અન્ય વપરાશકર્તા ડેટા"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"ઇ-સિમ"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"આનાથી તમારો મોબાઇલ સેવા પ્લાન રદ થશે નહીં."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"મ્યુઝિક, ફોટા અને અન્ય વપરાશકર્તા ડેટા સાફ કરવા માટે, "<b>"USB સ્ટોરેજ"</b>" કાઢી નાખવાની જરૂર છે."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"મ્યુઝિક, ફોટા અને અન્ય વપરાશકર્તા ડેટા સાફ કરવા માટે, "<b>"SD કાર્ડ"</b>" કાઢી નાખવાની જરૂર છે."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USB સ્ટોરેજ ભૂસી નાખો"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SD કાર્ડ કાઢી નાંખો"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"આંતરિક USB સંગ્રહમાંથી તમામ ડેટા કાઢી નાંખો, જેમ કે સંગીત અથવા ફોટો"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"SD કાર્ડ પરનો તમામ ડેટા કાઢી નાખો, જેમ કે સંગીત અથવા ફોટો"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"બધો ડેટા કાઢી નાખો"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"બધો ડેટા કાઢી નાખો"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"તમારી બધી વ્યક્તિગત માહિતી અને ડાઉનલોડ કરેલી ઍપ ડિલીટ કરવામાં આવશે. તમે આ ક્રિયા માટે કરેલો છેલ્લો ફેરફાર રદ કરી શકશો નહીં."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"ડાઉનલોડ કરેલી ઍપ અને સિમ સહિતની તમારી બધી વ્યક્તિગત માહિતી ડિલીટ કરવામાં આવશે. તમે આ ક્રિયા માટે કરેલો છેલ્લો ફેરફાર રદ કરી શકશો નહીં."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"દરેક વસ્તુ કાઢી નાંખો"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"કોઈ ફરીથી સેટ કરો કરવામાં આવ્યું નથી કારણ કે સિસ્ટમ સાફ સેવા ઉપલબ્ધ નથી."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"બધો ડેટા કાઢી નાખીએ?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"આ વપરાશકર્તા માટે ફેક્ટરી રીસેટ ઉપલબ્ધ નથી"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"કાઢી નાંખી રહ્યું છે"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"કૃપા કરીને રાહ જુઓ..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"બધો ડેટા કાઢી નાખો"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"બધો ડેટા કાઢી નાખો"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"તમારી બધી વ્યક્તિગત માહિતી અને ડાઉનલોડ કરેલી ઍપ ડિલીટ કરવામાં આવશે. તમે આ ક્રિયા માટે કરેલો છેલ્લો ફેરફાર રદ કરી શકશો નહીં."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"ડાઉનલોડ કરેલી ઍપ અને સિમ સહિતની તમારી બધી વ્યક્તિગત માહિતી ડિલીટ કરવામાં આવશે. તમે આ ક્રિયા માટે કરેલો છેલ્લો ફેરફાર રદ કરી શકશો નહીં."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"બધો ડેટા કાઢી નાખીએ?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"આ વપરાશકર્તા માટે ફેક્ટરી રીસેટ ઉપલબ્ધ નથી"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"કાઢી નાખી રહ્યાં છીએ"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"કૃપા કરીને રાહ જુઓ…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"કૉલ સેટિંગ"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"વૉઇસમેઇલ, કૉલ ફોરવર્ડિંગ, કૉલ પ્રતીક્ષા, કૉલર ID સેટ કરો"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB ટિથરિંગ"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> થી વધુ ઉપકરણો સાથે ટિથર કરી શકતાં નથી."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> અનટિથર થશે."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"ઇથરનેટ ટિથરિંગ"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"USB ઇથરનેટ મારફતે ફોનનું ઇન્ટરનેટ કનેક્શન શેર કરો"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"ઇથરનેટ મારફતે ફોનનું ઇન્ટરનેટ કનેક્શન શેર કરો"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"તમારા મોબાઇલ ડેટા કનેક્શન મારફતે અન્ય ઉપકરણોને ઇન્ટરનેટ પૂરું પાડવા માટે હૉટસ્પૉટ અને ટિથરિંગનો ઉપયોગ કરો. નજીકના ઉપકરણો સાથે કન્ટેન્ટ શેર કરવા માટે ઍપ પણ હૉટસ્પૉટ બનાવી શકે છે."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"તમારા વાઇ-ફાઇ અથવા મોબાઇલ ડેટા કનેક્શન મારફત અન્ય ડિવાઇસને ઇન્ટરનેટ પૂરું પાડવા માટે હૉટસ્પૉટ અને ઇન્ટરનેટ શેર કરવાની સુવિધાનો ઉપયોગ કરો. ઍપ નજીકનાં ડિવાઇસ સાથે કન્ટેન્ટ શેર કરવા માટે પણ હૉટસ્પૉટ બનાવી શકે છે."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"સહાય"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"કૅપ્શનની પસંદગીઓ"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"વિસ્તૃતીકરણ"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"વિસ્તૃતીકરણ ક્ષેત્ર"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"વિસ્તૃતીકરણ ચાલુ"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"સ્ક્રીનનો વિસ્તાર કરો, ત્યારે તમે ઉપયોગ કરવા માગો છો તે વિસ્તૃતીકરણ ક્ષેત્રને પસંદ કરો"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"પૂર્ણ સ્ક્રીન"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"સ્ક્રીનનો ભાગ"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"પૂર્ણ સ્ક્રીન અને સ્ક્રીનનો ભાગ"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"સંપૂર્ણ સ્ક્રીનનો વિસ્તાર કરો"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"સ્ક્રીનના ભાગનો વિસ્તાર કરો"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"શું ઍક્સેસિબિલિટી બટન પર સ્વિચ કરીએ?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"સ્ક્રીનના કોઈ ભાગને મોટો કરવા માટે ત્રણ વાર ટૅપનો ઉપયોગ કરવાથી ટાઇપિંગ અને અન્ય ક્રિયાઓ વિલંબિત થશે.\n\nશું તમે સ્ક્રીનના કોઈ ભાગને મોટો કરવા માટે, હજી પણ ઍક્સેસિબિલિટી બટનનો ઉપયોગ કરવા પર સ્વિચ કરવા માંગો છો?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"ઍક્સેસિબિલિટી બટન પર સ્વિચ કરો"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"મોટું કરવા માટે ત્રણ વખત ટૅપ કરવાનું ચાલુ રાખો"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"સ્ક્રીન મોટી કરવાનું સેટિંગ"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"ત્રણ-ટૅપ વડે વિસ્તૃત કરો"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"શૉર્ટકટ વડે વિસ્તૃત કરો"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"પાવર બટન કૉલને સમાપ્ત કરે છે"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"મોટું માઉસ પોઇન્ટર"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"ઍનિમેશન કાઢી નાખો"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"મૉનો ઑડિયો"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"ઑડિયો ચલાવતી વખતે ચૅનલ્સ ભેગી કરો"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"ઑડિયો બૅલેન્સ"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"ડાબે"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"જમણે"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"મૉનો ઑડિયો"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"ઑડિયો ચલાવતી વખતે ચૅનલ ભેગી કરો"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"ઑડિયો બૅલેન્સ"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"ડાબે"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"જમણે"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"ડિફૉલ્ટ"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 સેકન્ડ"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 સેકન્ડ"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"નોટિફિકેશન વાઇબ્રેશન"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"રિંગ વાઇબ્રેશન"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"પ્રતિસાદને ટચ કરો"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>નો ઉપયોગ કરો"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ખોલો"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"રંગ સુધારણાનો ઉપયોગ કરો"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"કૅપ્શન બતાવો"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"માત્ર સપોર્ટ કરતી ઍપ માટે"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>નો ઉપયોગ કરો"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ખોલો"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"રંગ સુધારણાનો ઉપયોગ કરો"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"કૅપ્શન બતાવો"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"માત્ર સપોર્ટ હોય તેવી ઍપ માટે"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"કૅપ્શનનું કદ અને શૈલી"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> ટેક્સ્ટનું કદ"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"વધુ વિકલ્પો"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"ડ્યૂટેરેનોમલી"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"પ્રોટેનોમલી"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"ટ્રાઇટેનોમલી"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"ગ્રેસ્કેલ"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"લાલ-લીલો"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"લાલ-લીલો"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"વાદળી-પીળો"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"બૅકગ્રાઉન્ડ પ્રતિબંધ"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"ઍપ્લિકેશનને પૃષ્ઠભૂમિમાં ચાલવાની મંજૂરી આપો"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"ઍપ્લિકેશનને પૃષ્ઠભૂમિમાં ચાલવાની મંજૂરી નથી"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"બૅકગ્રાઉન્ડ વપરાશને પ્રતિબંધિત કરી શકાય નહીં"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"બૅકગ્રાઉન્ડ વપરાશ પર પ્રતિબંધ મૂકી શકાય નહીં"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"બૅકગ્રાઉન્ડ પ્રવૃત્તિને મર્યાદિત કરીએ?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"જો તમે બૅકગ્રાઉન્ડ પ્રવૃત્તિને એક ઍપ માટે મર્યાદિત કરો છો, તો તે અયોગ્ય વર્તન કરી શકે છે"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"આ ઍપ બૅટરી ઑપ્ટિમાઇઝ કરવા સેટ નથી તેથી તમે તેને પ્રતિબંધિત કરી શકશો નહીં.\n\nએને પ્રતિબંધિત કરવા, પહેલાં બૅટરી ઑપ્ટિમાઇઝ કરવાનું ચાલુ કરો."</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"શેડ્યૂલ સેટ કરો"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"બૅટરી આવરદા વધારો"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"ચાર્જ થાય ત્યારે બંધ કરો"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"તમારો ફોન <xliff:g id="PERCENT">%1$s</xliff:g> પર હોય ત્યારે બૅટરી સેવર બંધ થાય છે"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"તમારું ટૅબ્લેટ <xliff:g id="PERCENT">%1$s</xliff:g> પર હોય ત્યારે બૅટરી સેવર બંધ થાય છે"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"તમારું ડિવાઇસ <xliff:g id="PERCENT">%1$s</xliff:g> પર હોય ત્યારે બૅટરી સેવર બંધ થાય છે"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"તમારો ફોન <xliff:g id="PERCENT">%1$s</xliff:g>થી વધારે ચાર્જ થાય ત્યારે બૅટરી સેવર બંધ થાય છે"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"તમારું ટૅબ્લેટ <xliff:g id="PERCENT">%1$s</xliff:g>થી વધારે ચાર્જ થાય ત્યારે બૅટરી સેવર બંધ થાય છે"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"તમારું ડિવાઇસ <xliff:g id="PERCENT">%1$s</xliff:g>થી વધારે ચાર્જ થાય ત્યારે બૅટરી સેવર બંધ થાય છે"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"ચાલુ કરો"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"ફરીથી સેટ કરો"</string>
     <string name="tts_play" msgid="2945513377250757221">"ચલાવો"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"એડૅપ્ટિવ કનેક્ટિવિટી"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"તમારા નેટવર્ક કનેક્શનને ઑટોમૅટિક રીતે મેનેજ કરીને બૅટરીની આવરદા વધારે છે અને ડિવાઇસનું કાર્યપ્રદર્શન બહેતર બનાવે છે"</string>
     <string name="credentials_title" msgid="7535942196886123656">"ઓળખપત્ર સ્ટોરેજ"</string>
     <string name="credentials_install" msgid="3933218407598415827">"પ્રમાણપત્ર ઇન્સ્ટૉલ કરો"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"સંગ્રહમાંથી પ્રમાણપત્રો ઇન્સ્ટોલ કરો"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"વપરાશકર્તા ઓળખપત્ર"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"સંગ્રહિત ઓળખપત્ર જુઓ અને સંશોધિત કરો"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"વિગતવાર"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"સંગ્રહ પ્રકાર"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"હાર્ડવેર-બેક્ડ"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"ફક્ત સોફ્ટવેર"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"આ વપરાશકર્તા માટે ઓળખપત્રો ઉપલબ્ધ નથી"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN અને ઍપ્લિકેશનો માટે ઇન્સ્ટૉલ કરેલ"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"વાઇ-ફાઇ માટે ઇન્સ્ટૉલ કરેલ"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"ટર્મિનલ પર ચુકવવું"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"ચુકવણી ઍપ્લિકેશન સેટ કરો. ત્યારબાદ તમારા ફોનની પાછળની ભાગને સંપર્કવિહીન પ્રતીક સાથેના કોઈપણ છેડાં પાસે પકડી રાખો."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"સમજાઈ ગયું"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"વધુ..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"વધુ…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"ડિફૉલ્ટ ચુકવણી ઍપ સેટ કરો"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"ડિફૉલ્ટ ચુકવણી ઍપ અપડેટ કરો"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"સંપર્ક રહિત ટર્મિનલ પર, <xliff:g id="APP">%1$s</xliff:g>થી ચુકવણી કરો"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"કૉલ્સ માટે આનો ઉપયોગ હંમેશાં કરો"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"ડેટા માટે એક સિમ પસંદ કરો"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"SMS માટે સિમ પસંદ કરો"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"ડેટા સિમ પર સ્વિચ થઈ રહ્યો છે, આમાં એક મિનિટ લાગી શકે છે..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"ડેટા સિમ પર સ્વિચ કરી રહ્યાં છીએ, આમાં એક મિનિટ જેટલો સમય લાગી શકે છે…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"આની સાથે કૉલ કરો"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"સિમ કાર્ડ પસંદ કરો"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"સિમ <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"રૂટિન, શેડ્યૂલ, બૅટરી સેવર, પાવર સેવર, બૅટરી, ઑટોમૅટિક, ટકા"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, વિગતવાર કૉલિંગ, 4g કૉલિંગ"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"ભાષા ઉમેરો, ભાષા ઉમેરો"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"ટેક્સ્ટનું કદ"</string>
     <string name="default_sound" msgid="6604374495015245195">"ડિફોલ્ટ ધ્વનિ"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"રિંગ અને નોટિફિકેશનનું વૉલ્યુમ <xliff:g id="PERCENTAGE">%1$s</xliff:g> છે"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"વૉલ્યૂમ, વાઇબ્રેશન, ખલેલ પાડશો નહીં"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"ચાલુ થવા પર વાગનાર ધ્વનિ"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"લાઇવ કૅપ્શન"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"મીડિયામાં કૅપ્શન આપમેળે ઉમેરો"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"કોઈ નહીં"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> શેડ્યૂલ સેટ કરવામાં આવ્યું</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> શેડ્યૂલ સેટ કરવામાં આવ્યા</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{એકપણ નહીં}=1{એક શેડ્યૂલ સેટ કરવામાં આવ્યું}one{# શેડ્યૂલ સેટ કરવામાં આવ્યું}other{# શેડ્યૂલ સેટ કરવામાં આવ્યા}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"ખલેલ પાડશો નહીં"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"ફક્ત મહત્વપૂર્ણ લોકો અને ઍપ દ્વારા નોટિફિકેશન મેળવો"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"વિક્ષેપો મર્યાદિત કરો"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"માત્ર પ્રાધાન્યતા"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"ચાલુ કરો / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"બંધ કરો / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"બંધ કરો"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"ચાલુ"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"દર વખતે પૂછો"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"તમે બંધ ન કરો ત્યાં સુધી"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> કલાક</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> કલાક</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> મિનિટ"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> શેડ્યૂલ ઑટોમૅટિક રીતે ચાલુ થઈ શકશે</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> શેડ્યૂલ ઑટોમૅટિક રીતે ચાલુ થઈ શકશે</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 કલાક}one{# કલાક}other{# કલાક}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 મિનિટ}one{# મિનિટ}other{# મિનિટ}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{બંધ}=1{બંધ / 1 શેડ્યૂલ ઑટોમૅટિક રીતે ચાલુ થઈ શકે છે}one{બંધ / # શેડ્યૂલ ઑટોમૅટિક રીતે ચાલુ થઈ શકે છે}other{બંધ / # શેડ્યૂલ ઑટોમૅટિક રીતે ચાલુ થઈ શકે છે}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"\'ખલેલ પાડશો નહીં\' સુવિધામાં શું વિક્ષેપ આવી શકે છે"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"લોકો"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"ઍપ"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"ઓછી પ્રાધાન્યતા ધરાવતા નોટિફિકેશનને ઑટોમૅટિક રીતે સામાન્ય નોટિફિકેશન પર સેટ કરો"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"નોટિફિકેશનનું સુવિધાજનક રેંકિંગ"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"ઑટોમૅટિક રીતે નોટિફિકેશનને સુસંગતતા અનુસાર રેંક આપો"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"સુવિધાજનક નોટિફિકેશનનો પ્રતિસાદ"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"નોટિફિકેશનમાં કરવામાં આવેલી ગોઠવણો અને સિસ્ટમને પ્રતિસાદ આપવાનો વિકલ્પ બતાવો"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"સૂચવેલી ક્રિયાઓ અને જવાબો"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"ઑટોમૅટિક રીતે સૂચવેલી ક્રિયાઓ અને જવાબો બતાવો"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"એકદમ નવા અને સ્નૂઝ કરેલા નોટિફિકેશન બતાવો"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"ખલેલ પાડશો નહીં નો ઍક્સેસ"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"ખલેલ પાડશો નહીંને મંજૂરી આપો"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"કોઇ ઇન્સ્ટોલ કરેલ એપ્લિકેશન્સએ ખલેલ પાડશો નહીં ઍક્સેસ કરવાની વિનંતી કરી નથી"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"ઍપ્લિકેશનો લોડ કરી રહ્યું છે..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"ઍપ લોડ કરી રહ્યાં છીએ…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"તમારી વિનંતી મુજબ Android આ ઍપના નોટિફિકેશનને આ ડિવાઇસ પર પ્રદર્શિત થતા બ્લૉક કરી રહ્યું છે"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"તમારી વિનંતી મુજબ Android આ ઍપના નોટિફિકેશનની કૅટેગરીને આ ડિવાઇસ પર પ્રદર્શિત થતા બ્લૉક કરી રહ્યું છે"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"તમારી વિનંતી મુજબ Android આ ઍપના નોટિફિકેશનના ગ્રૂપને આ ડિવાઇસ પર પ્રદર્શિત થતા બ્લૉક કરી રહ્યું છે"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"બધી વાતચીત"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"પ્રાધાન્ય આપ્યું હોય તેવી વાતચીત"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"કોઈ નહીં"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> વાતચીત</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> વાતચીત</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"કોઈ નહીં"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{એકપણ નહીં}=1{1 વાતચીત}one{# વાતચીત}other{# વાતચીત}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"વિક્ષેપ ઊભો કરી શકે છે તે"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"કૉલ"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"કૉલ"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"જે કૉલની મંજૂરી આપી હોય તેમાં સાઉન્ડ આવે તેની ખાતરી કરવા માટે, ડિવાઇસ રિંગ વાગે તેમ સેટ કરેલું હોવાનું ચેક કરો"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ માટે ઇનકમિંગ કૉલને બ્લૉક કરેલા છે. તમારા મિત્રો, પરિવારજનો અથવા અન્ય સંપર્કો તમારો સંપર્ક કરી શકે તે માટે તમે સેટિંગને અનુકૂળ કરી શકો છો."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"સ્ટાર આપેલ સંપર્કો"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one"><xliff:g id="NUM_PEOPLE">%d</xliff:g> અન્ય</item>
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> અન્યો</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"કોઈ નહીં"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{એકપણ નહીં}=1{{contact_1}}=2{{contact_1} અને {contact_2}}=3{{contact_1}, {contact_2} અને {contact_3}}one{{contact_1}, {contact_2} અને # અન્ય વ્યક્તિ}other{{contact_1}, {contact_2} અને # અન્ય લોકો}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Messages"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"સંદેશા"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Messages"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ માટે આવનારા સંદેશા બ્લૉક કરેલા છે. તમારા મિત્રો, કુટુંબના સભ્યો અથવા અન્ય સંપર્કો તમારો સંપર્ક કરી શકે તે માટે તમે સેટિંગને ગોઠવી શકો છો."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"બધા સંદેશા તમને પ્રાપ્ત થઈ શકે છે"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"બધા કૉલ તમારા પર આવી શકે છે"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"કોઈ નહીં"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> સંપર્ક</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> સંપર્કો</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{એકપણ નહીં}=1{1 સંપર્ક}one{# સંપર્ક}other{# સંપર્કો}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"કોઈપણ"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"સંપર્કો"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"સ્ટાર આપેલ સંપર્કો"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"બધા નોટિફિકેશન"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"અમુક નોટિફિકેશન"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"તમે ઍપને વિક્ષેપ પાડવાની મંજૂરી ન આપો તો પણ પસંદગીના લોકો તમારો સંપર્ક કરી શકે છે"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one"><xliff:g id="APP_NAMES">%s</xliff:g> વિક્ષેપ કરી શકે છે</item>
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> વિક્ષેપ કરી શકે છે</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> વધુ"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{કોઈપણ ઍપ \'ખલેલ પાડશો નહીં\' મોડને વિક્ષેપ કરી શકશે નહીં}=1{{app_1} વિક્ષેપ કરી શકે છે}=2{{app_1} અને {app_2} વિક્ષેપ કરી શકે છે}=3{{app_1}, {app_2} અને {app_3} વિક્ષેપ કરી શકે છે}one{{app_1}, {app_2} અને વધુ # વિક્ષેપ કરી શકે છે}other{{app_1}, {app_2} અને વધુ # વિક્ષેપ કરી શકે છે}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"ઍપ"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"બધા નોટિફિકેશન"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"કેટલાંક નોટિફિકેશન"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"વિક્ષેપ ઊભો કરી શકે તેવા નોટિફિકેશન"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"બધા નોટિફિકેશનની મંજૂરી આપો"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> વિક્ષેપ કરી શકે છે</item>
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> વિક્ષેપ કરી શકે છે</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"કંઈપણ વિક્ષેપ આવી શકશે નહીં"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> વધુ"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{કોઈપણ સાઉન્ડ \'ખલેલ પાડશો નહીં\' મોડને વિક્ષેપ કરી શકશે નહીં}=1{{sound_category_1} વિક્ષેપ કરી શકે છે}=2{{sound_category_1} અને {sound_category_2} વિક્ષેપ કરી શકે છે}=3{{sound_category_1}, {sound_category_2} અને {sound_category_3} વિક્ષેપ કરી શકે છે}one{{sound_category_1}, {sound_category_2} અને વધુ # વિક્ષેપ કરી શકે છે}other{{sound_category_1}, {sound_category_2} અને વધુ # વિક્ષેપ કરી શકે છે}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"કોઈપણ સાઉન્ડ \'ખલેલ પાડશો નહીં\' મોડને વિક્ષેપ કરી શકશે નહીં"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"કોઈપણ વિક્ષેપ કરી શકશે નહીં"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"અમુક લોકો વિક્ષેપ કરી શકે છે"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"બધા લોકો વિક્ષેપ કરી શકે છે"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"આના દ્વારા નિયંત્રિત USB"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"કનેક્ટ થયેલ ઉપકરણ"</string>
     <string name="usb_control_device" msgid="527916783743021577">"આ ડિવાઇસ"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"સ્વિચ કરી રહ્યાં છીએ…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"સ્વિચ કરી રહ્યાં છીએ…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"સ્વિચ કરી શક્યા નથી"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"આ ડિવાઇસને ચાર્જ કરવું"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"કનેક્ટેડ ઉપકરણ ચાર્જ કરી રહ્યાં છીએ"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"વિગતો જુઓ"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"ડેટા સેવર"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"અપ્રતિબંધિત ડેટા"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"બૅકગ્રાઉન્ડ ડેટા બંધ કર્યો છે"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"બૅકગ્રાઉન્ડ ડેટા બંધ કર્યો છે"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"ચાલુ"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"બંધ"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"ડેટા સેવરનો ઉપયોગ કરો"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"જો ઉપકરણ લૉક કરેલ છે, તો સૂચનાઓમાં જવાબો અથવા અન્ય ટેક્સ્ટને લખવાનું ટાળો"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"ડિફોલ્ટ જોડણી તપાસનાર"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"જોડણી તપાસનારને પસંદ કરો"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"જોડણી તપાસનારનો ઉપયોગ કરો"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"જોડણી તપાસનારનો ઉપયોગ કરો"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"પસંદ કર્યું નથી"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(કોઈ નહીં)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"સ્ટોરેજ સ્પેસ ખાલી કરવામાં સહાય માટે, સ્ટોરેજ સંંચાલક તમારા ઉપકરણમાંથી બૅકઅપ લીધેલા ફોટો અને વીડિઓને દૂર કરો."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"ફોટો અને વીડિઓ દૂર કરો"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"સ્ટોરેજ સંચાલક"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"સ્ટોરેજ મેનેજરનો ઉપયોગ કરો"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"સ્ટોરેજ મેનેજરનો ઉપયોગ કરો"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"ઑટોમૅટિક"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"મેન્યુઅલ"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"હમણાં સ્પેસ ખાલી કરો"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"ફોનને જોવા માટે બે વાર ટૅપ કરો"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"ટેબ્લેટને જોવા માટે બે વાર ટૅપ કરો"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"ઉપકરણને જોવા માટે બે વાર ટૅપ કરો"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"નોટિફિકેશન માટે સ્વાઇપ કરો"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"તમારી નોટિફિકેશન બતાવવા માટે સ્ક્રીનની નીચલી કિનારી પર નીચે સ્વાઇપ કરો"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"એક-હાથે વાપરો મોડ"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"એક-હાથે વાપરો મોડનો ઉપયોગ કરો"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"ઍપ સ્વિચ કરતી વખતે એક-હાથે વાપરો મોડમાંથી બહાર નીકળો"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"સમયસમાપ્તિ"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 સેકન્ડ"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 સેકન્ડ"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 સેકન્ડ"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"એક-હાથે વાપરો"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"સમય, નોટિફિકેશન અને અન્ય માહિતી ચેક કરવા માટે, તમારી સ્ક્રીન પર બે વાર ટૅપ કરો."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"ફોનને જોવા માટે ઉઠાવો"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"ટેબ્લેટને જોવા માટે ઉઠાવો"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"ટૅબ્લેટ ચેક કરવા માટે ટૅપ કરો"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"ડિવાઇસ ચેક કરવા માટે ટૅપ કરો"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"સમય, નોટિફિકેશન અને અન્ય માહિતી ચેક કરવા માટે, તમારી સ્ક્રીન પર ટૅપ કરો."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"પૅનિક બટન"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"ઝડપથી 5 વાર પાવર બટન દબાવીને ઇમર્જન્સી SOS ક્રિયાઓ શરૂ કરો."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"ચેતવણીનો સાઉન્ડ"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"ક્રિયાઓ શરૂ કરતા પહેલાંની અલર્ટ"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"ઇમર્જન્સી માટેના સંપર્કો"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"નોટિફિકેશનો માટે ફિંગરપ્રિન્ટને સ્વાઇપ કરો"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"ફિંગરપ્રિન્ટને સ્વાઇપ કરો"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"તમારા નોટિફિકેશનને જોવા માટે, તમારા ફોનની પાછળની બાજુએ ફિંગરપ્રિન્ટ સેન્સર પર નીચે સ્વાઇપ કરો."</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"બધા ઍપ માટે ચાલુ કરો"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"ગ્રાફિક્સ ડ્રાઇવર પસંદ કરો"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"ડિફૉલ્ટ"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"ગેમ ડ્રાઇવર"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"ગેમ માટેના ગ્રાફિક ડ્રાઇવર"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"ડેવલપર ડ્રાઇવર"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"સિસ્ટમ ગ્રાફિક્સ ડ્રાઇવર"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"નેટવર્ક શોધી શક્યાં નથી. ફરી પ્રયાસ કરો."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(પ્રતિબંધિત)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"કોઈ સિમ કાર્ડ નથી"</string>
+    <string name="sim_card" msgid="6381158752066377709">"સિમ કાર્ડ"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"કોઈ સિમ કાર્ડ નથી"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"કોઈ માહિતી નથી"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"કનેક્ટ કરવા માટે સિમ કાર્ડ જરૂરી છે"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"કનેક્ટ કરવા માટે <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> સિમ કાર્ડ જરૂરી છે"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"પસંદગીનો નેટવર્ક મોડ: WCDMA પસંદ કરેલ છે"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"પસંદગીનો નેટવર્ક મોડ: માત્ર GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"પસંદગીનો નેટવર્ક મોડ: માત્ર WCDMA"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"મોબાઇલ ડેટા"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"મોબાઇલ નેટવર્કનો વપરાશ કરીને ડેટા ઍક્સેસ કરો"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"રેન્જમાં હશે ત્યારે ફોન ઑટોમૅટિક રીતે આ કૅરિઅર પર સ્વિચ કરશે"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"કોઈ સિમ કાર્ડ ઉપલબ્ધ નથી"</string>
     <string name="calls_preference" msgid="2166481296066890129">"કૉલની પસંદગી"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS પસંદગી"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"દર વખતે પૂછો"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"સેટિંગ પર સ્ક્રીન ઓવરલે થવાની મંજૂરી આપો"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"સેટિંગ સ્ક્રીનને ઓવરલે કરવા માટે અન્ય ઍપની ટોચે પ્રદર્શિત થઈ શકે તેવી ઍપને મંજૂરી આપો"</string>
     <string name="media_controls_title" msgid="403271085636252597">"મીડિયા"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"મીડિયાનું સત્ર સમાપ્ત થઈ જાય ત્યારે, પ્લેયર છુપાવો"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"આ પ્લેયર ઝડપી સેટિંગના મોટા કરેલા પૅનલમાંથી કોઈ સત્ર ફરીથી શરૂ કરવાની મંજૂરી આપે છે."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"ઝડપી સેટિંગમાં મીડિયા પ્લેયરના સેટિંગ"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"પ્લેબૅક સરળતાથી ફરી શરૂ કરવા, મીડિયા પ્લેયરને લાંબા સમયગાળા માટે બતાવો"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"પ્લેયર છુપાવો"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"પ્લેયર બતાવો"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"કોઈ પ્લેયર ઉપલબ્ધ નથી"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"મંજૂર કરેલી ઍપ"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"મીડિયા"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"બ્લૂટૂથ ચાલુ થશે"</string>
 </resources>
diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml
index 1b2569a..d0a11da 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"मध्यम"</item>
     <item msgid="6740026006576843477">"ज़्यादा"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"थोड़े समय के लिए"</item>
+    <item msgid="7397961711906421599">"कुछ समय के लिए"</item>
+    <item msgid="4079132024502041928">"ज़्यादा समय के लिए"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"डिफ़ॉल्ट"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"हर जगह लागू"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"सिर्फ़ TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"ग्लोबल"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 67d08cd..a677e99 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -20,7 +20,7 @@
     <string name="no" msgid="5541738710521607130">"नहीं"</string>
     <string name="create" msgid="986997212165228751">"बनाएं"</string>
     <string name="allow" msgid="3763244945363657722">"अनुमति दें"</string>
-    <string name="deny" msgid="7326117222944479942">"अस्वीकार करें"</string>
+    <string name="deny" msgid="7326117222944479942">"अनुमति न दें"</string>
     <string name="confirmation_turn_on" msgid="2979094011928347665">"चालू करें"</string>
     <string name="device_info_default" msgid="1406619232867343310">"अनजान"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="1646187747875476269">
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"लॉक स्क्रीन पर प्रोफ़ाइल की जानकारी दिखाएं"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"खाते"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"जगह"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"जगह की जानकारी की सुविधा का इस्तेमाल करें"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"जगह की जानकारी वाली सुविधा का इस्तेमाल करें"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"बंद करें"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">चालू है - <xliff:g id="COUNT_1">%1$d</xliff:g> ऐप्लिकेशन के पास जगह की जानकारी का ऐक्सेस है</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"चेहरे का इस्तेमाल कर पुष्टि करें"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"शुरू करें"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"अगर सुलभता सुविधा में मालिक का चेहरा पहचानकर अनलॉक करने की सुविधा बंद है, तो हो सकता है कि सेट अप के कुछ चरण, टॉकबैक के साथ ठीक से काम न करें."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"वापस जाएं"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"सेट अप जारी रखें"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"सुलभता सेटअप का इस्तेमाल करें"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="other">पिन में <xliff:g id="NUMBER_1">%d</xliff:g> से कम अंक होने चाहिए</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"डिवाइस व्यवस्थापक हाल ही के पिन का उपयोग करने की अनुमति नहीं देता"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"आपके आईटी एडमिन ने आम तौर पर इस्तेमाल होने वाले पिन पर रोक लगा रखी है. दूसरा पिन बनाएं."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"इसमें अमान्य वर्ण शामिल नहीं हो सकता"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"कम से कम एक अक्षर होना चाहिए"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"कम से कम एक अंक होना चाहिए"</string>
@@ -653,7 +655,6 @@
       <item quantity="other">पासवर्ड में कम से कम <xliff:g id="COUNT">%d</xliff:g> वर्ण ऐसे होने चाहिए जो संख्या न हों</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"डिवाइस व्यवस्थापक हाल ही के पासवर्ड का उपयोग करने की अनुमति नहीं देता"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"आपके आईटी एडमिन ने आम तौर पर इस्तेमाल होने वाले पासवर्ड पर रोक लगा रखी है. कोई दूसरा पासवर्ड बनाएं."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"अंकों के बढ़ते, घटते या दोहराए जाने वाले क्रम की अनुमति नहीं है"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"पुष्टि करें"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"रद्द करें"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"वाई-फ़ाई"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"वाई-फ़ाई  चालू करें"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"वाई-फ़ाई"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"वाई-फ़ाई इस्तेमाल करें"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"वाई-फ़ाई इस्तेमाल करें"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"वाई-फ़ाई सेटिंग"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"वाई-फ़ाई"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"वायरलेस पहुंच बिंदुओं को सेट अप और प्रबंधित करें"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"डिवाइस को “<xliff:g id="SSID">%1$s</xliff:g>” से जोड़ने के लिए QR कोड को नीचे मौजूद कैमरा विंडो के बीच में लाएं"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"QR कोड स्कैन करके वाई-फ़ाई से जुड़ें"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"वाई-फ़ाई शेयर करें"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"“<xliff:g id="SSID">%1$s</xliff:g>” से जुड़ने के लिए इस QR कोड को स्कैन करें और पासवर्ड शेयर करें"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"“<xliff:g id="SSID">%1$s</xliff:g>” से जुड़ने के लिए किसी दूसरे डिवाइस से इस क्यूआर कोड को स्कैन करें"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"“<xliff:g id="SSID">%1$s</xliff:g>” से जुड़ने के लिए इस QR कोड को स्कैन करें"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"फिर से कोशिश करें. अगर समस्या ठीक नहीं होती है, तो डिवाइस बनाने वाली कंपनी से संपर्क करें"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"काेई गड़बड़ी हुई"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"वाई-फ़ाई पासवर्ड: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"हॉटस्पॉट का पासवर्ड: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"अपने-आप कनेक्ट हो जाए"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"अनुमति दें कि इस वाई-फ़ाई नेटवर्क के पास आते ही आपका फ़ोन अपने-आप इससे कनेक्ट हो जाए"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"अनुमति दें कि इस वाई-फ़ाई नेटवर्क के पास आते ही आपका टैबलेट अपने-आप इससे कनेक्ट हो जाए"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"जब रेंज में हो, तब डिवाइस काे इस वाई-फ़ाई नेटवर्क से जुड़ने की अनुमति दें"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"डिवाइस जोड़ें"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"इस नेटवर्क से किसी डिवाइस को जोड़ने के लिए QR कोड का इस्तेमाल करें"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR कोड का फ़ॉर्मैट गलत है"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"सिस्टम प्रमाणपत्रों का उपयोग करें"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"मुहैया न कराएं"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"मान्‍य न करें"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"कोई प्रमाणपत्र मौजूद नहीं है. आपका कनेक्‍शन निजी नहीं होगा."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"नेटवर्क का नाम बहुत लंबा है."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"डोमेन बताना ज़रूरी है."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"प्रमाणपत्र ज़रूरी है."</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"जोड़ दें"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"वाई-फ़ाई चालू किया गया"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> से कनेक्ट किया गया"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> से कनेक्ट हो रहा है"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"कनेक्ट हो रहा है…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"नेटवर्क से कनेक्ट करने में विफल रहा"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"नेटवर्क पहुंच से बाहर है"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"ऐप सामग्री शेयर कर रहा है. इंटरनेट कनेक्शन शेयर करने के लिए, हॉटस्पॉट बंद करके फिर उसे चालू करें"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"काेई पासवर्ड सेट नहीं है"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"हॉटस्पॉट का नाम"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> चालू किया जा रहा है..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> चालू हो रहा है…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"दूसरे डिवाइस <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> से कनेक्ट हो सकते हैं"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"हॉटस्पॉट का पासवर्ड"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"एपी बैंड"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"स्मूद डिसप्ले"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"कुछ कॉन्टेंट के लिए, यह अपने-आप ही रीफ़्रेश दर को 60 हर्ट्ज़ से बढ़ाकर 90 हर्ट्ज़ कर देता है. इसमें बैटरी ज़्यादा खर्च होती है."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"स्मूद डिसप्ले"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"रीफ़्रेश दर को 90 हर्ट्ज़ पर सेट करें"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"रीफ़्रेश होने की सबसे ज़्यादा दर जिसके लागू होने के बाद छूकर की जाने वाली कार्रवाइयां तेज़ हो जाती हैं. साथ ही, ऐनिमेशन की क्वालिटी बेहतर हो जाती है. इसमें बैटरी ज़्यादा खर्च होती है."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"स्क्रीन चालू रखने की सुविधा"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"चालू / अगर आप स्क्रीन को देख रहे हैं, तो वह बंद नहीं होगी"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android वर्शन"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android की सुरक्षा से जुड़ा अपडेट"</string>
     <string name="model_info" msgid="8997566254717810904">"मॉडल"</string>
-    <string name="model_summary" msgid="2246651782442466213">"मॉडल: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"मॉडल और हार्डवेयर"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"हार्डवेयर वर्शन"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"डिवाइस आईडी"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"नेटवर्क सेटिंग रीसेट कर दी गई हैं"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"सिम नहीं मिटाए जा सकते"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"गड़बड़ी की वजह से डाउनलोड किए गए सिम मिटाए नहीं जा सकते.\n\nअपना डिवाइस रीस्टार्ट करें और फिर से कोशिश करें."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"हमेशा के लिए सारा डेटा मिटाएं (फ़ैक्ट्री रीसेट)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"सारा डेटा हमेशा के लिए मिटाएं (फ़ैक्ट्री रीसेट)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"इससे आपके टैबलेट की "<b>"मेमोरी"</b>" से सारा डेटा हमेशा के लिए मिट जाएगा, जिसमें शामिल हैं:\n\n"<li>"आपका Google खाता"</li>\n<li>"सिस्‍टम, ऐप्लिकेशन का डेटा, और सेटिंग"</li>\n<li>"डाउनलोड किए गए ऐप्लिकेशन"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"इससे आपके फ़ोन की "<b>"मेमोरी"</b>" से सारा डेटा मिट जाएगा, जिसमें शामिल हैं:\n\n"<li>"आपका Google खाता"</li>\n<li>"सिस्‍टम, ऐप्लिकेशन का डेटा, और सेटिंग"</li>\n<li>"डाउनलोड किए गए ऐप्लिकेशन"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"आपने इस समय नीचे दिए गए खातों में साइन इन किया हुआ है:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"इस डिवाइस पर अन्‍य उपयोगकर्ता मौजूद हैं.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"संगीत"</li>\n<li>"फ़ोटो"</li>\n<li>"अन्य उपयोगकर्ता डेटा"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"ई-सिम"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"इससे आपका मोबाइल सेवा प्लान रद्द नहीं होगा."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"संगीत, तस्वीर और अन्‍य उपयोगकर्ता डेटा साफ़ करने के लिए "<b>" USB मैमोरी"</b>" मिटाना होगा."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"संगीत, तस्वीर और अन्‍य उपयोगकर्ता डेटा साफ़ करने के लिए "<b>"SD कार्ड"</b>" को साफ़ करना होगा."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"हमेशा के लिए पूरा डेटा मिटाएं (फ़ैक्ट्री रीसेट)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"हमेशा के लिए पूरा डेटा मिटाएं (फ़ैक्ट्री रीसेट)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"इससे आपके टैबलेट की "<b>"मेमोरी"</b>" से सारा डेटा हमेशा के लिए मिट जाएगा, जिसमें ये शामिल हैं:\n\n"<li>"आपका Google खाता"</li>\n<li>"सिस्टम और ऐप्लिकेशन से जुड़ा डेटा और सेटिंग"</li>\n<li>"डाउनलोड किए गए ऐप्लिकेशन"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"इससे आपके फ़ोन की "<b>"मेमोरी"</b>" से सारा डेटा हमेशा के लिए मिट जाएगा, जिसमें ये शामिल हैं:\n\n"<li>"आपका Google खाता"</li>\n<li>"सिस्टम और ऐप्लिकेशन से जुड़ा डेटा और सेटिंग"</li>\n<li>"डाउनलोड किए गए ऐप्लिकेशन"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"आपने फ़िलहाल इन खातों में साइन इन किया हुआ है:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"इस डिवाइस पर अन्य उपयोगकर्ता मौजूद हैं.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"संगीत"</li>\n<li>"फ़ोटो"</li>\n<li>"उपयोगकर्ता का अन्य डेटा"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"इससे आपका मोबाइल सेवा प्लान रद्द नहीं होगा."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"संगीत, तस्वीर, और उपयोगकर्ता का अन्य डेटा मिटाने के लिए "<b>"यूएसबी मेमोरी"</b>" के डेटा को हमेशा के लिए मिटाना होगा."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"संगीत, तस्वीर, और उपयोगकर्ता का अन्य डेटा मिटाने के लिए "<b>"एसडी कार्ड"</b>" के डेटा को हमेशा के लिए मिटाना होगा."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USB मेमोरी मिटाएं"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SD कार्ड मिटाएं"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"आंतरिक USB मेमोरी का सभी डेटा, जैसे संगीत या फ़ोटो, मिटाएं"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"SD कार्ड पर मौजूद सभी डेटा, जैसे संगीत या फ़ोटो, मिटाएं"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"सारा डेटा मिटाएं"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"सारा डेटा मिटाएं"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"आपकी सारी निजी जानकारी और डाउनलोड किए गए ऐप्लिकेशन मिटा दिए जाएंगे. आप इस कार्रवाई को पहले जैसा नहीं कर सकते."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"डाउनलोड किए गए ऐप्लिकेशन और सिम के साथ ही आपकी पूरी निजी जानकारी मिटा दी जाएगी. आप इस कार्रवाई को पहले जैसा नहीं कर सकते."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"सब कुछ मिटाएं"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"सिस्‍टम साफ़ करें सेवा उपलब्‍ध न होने के कारण कोई रीसेट निष्‍पादित नहीं किया गया था."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"पूरा डेटा मिटाना चाहते हैं?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"इस उपयोगकर्ता के लिए फ़ैक्ट्री रीसेट उपलब्ध नहीं है"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"मिटाया जा रहा है"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"कृपया प्रतीक्षा करें..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"हमेशा के लिए पूरा डेटा मिटाएं"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"हमेशा के लिए पूरा डेटा मिटाएं"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"आपकी सारी निजी जानकारी और डाउनलोड किए गए ऐप्लिकेशन मिटा दिए जाएंगे. आप मिटाया गया डेटा वापस नहीं पा सकते."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"डाउनलोड किए गए ऐप्लिकेशन और सिम के साथ ही आपकी सारी निजी जानकारी मिटा दी जाएगी. आप मिटाया गया डेटा वापस नहीं पा सकते."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"पूरा डेटा मिटाना चाहते हैं?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"इस उपयोगकर्ता के लिए फ़ैक्ट्री रीसेट उपलब्ध नहीं है"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"हमेशा के लिए मिटाया जा रहा है"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"कृपया इंतज़ार करें…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"कॉल सेटिंग"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"वॉइसमेल, कॉल को दूसरे नंबर पर भेजना, कॉल वेटिंग (कॉल के दौरान आ रहा दूसरा कॉल), कॉलर आईडी सेट करें"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"यूएसबी से टेदरिंग"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> डिवाइस से ज़्यादा को टेदर नहीं कर सकता."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> को अनटेदर किया जाएगा."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"ईथरनेट टेदरिंग"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"यूएसबी ईथरनेट से फ़ोन का इंटरनेट कनेक्शन शेयर करें"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"ईथरनेट से फ़ोन का इंटरनेट कनेक्शन शेयर करें"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"अपने मोबाइल डेटा कनेक्शन के ज़रिए दूसरे डिवाइस को इंटरनेट देने के लिए हॉटस्पॉट और टेदरिंग का इस्तेमाल करें. ऐप्लिकेशन आस-पास के डिवाइस से सामग्री शेयर करने के लिए हॉटस्पॉट भी बना सकते हैं."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"अपने वाई-फ़ाई और मोबाइल डेटा कनेक्शन से, दूसरे डिवाइस को इंटरनेट उपलब्ध कराने के लिए हॉटस्पॉट और टेदरिंग का इस्तेमाल करें. आस-पास के डिवाइस से सामग्री शेयर करने के लिए, ऐप्लिकेशन भी हॉटस्पॉट बना सकते हैं."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"सहायता"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"कैप्शन की प्राथमिकताएं"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"बड़ा करना"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"स्क्रीन का बड़ा किया गया हिस्सा"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"स्क्रीन बड़ी करने का मोड चालू करें"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"उस हिस्से को चुनें जिसे आप स्क्रीन पर बड़ा करके देखना चाहते हैं"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"फ़ुल स्क्रीन"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"स्क्रीन का हिस्सा"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"पूरी स्क्रीन और स्क्रीन का हिस्सा"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"पूरी स्क्रीन को बड़ा करें"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"स्क्रीन के किसी हिस्से को बड़ा करें"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"क्या आप सुलभता बटन का इस्तेमाल करना चाहते हैं?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"स्क्रीन का हिस्सा बड़ा करने के लिए तीन बार टैप करने की सुविधा के इस्तेमाल से, टाइपिंग और अन्य कार्रवाइयां धीमी पड़ जाएंगी.\n\nक्या आप ज़ूम के लिए सुलभता बटन इस्तेमाल करना चाहते हैं?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"सुलभता बटन का इस्तेमाल करें"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"तीन बार टैप करके ज़ूम करने वाली सुविधा चालू रखें"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"स्क्रीन को बड़ा करने की सेटिंग"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"तीन बार टैप करके आकार बढ़ाएं"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"शॉर्टकट की मदद से बड़ा करके देखें"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"पावर बटन से कॉल काटना"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"बड़ा माउस पॉइंटर"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"ऐनिमेशन हटाएं"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"मोनो ऑडियो"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"ऑडियो चलाते समय चैनलों को एक में जोड़ें"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"ऑडियो बैलेंस"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"बायां"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"दायां"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"मोनो ऑडियो"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"ऑडियो चलाते समय, सारी आवाज़ों को एक ही चैनल में जोड़ें"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"ऑडियो बैलेंस"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"बाएं"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"दाएं"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"डिफ़ॉल्ट"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 सेकंड"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 सेकंड"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"सूचना के लिए वाइब्रेशन"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"घंटी के लिए वाइब्रेशन"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"टच फ़ीडबैक"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> का इस्तेमाल करें"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> खोलें"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"रंग में सुधार करने की सुविधा इस्तेमाल करें"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"कैप्शन दिखाएं"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"सिर्फ़ इस सुविधा के साथ काम करने वाले ऐप्लिकेशन के लिए"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> का इस्तेमाल करें"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> खोलें"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"रंग में सुधार करने की सुविधा इस्तेमाल करें"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"कैप्शन दिखाएं"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"सिर्फ़ इस सुविधा के साथ काम करने वाले ऐप्लिकेशन के लिए"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"कैप्शन का साइज़ और शैली"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> टेक्स्ट का साइज़"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"ज़्यादा विकल्प"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"लाल-हरे रंग की पहचान न कर पाने की समस्या"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"हरा-लाल रंग पहचान न पाने की समस्या"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"नीले-पीले रंग की पहचान न कर पाने की समस्या"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"ग्रेस्केल"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"लाल-हरा रंग पहचान न पाना"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"लाल-हरा रंग पहचान न पाना"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"नीला-पीला रंग पहचान न पाना"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"बैकग्राउंड की गतिविधियों पर रोक लगाना"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"ऐप्लिकेशन को बैकग्राउंड में चलने दें"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"ऐप्लिकेशन को बैकग्राउंड में चलने की अनुमति नहीं है"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"बैकग्राउंड में हो रहे बैटरी खर्च पर रोक नहीं लगाई जा सकती"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"बैकग्राउंड में चल रही गतिविधि पर पाबंदी नहीं लगा जा सकती"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"ऐप की बैकग्राउंड गतिविधि को सीमित करें?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"अगर आप ऐप की बैकग्राउंड गतिविधि को सीमित करते हैं, तो हो सकता है यह ठीक ढंग से काम न करे"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"ऐप्लिकेशन पर रोक नहीं लगेगी क्योंकि यह बैटरी ऑप्टिमाइज़ नहीं कर सकता.\n\nबैटरी ऑप्टिमाइज़ेशन चालू करके ही ऐसा हो सकता है."</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"शेड्यूल तय करें"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"बैटरी लाइफ़ बढ़ाएं"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"चार्ज होने पर बंद करें"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"आपके फ़ोन की बैटरी <xliff:g id="PERCENT">%1$s</xliff:g> होने पर बैटरी सेवर बंद हो जाता है"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"आपके टैबलेट की बैटरी <xliff:g id="PERCENT">%1$s</xliff:g> होने पर बैटरी सेवर बंद हो जाता है"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"आपके डिवाइस की बैटरी <xliff:g id="PERCENT">%1$s</xliff:g> होने पर बैटरी सेवर बंद हो जाता है"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"फ़ोन की बैटरी को <xliff:g id="PERCENT">%1$s</xliff:g> से ज़्यादा चार्ज करने पर, बैटरी सेवर मोड बंद हो जाता है"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"टैबलेट की बैटरी को <xliff:g id="PERCENT">%1$s</xliff:g> से ज़्यादा चार्ज करने पर, बैटरी सेवर मोड बंद हो जाता है"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"डिवाइस की बैटरी को <xliff:g id="PERCENT">%1$s</xliff:g> से ज़्यादा चार्ज करने पर, बैटरी सेवर मोड बंद हो जाता है"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"चालू करें"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"रीसेट करें"</string>
     <string name="tts_play" msgid="2945513377250757221">"चलाएं"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"वीपीएन"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"अडैप्टिव कनेक्टिविटी"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"अडैप्टिव कनेक्टिविटी का विकल्प चुनने पर, आपका इंटरनेट कनेक्शन अपने-आप मैनेज हो जाएगा. इससे बैटरी लाइफ़ बढ़ती है और डिवाइस की परफ़ॉर्मेंस बेहतर होती है"</string>
     <string name="credentials_title" msgid="7535942196886123656">"क्रेडेंशियल स्टोरेज"</string>
     <string name="credentials_install" msgid="3933218407598415827">"कोई प्रमाणपत्र इंस्टॉल करें"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"मेमोरी से प्रमाणपत्र इंस्‍टॉल करें"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"यूज़र क्रेडेंशियल"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"स्टोर किए गए क्रेडेंशियल देखें और उनमें बदलाव करें"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"बेहतर सेटिंग"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"मेमोरी का प्रकार"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"हार्डवेयर-समर्थित"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"केवल सॉफ़्टवेयर"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"इस उपयोगकर्ता के लिए क्रेडेंशियल मौजूद नहीं हैं"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN और ऐप्लिकेशन के लिए इंस्टॉल किया गया"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"वाई-फ़ाई के लिए इंस्टॉल किया गया"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"पैसे चुकाने की मशीन का इस्तेमाल करना"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"पैसे चुकाने के लिए किसी ऐप्लिकेशन को चुनें. इसके बाद, टच किए बिना पैसे चुकाने के निशान वाले किसी टर्मिनल के ऊपर अपने फ़ोन का पिछला हिस्सा रखें."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"ठीक है"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"ज़्यादा..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"ज़्यादा…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"पैसे चुकाने के लिए डिफ़ॉल्ट ऐप्लिकेशन सेट करें"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"पैसे चुकाने के डिफ़ॉल्ट ऐप्लिकेशन को अपडेट करें"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"टच किए बिना पैसे चुकाने के टर्मिनल पर, <xliff:g id="APP">%1$s</xliff:g> से पैसे चुकाएं"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"कॉल के लिए हमेशा इसका उपयोग करें"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"डेटा के लिए सिम चुनें"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"मैसेज (एसएमएस) के लिए सिम चुनें"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"डेटा सिम स्‍विच किया जा रहा है, इसमें एक मिनट तक लग सकता है..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"डेटा सिम स्विच किया जा रहा है, इसमें एक मिनट तक लग सकता है…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"इस सिम से कॉल करें"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"सिम कार्ड चुनें"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"सिम <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"रूटीन, शेड्यूल, बैटरी सेवर, पावर सेवर, बैटरी, ऑटोमैटिक, प्रतिशत"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, बेहतर कॉलिंग, 4g कॉलिंग"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"भाषा जोड़ें, किसी भाषा को जोड़ें"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"टेक्स्ट का साइज़"</string>
     <string name="default_sound" msgid="6604374495015245195">"डिफ़ॉल्‍ट ध्‍वनि"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"घंटी और सूचना की आवाज़ <xliff:g id="PERCENTAGE">%1$s</xliff:g> है"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"आवाज़, वाइब्रेशन, परेशान न करें"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"चालू होने की ध्वनि"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"लाइव कैप्शन"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"ऑडियो-वीडियो पहचानकर अपने-आप कैप्शन बनना"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"कोई नहीं"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> शेड्यूल सेट किया गया है</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> शेड्यूल सेट किए गए हैं</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{किसी शेड्यूल का सेट नहीं है}=1{1 शेड्यूल का सेट है}one{# शेड्यूल का सेट है}other{# शेड्यूल के सेट हैं}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"परेशान न करें"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"सिर्फ़ ज़रूरी लोगों और ऐप्लिकेशन की सूचनाएं पाएं"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"रुकावटों को कम करें"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"सिर्फ़ ज़रूरी"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"चालू है / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"बंद / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"बंद"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"चालू है"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"हर बार पूछें"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"जब तक आप बंद नहीं करते"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> घंटे</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> घंटे</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> मिनट"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> शेड्यूल अपने आप चालू हो सकते हैं</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> शेड्यूल अपने आप चालू हो सकते हैं</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 घंटा}one{# घंटा}other{# घंटे}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 मिनट}one{# मिनट}other{# मिनट}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{बंद है}=1{बंद है / 1 शेड्यूल अपने-आप चालू हो सकता है}one{बंद है / # शेड्यूल अपने-आप चालू हो सकता है}other{बंद है / # शेड्यूल अपने-आप चालू हो सकते हैं}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"\'परेशान न करें\' मोड को कौन बायपास कर सकता है"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"लोग"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"ऐप्लिकेशन"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"कम ज़रूरी सूचनाओं को बिना आवाज़ वाली सूचनाओं के तौर पर अपने आप सेट करें"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"ज़रूरत के हिसाब से सूचनाओं को रैंक दें"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"कोई सूचना कितने काम की है, इस हिसाब से उसे अपने-आप रैंक करें"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"ज़रूरत के हिसाब से सूचनाओं के बारे में सुझाव दें या शिकायत करें"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"यह सेटिंग, सूचनाओं की प्राथमिकताओं में किए गए बदलावों के बारे में बताती है और सिस्टम के बारे में राय/सुझाव देने के विकल्प दिखाती है"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"सुझाई गई कार्रवाइयां और जवाब"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"सुझाई गई कार्रवाइयां और जवाब अपने आप दिखाएं"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"हाल ही में मिली और स्नूज़ की गई सूचनाएं दिखाएं"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"\'परेशान न करें\' सुविधा का ऐक्सेस"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"\'परेशान न करें\' सुविधा चालू करें"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"इंस्टॉल किए गए किसी भी ऐप ने परेशान ना करें सुविधा के इस्तेमाल का अनुरोध नहीं किया है"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"ऐप्लिकेशन लोड हो रहे हैं..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"ऐप्लिकेशन लोड हो रहे हैं…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"आपके अनुरोध पर, Android इस ऐप्लिकेशन की सूचनाओं को इस डिवाइस पर आने से रोक रहा है"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"आपके अनुरोध पर, Android इस श्रेणी की सूचनाओं को इस डिवाइस पर आने से रोक रहा है"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"आपके अनुरोध पर, Android इस तरह की सूचनाओं को इस डिवाइस पर आने से रोक रहा है"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"सभी बातचीत"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"अहम बातचीत"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"कोई भी नहीं"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> बातचीत</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> बातचीत</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"कोई भी नहीं"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{कोई बातचीत नहीं}=1{1 बातचीत}one{# बातचीत}other{# बातचीत}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"वे कॉल और मैसेज जो \'परेशान न करें\' मोड को बायपास कर सकते हैं"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"कॉल"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"कॉल"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"जिन कॉल के आने की अनुमति है उनके आने पर आवाज़ आए, यह पक्का करने के लिए देखें कि आपका डिवाइस रिंग करने वाले मोड पर सेट है"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ के लिए आने वाले कॉल ब्लॉक कर दिए गए हैं. आप सेटिंग में बदलाव करके दोस्तों, परिवार के लोगों, या दूसरे संपर्कों को आप तक पहुंचने की मंज़ूरी दे सकते हैं."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"तारे के निशान वाले संपर्क"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one"><xliff:g id="NUM_PEOPLE">%d</xliff:g> और संपर्क</item>
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> और संपर्क</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"कोई नहीं"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{स्टार के निशान वाला कोई संपर्क नहीं}=1{{contact_1}}=2{{contact_1} और {contact_2}}=3{{contact_1}, {contact_2}, और {contact_3}}one{{contact_1}, {contact_2}, और # अन्य संपर्क}other{{contact_1}, {contact_2}, और # अन्य संपर्क}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"मैसेज"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"मैसेज"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"मैसेज"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ के लिए आने वाले मैसेज ब्लॉक कर दिए गए हैं. आप सेटिंग में अपने हिसाब से बदलाव करके दोस्तों, परिवार के सदस्यों या दूसरे लोगों को आपसे संपर्क करने की मंज़ूरी दे सकते हैं."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"सभी मैसेज \'परेशान न करें\' मोड को बायपास कर सकते हैं"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"सभी कॉल \'परेशान न करें\' मोड को बायपास कर सकते हैं"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"कोई नहीं"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> संपर्क</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> संपर्क</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{कोई संपर्क नहीं}=1{1 संपर्क}one{# संपर्क}other{# संपर्क}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"कोई भी"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"संपर्क"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"तारे के निशान वाले संपर्क"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"सभी सूचनाएं"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"कुछ सूचनाएं"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"अगर आपने ऐप्लिकेशन को \'परेशान न करें\' मोड में डाला है, तब भी चुने हुए लोग आपसे संपर्क कर सकते हैं"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one"><xliff:g id="APP_NAMES">%s</xliff:g> \'परेशान न करें\' मोड को बायपास कर सकता है</item>
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> \'परेशान न करें\' मोड को बायपास कर सकते हैं</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> और"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{कोई भी ऐप्लिकेशन \'परेशान न करें\' मोड को बायपास नहीं कर सकता}=1{{app_1} \'परेशान न करें\' मोड को बायपास कर सकता है}=2{{app_1} और {app_2} \'परेशान न करें\' मोड को बायपास कर सकते हैं}=3{{app_1}, {app_2}, और {app_3} \'परेशान न करें\' मोड को बायपास कर सकते हैं}one{{app_1}, {app_2}, और # अन्य ऐप्लिकेशन \'परेशान न करें\' मोड को बायपास कर सकते हैं}other{{app_1}, {app_2}, और # अन्य ऐप्लिकेशन \'परेशान न करें\' मोड को बायपास कर सकते हैं}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"ऐप्लिकेशन"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"सभी सूचनाएं"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"कुछ सूचनाएं"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"वे सूचनाएं जो \'परेशान न करें\' मोड को बायपास कर सकती हैं"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"सभी सूचनाओं को, \'परेशान न करें\' मोड बायपास करने की अनुमति दें"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> \'परेशान न करें\' मोड को बायपास कर सकती है</item>
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> \'परेशान न करें\' मोड को बायपास कर सकती हैं</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"कोई भी दूसरी आवाज़ \'परेशान न करें\' मोड को बायपास नहीं कर सकती"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> और"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{कोई भी आवाज़ \'परेशान न करें\' मोड को बायपास नहीं कर सकती}=1{{sound_category_1} की आवाज़ \'परेशान न करें\' मोड को बायपास कर सकती है}=2{{sound_category_1} और {sound_category_2} की आवाज़ें \'परेशान न करें\' मोड को बायपास कर सकती हैं}=3{{sound_category_1}, {sound_category_2}, और {sound_category_3} की आवाज़ें \'परेशान न करें\' मोड को बायपास कर सकती हैं}one{{sound_category_1}, {sound_category_2}, और # अन्य आवाज़ \'परेशान न करें\' मोड को बायपास कर सकती है}other{{sound_category_1}, {sound_category_2}, और # अन्य आवाज़ें \'परेशान न करें\' मोड को बायपास कर सकती हैं}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"कोई भी आवाज़ \'परेशान न करें\' मोड को बायपास नहीं कर सकती"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"कोई भी व्यक्ति \'परेशान न करें\' मोड को बायपास नहीं कर सकता"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"कुछ चुने हुए लोग \'परेशान न करें\' मोड को बायपास कर सकते हैं"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"कोई भी व्यक्ति \'परेशान न करें\' मोड को बायपास कर सकता है"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"यूएसबी का मोड"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"जोड़ा गया डिवाइस"</string>
     <string name="usb_control_device" msgid="527916783743021577">"यह डिवाइस"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"स्विच किया जा रहा है..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"स्विच किया जा रहा है…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"स्विच नहीं किया जा सका"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"इस डिवाइस को चार्ज करना"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"जोड़े गए डिवाइस को चार्ज करना"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"जानकारी देखें"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"डेटा बचाने की सेटिंग"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"पाबंदी के बिना डेटा इस्तेमाल"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"पृष्ठभूमि डेटा बंद है"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"बैकग्राउंड डेटा बंद है"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"चालू"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"बंद"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"डेटा बचाने की सेटिंग चालू करें"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"अगर डिवाइस लॉक है, तो सूचनाओं का जवाब या अन्य लेख लिखने से रोकें"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"डिफ़ॉल्ट तौर पर स्पेलिंग जाँचने वाला"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"वर्तनी/स्पेलिंग जाँचकर्ता चुनें"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"स्पेलिंग जाँचने वाला टूल इस्तेमाल करें"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"स्पेलिंग जांचने वाली सुविधा का इस्तेमाल करें"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"नहीं चुना गया"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(कुछ नहीं)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"मेमोरी में जगह खाली करने में मदद करने के लिए, मेमोरी प्रबंधक आपके डिवाइस से बैकअप ली गई फ़ोटो और वीडियो निकाल देता है."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"फ़ोटो और वीडियो निकालें"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"मेमोरी प्रबंधक"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"मेमोरी मैनेजर इस्तेमाल करें"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"मेमोरी प्रबंधक टूल का इस्तेमाल करें"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"अपने-आप"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"मैन्युअल"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"अभी स्पेस खाली करें"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"फ़ोन देखने के लिए दो बार टैप करें"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"टैबलेट देखने के लिए दो बार छूएं"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"डिवाइस देखने के लिए दो बार छूएं"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"सूचनाओं के लिए स्वाइप करें"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"अपनी सूचनाएं देखने के लिए, स्क्रीन पर ऊपर से नीचे की ओर स्वाइप करें"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"वन-हैंडेड मोड"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"वन-हैंडेड मोड का इस्तेमाल करें"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"एक ऐप्लिकेशन से दूसरे पर जाते समय बाहर निकलें"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"टाइम आउट"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"चार सेकंड"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"आठ सेकंड"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 सेकंड"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"वन-हैंडेड ऐक्सेस"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"समय, सूचनाएं और दूसरी जानकारी देखने के लिए, फ़ोन की स्क्रीन पर दो बार टैप करें."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"फ़ोन चेक करने के लिए उसे उठाएं"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"टैबलेट देखने के लिए लिफ़्ट करें"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"टैबलेट की स्क्रीन पर टैप करके देखें कि सूचना मिली है या नहीं"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"डिवाइस की स्क्रीन पर टैप करके देखें कि सूचना मिली है या नहीं"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"समय, सूचनाएं, और दूसरी जानकारी देखने के लिए फ़ोन की स्क्रीन पर टैप करें."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"खतरे के अलार्म वाला बटन"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"आपातकालीन स्थिति में जगह की जानकारी शेयर करने के लिए, पावर बटन को पांच बार तेज़ी से दबाएं."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"चेतावनी की आवाज़"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"आपातकालीन सेवाओं को कॉल करने से पहले चेतावनी जारी करें"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"आपातकालीन संपर्क"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"सूचनाओं के लिए फ़िंगरप्रिंट स्वाइप करें"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"फ़िंगरप्रिंट स्वाइप करें"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"अपनी सूचनाएं देखने के लिए, अपने फ़ोन के पीछे फ़िंगरप्रिंट सेंसर पर नीचे की तरफ़ स्वाइप करें."</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"सभी ऐप्लिकेशन के लिए चालू करें"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"ग्राफ़िक ड्राइवर चुनें"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"डिफ़ॉल्ट"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"गेम ड्राइवर"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"गेम ड्राइवर"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"डेवलपर ड्राइवर"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"सिस्टम ग्राफ़िक ड्राइवर"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"कोई नेटवर्क नहीं मिला. फिर से कोशिश करें."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(मना है)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"कोई सिम कार्ड नहीं है"</string>
+    <string name="sim_card" msgid="6381158752066377709">"सिम कार्ड"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"कोई सिम कार्ड नहीं लगाया गया है"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"इस वाई-फ़ाई नेटवर्क पर सिम कार्ड की कोई जानकारी नहीं है"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"वाई-फ़ाई नेटवर्क से कनेक्ट करने के लिए, सिम कार्ड लगा होना चाहिए"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"वाई-फ़ाई नेटवर्क से कनेक्ट करने के लिए, <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> का सिम कार्ड लगा होना चाहिए"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"पसंदीदा नेटवर्क मोड: WCDMA को प्राथमिकता"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"पसंदीदा नेटवर्क मोड: सिर्फ़ GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"पसंदीदा नेटवर्क मोड: सिर्फ़ WCDMA"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"मोबाइल डेटा"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"मोबाइल नेटवर्क का इस्तेमाल करके डेटा ऐक्सेस करें"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"नेटवर्क होने पर फ़ोन अपने आप इस कैरियर पर आ जाएगा"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"सिम कार्ड मौजूद नहीं है"</string>
     <string name="calls_preference" msgid="2166481296066890129">"कॉल की प्राथमिकता"</string>
     <string name="sms_preference" msgid="7742964962568219351">"मैसेज (एसएमएस) की प्राथमिकता"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"हर बार पूछें"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"\'सेटिंग\' पर स्क्रीन ओवरले करने की अनुमति दें"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"\'सेटिंग\' में जाकर उन ऐप्लिकेशन को स्क्रीन ओवरले करने की अनुमति दें जो दूसरे ऐप्लिकेशन के ऊपर दिख सकते हैं"</string>
     <string name="media_controls_title" msgid="403271085636252597">"मीडिया"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"मीडिया सेशन के खत्म होने पर, प्लेयर छिपाएं"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"आप मीडिया प्लेयर का इस्तेमाल करके, फटाफट सेटिंग के बड़े किए गए पैनल से सेशन फिर से शुरू कर सकते हैं."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"फटाफट सेटिंग में मीडिया प्लेयर की सेटिंग"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"वीडियो को फिर से चलाने के लिए, मीडिया प्लेयर को लंबे समय तक दिखाएं"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"मीडिया प्लेयर को छिपाएं"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"मीडिया प्लेयर दिखाएं"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"कोई मीडिया प्लेयर उपलब्ध नहीं है"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"इन ऐप्लिकेशन को इस्तेमाल करने की अनुमति है"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"मीडिया"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"ब्लूटूथ चालू हो जाएगा"</string>
 </resources>
diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
index 5c322b2..c2d3cba 100644
--- a/res/values-hr/arrays.xml
+++ b/res/values-hr/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Srednje"</item>
     <item msgid="6740026006576843477">"Dugo"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Kratko"</item>
+    <item msgid="7397961711906421599">"Srednje"</item>
+    <item msgid="4079132024502041928">"Dugo"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Zadano"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Globalno"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Samo TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Globalno"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 241a024..51a1386 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -298,7 +298,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Prikaži informacije profila na zaključanom zaslonu"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Računi"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Lokacija"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Koristi se lokacijom"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Upotreba lokacije"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Isključeno"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">Uključeno – <xliff:g id="COUNT_1">%1$d</xliff:g> aplikacija ima pristup lokaciji</item>
@@ -332,6 +332,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Autentificirajte se licem"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Započni"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Ako je otključavanje licem za pristupačnost isključeno, neki koraci za postavljanje možda neće pravilno funkcionirati s TalkBackom."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Natrag"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Nastavi postavljanje"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Koristi postav. za pristupačnost"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -627,7 +630,6 @@
       <item quantity="other">Mora sadržavati manje od <xliff:g id="NUMBER_1">%d</xliff:g> znamenki</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Administrator uređaja ne dopušta upotrebu nedavnog PIN-a"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Vaš je IT administrator blokirao uobičajene PIN-ove. Pokušajte s nekom drugim PIN-om."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Unos ne smije sadržavati nevažeće znakove"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Mora sadržavati najmanje jedno slovo"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Mora sadržavati najmanje jednu znamenku"</string>
@@ -668,7 +670,6 @@
       <item quantity="other">Mora sadržavati najmanje <xliff:g id="COUNT">%d</xliff:g> znakova koji nisu znamenke</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Administrator uređaja ne dopušta upotrebu nedavne zaporke"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Vaš je IT administrator blokirao uobičajene zaporke. Pokušajte s nekom drugom zaporkom."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Uzastopno rastući ili padajući slijed brojeva ili ponavljanje brojeva nije dopušteno"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Potvrdi"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Odustani"</string>
@@ -812,7 +813,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Uključite Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Upotreba Wi-Fija"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Koristi Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Postavke Wi-Fija"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Postavljanje i upravljanje bežičnim pristupnim točkama"</string>
@@ -920,7 +921,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Centrirajte QR kôd u nastavku da biste se povezali s mrežom “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Pridružite se Wi‑Fiju tako što ćete skenirati QR kôd"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Dijelite Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Skenirajte ovaj QR kôd da biste se povezali s mrežom \"<xliff:g id="SSID">%1$s</xliff:g>\" i podijelili zaporku"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Skenirajte ovaj QR kôd nekim drugim uređajem da biste se pridružili mreži \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Skenirajte ovaj QR kôd da biste se povezali s mrežom \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Pokušajte ponovo. Ako i dalje imate problema, obratite se proizvođaču uređaja"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Nešto nije u redu"</string>
@@ -946,8 +947,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Zaporka Wi-Fi mreže: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Zaporka žarišne točke: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Automatsko povezivanje"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Dopustite telefonu automatsko povezivanje kada je u blizini ove mreže"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Dopustite tabletu automatsko povezivanje kada je u blizini ove mreže"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Dopusti vezu s ovom mrežom kad je u dometu"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Dodajte uređaj"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Dodajte uređaj u mrežu pomoću QR koda"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR kôd nije u važećem formatu"</string>
@@ -959,7 +959,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Upotrijebi certifikate sustava"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Nemoj pružiti"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Nemoj potvrditi"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Nije naveden nijedan certifikat. Veza neće biti privatna."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Mreža ima predugačak naziv."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Mora se navesti domena."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Potreban je certifikat."</string>
@@ -986,6 +985,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Poveži"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi uključen"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Povezano s <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Povezivanje s mrežom <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Povezivanje…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Povezivanje s mrežom nije uspjelo"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Mreža nije u dometu"</string>
@@ -1060,7 +1060,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Aplikacija dijeli sadržaj. Da biste dijelili internetsku vezu, isključite žarišnu točku, a zatim je ponovo uključite"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Zaporka nije postavljena"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Naziv žarišne točke"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Uključivanje žarišne točke <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Uključivanje žarišne točke <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Drugi uređaji mogu se povezati sa žarišnom točkom <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Zaporka žarišne točke"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Frekvencija pristupne točke"</string>
@@ -1210,7 +1210,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Glatki prikaz"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Automatsko povećanje učestalosti osvježavanja sa 60 na 90 Hz za neki sadržaj. Povećava potrošnju baterije."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Glatki prikaz"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Nametni učestalost osvježavanja od 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Najviša učestalost osvježavanja za poboljšano reagiranje na dodir i kvalitetu animacije. Povećava potrošnju baterije."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Pozornost zaslona"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Uključeno/zaslon se neće isključiti ako ga gledate"</string>
@@ -1350,7 +1350,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Verzija sustava Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Sigurnosno ažuriranje za Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Model"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Model: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Model i hardver"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Verzija hardvera"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ID opreme"</string>
@@ -1625,31 +1624,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Postavke mreže vraćene su na zadano."</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Brisanje SIM-ova nije uspjelo"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Preuzeti SIM-ovi ne mogu se izbrisati zbog pogreške.\n\nPonovo pokrenite uređaj i pokušajte još jednom."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Izbriši sve podatke (vraćanje na tvorničke postavke)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Izbriši sve podatke (vraćanje na tvorničke postavke)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Time će se izbrisati svi podaci iz "<b>"unutarnje pohrane"</b>" tableta, uključujući:\n\n"<li>"vaš Google račun"</li>\n<li>"podaci i postavke sustava i aplikacija"</li>\n<li>"preuzete aplikacije"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Time će se izbrisati svi podaci iz "<b>"interne pohrane"</b>" telefona, uključujući:\n\n"<li>"vaš Google račun"</li>\n<li>"podaci i postavke sustava i aplikacija"</li>\n<li>"preuzete aplikacije"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Trenutačno ste prijavljeni na sljedeće račune:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Na ovom uređaju postoje i drugi korisnici.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Glazba"</li>\n<li>"Fotografije"</li>\n<li>"Ostali korisnički podaci"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM-ovi"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Time se neće otkazati vaš plan mobilne usluge."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Da biste izbrisali glazbu, slike i ostale korisničke podatke, "<b>"USB pohrana"</b>" treba biti izbrisana."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Da biste izbrisali glazbu, slike i ostale korisničke podatke, trebate izbrisati "<b>"SD karticu"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Izbriši sve podatke (vraćanje na tvorničke postavke)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Izbriši sve podatke"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Time će se izbrisati svi podaci iz "<b>"interne pohrane"</b>" tableta, uključujući:\n\n"<li>"vaš Google račun"</li>\n<li>"podatke i postavke sustava i aplikacija"</li>\n<li>"preuzete aplikacije"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Time će se izbrisati svi podaci iz "<b>"interne pohrane"</b>" telefona, uključujući:\n\n"<li>"vaš Google račun"</li>\n<li>"podatke i postavke sustava i aplikacija"</li>\n<li>"preuzete aplikacije"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Trenutačno ste prijavljeni na sljedeće račune:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Na ovom uređaju postoje i drugi korisnici.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"glazbu"</li>\n<li>"fotografije"</li>\n<li>"ostale korisničke podatke"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM-ove"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Time se neće otkazati vaš ugovor o mobilnoj usluzi."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Da biste izbrisali glazbu, slike i ostale korisničke podatke, trebate izbrisati "<b>"USB pohranu"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Da biste izbrisali glazbu, slike i ostale korisničke podatke, trebate izbrisati "<b>"SD karticu"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Izbriši USB memoriju"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Izbriši SD karticu"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Izbrisati sve podatke u unutarnjoj USB pohrani, poput glazbe ili fotografija"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Brišu se svi podaci na SD kartici, na primjer, glazba ili fotografije"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Brisanje svih podataka"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Brisanje svih podataka"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Svi vaši osobni podaci i preuzete aplikacije izbrisat će se. Ta se radnja ne može poništiti."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Izbrisat će se svi vaši osobni podaci, uključujući preuzete aplikacije i SIM-ove. Ta se radnja ne može poništiti."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Izbriši sve"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Nije došlo do poništavanja jer nije dostupna usluga brisanja sustava."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Želite izbrisati sve podatke?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Vraćanje na tvorničko stanje nije dostupno za ovog korisnika"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Brisanje"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Pričekajte..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Izbriši sve podatke"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Izbriši sve podatke"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Izbrisat će se svi vaši osobni podaci i preuzete aplikacije. Ta se radnja ne može poništiti."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Izbrisat će se svi vaši osobni podaci, uključujući preuzete aplikacije i SIM-ove. Ta se radnja ne može poništiti."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Želite li izbrisati sve podatke?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Vraćanje na tvorničko stanje nije dostupno za ovog korisnika"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Brisanje"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Pričekajte…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Postavke poziva"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Postavite govornu poštu, preusmjeravanje poziva, ID pozivatelja"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB dijeljenje veze"</string>
@@ -1697,7 +1694,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Veza se ne može dijeliti s više od <xliff:g id="MAXCONNECTION">%1$d</xliff:g> uređaja."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> će biti oslobođen."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Dijeljenje veze Ethernetom"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Dijelite internetsku vezu telefona putem USB etherneta"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Dijelite internetsku vezu telefona putem etherneta"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Pomoću žarišne točke i modemskog povezivanja drugi se uređaji mogu povezati s internetom putem podatkovne veze vašeg mobilnog uređaja. Žarišnu točku mogu izraditi i aplikacije radi dijeljenja sadržaja s uređajima u blizini."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Pomoću žarišne točke i modemskog povezivanja drugi se uređaji mogu povezati s internetom vašim Wi-Fijem ili podatkovnom vezom vašeg mobilnog uređaja. Žarišnu točku mogu izraditi i aplikacije radi dijeljenja sadržaja s uređajima u blizini."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Pomoć"</string>
@@ -2141,13 +2138,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Postavke titlova"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Povećavanje"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Područje povećanja"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Omogućeno povećavanje"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Odaberite područje za povećavanje ili više njih koje želite upotrijebiti pri povećavanju zaslona"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Cijeli zaslon"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Dio zaslona"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Cijeli zaslon i dio zaslona"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Povećaj cijeli zaslon"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Povećaj dio zaslona"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Prijeći na gumb za Pristupačnost?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Trostruki dodir za povećavanje dijela zaslona prouzročit će kašnjenje u tipkanju i drugim radnjama.\n\nŽelite li početi upotrebljavati gumb za Pristupačnost za povećavanje?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Prijeđi na gumb za Pristupačnost"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Zadrži trostruki dodir za povećavanje"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Postavke povećanja"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Povećavanje trostrukim dodirom"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Povećanje pomoću prečaca"</string>
@@ -2201,11 +2201,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Tipka za uklj. prekida poziv"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Veliki pokazivač miša"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Uklanjanje animacija"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Monozvuk"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Kombiniranje kanala prilikom reprodukcije zvuka"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Ravnoteža zvuka"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Lijeva"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Desna"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Monozvuk"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Kombiniranje kanala prilikom reprodukcije zvuka"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Ravnoteža zvuka"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Lijevo"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Desno"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Zadano"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 sekundi"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 sekundi"</string>
@@ -2235,11 +2235,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Vibracija za obavijesti"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Vibracija pri zvonjenju"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Reakcija na dodir"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Koristi uslugu <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Otvori <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Korekcija boje"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Prikaži titlove"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Samo za podržanu aplikaciju"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Koristi uslugu <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Otvori <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Upotreba korekcije boja"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Prikaži titlove"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Samo za podržanu aplikaciju"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Veličina i stil naslova"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> veličina teksta"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Više opcija"</string>
@@ -2270,6 +2270,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomalija"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomalija"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomalija"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Nijanse sive"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Crveno – zeleno"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Crveno – zeleno"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Plavo – žuto"</string>
@@ -2405,7 +2406,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Ograničenje upotrebe u pozadini"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Dopustite rad aplikacije u pozadini"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Aplikaciji nije dopušten rad u pozadini"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Upotreba u pozadini ne može se ograničiti"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Upotreba u pozadini ne može se ograničiti"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Želite li ograničiti pozadinsku aktivnost?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Ako ograničite pozadinsku aktivnost za aplikaciju, možda će se ponašati nepredviđeno"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Aplikacija nije postavljena za optimizaciju baterije, pa je ne možete ograničiti.\n\nZa ograničenje uključite optimizaciju."</string>
@@ -2629,9 +2630,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Postavite raspored"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Produljenje trajanja baterije"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Isključi nakon punjenja"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Štednja baterije isključuje se kad je telefon na <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Štednja baterije isključuje se kad je tablet na <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Štednja baterije isključuje se kad je uređaj na <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Štednja baterije isključuje se kad je telefon napunjen iznad <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Štednja baterije isključuje se kad je tablet napunjen iznad <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Štednja baterije isključuje se kad je uređaj napunjen iznad <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Uključi"</string>
@@ -2696,6 +2697,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Vrati na zadano"</string>
     <string name="tts_play" msgid="2945513377250757221">"Reproduciraj"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Adaptivna povezivost"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Automatski upravlja mrežnim vezama i tako produljuje trajanje baterije i poboljšava izvedbu uređaja"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Pohrana vjerodajnica"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Instaliranje certifikata"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Instaliraj certifikate iz memorije"</string>
@@ -2707,9 +2710,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Korisničke vjerodajnice"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Prikaz i izmjena pohranjenih vjerodajnica"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Dodatne postavke"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Vrsta pohrane"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardverska"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Samo softverska"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Za ovog korisnika nisu dostupne vjerodajnice"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Instalirano za VPN i aplikacije"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Instalirano za Wi-Fi"</string>
@@ -3103,7 +3103,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Plaćanje na terminalu"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Postavite aplikaciju za plaćanje. Zatim samo prislonite stražnju stranu telefona na bilo koji terminal sa simbolom beskontaktnog povezivanja."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Shvaćam"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Više..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Više…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Postavite zadanu aplikaciju za plaćanje"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Ažurirajte zadanu aplikaciju za plaćanje"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Na beskontaktnom terminalu plaćat će se putem aplikacije <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3187,7 +3187,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Uvijek upotrebljavaj za pozive"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Odaberite SIM za podatke"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Odaberite SIM za SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Prebacuje se podatkovni SIM, to može potrajati najviše minutu..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Prebacuje se podatkovni SIM, to može potrajati najviše minutu…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Poziv putem usluge"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Odabir SIM kartice"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3331,6 +3331,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"rutina, raspored, štednja baterije, štednja energije, baterija, automatski, postotak"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, napredno pozivanje, 4g pozivanje"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"dodaj jezik, dodajte jezik"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"veličina teksta"</string>
     <string name="default_sound" msgid="6604374495015245195">"Zadani zvuk"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Glasnoća zvona i obavijesti na <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Glasnoća, vibracija, Ne ometaj"</string>
@@ -3370,12 +3371,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Uključi zvukove"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Automatski titlovi"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Automatski titlovi za medije"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Ništa"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one">Postavljen je <xliff:g id="ON_COUNT">%d</xliff:g> raspored</item>
-      <item quantity="few">Postavljena su <xliff:g id="ON_COUNT">%d</xliff:g> rasporeda</item>
-      <item quantity="other">Postavljeno je <xliff:g id="ON_COUNT">%d</xliff:g> rasporeda</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Nijedan}=1{Postavljen je jedan raspored}one{Postavljen je # raspored}few{Postavljena su # rasporeda}other{Postavljeno je # rasporeda}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Ne uznemiravaj"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Primajte obavijesti samo od važnih osoba i aplikacija"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Ograničavanje prekida"</string>
@@ -3443,22 +3439,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Samo prioritetno"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Uključeno/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Isključeno/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Isključeno"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Uključeno"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Pitaj svaki put"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Dok ne isključite"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> sat</item>
-      <item quantity="few"><xliff:g id="NUM_HOURS">%d</xliff:g> sata</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> sati</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> min"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> raspored može se uključiti automatski</item>
-      <item quantity="few"><xliff:g id="ON_COUNT">%d</xliff:g> rasporeda mogu se uključiti automatski</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> rasporeda može se uključiti automatski</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 sat}one{# sat}few{# sata}other{# sati}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minuta}one{# minuta}few{# minute}other{# minuta}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Isključeno}=1{Isključeno/jedan raspored može se uključiti automatski}one{Isključeno/# raspored može se uključiti automatski}few{Isključeno/# rasporeda mogu se uključiti automatski}other{Isključeno/# rasporeda može se uključiti automatski}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Što može prekidati značajku Ne uznemiravaj"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Osobe"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Aplikacije"</string>
@@ -3504,6 +3490,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Obavijesti nižeg prioriteta automatski se postavljaju na Neupadljivo"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Prilagodljiv poredak obavijesti"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Automatski poredaj obavijesti prema važnosti"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Povratne informacije o prilagodljivim obavijestima"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Navedi prilagodbe obavijesti i prikaži opciju pružanja povratnih informacija sustavu"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Predložene radnje i odgovori"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Automatski prikaži predložene radnje i odgovore"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Pregledajte nedavne i odgođene obavijesti"</string>
@@ -3705,7 +3693,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Pristup opciji Ne ometaj"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Dopusti Ne uznemiravaj"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Nijedna instalirana aplikacija nije zatražila pristup opciji Ne ometaj"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Učitavanje aplikacija..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Učitavanje aplikacija…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Android na vaš zahtjev blokira prikazivanje obavijesti te aplikacije na ovom uređaju"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Android na vaš zahtjev blokira prikazivanje te kategorije obavijesti na ovom uređaju"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Android na vaš zahtjev blokira prikazivanje te grupe obavijesti na ovom uređaju"</string>
@@ -3800,12 +3788,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Svi razgovori"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Prioritetni razgovori"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Ništa"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> razgovor</item>
-      <item quantity="few"><xliff:g id="CONVERSATIONS">%d</xliff:g> razgovora</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> razgovora</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Ništa"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Nijedan}=1{1 razgovor}one{# razgovor}few{# razgovora}other{# razgovora}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Tko može prekidati"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Pozivi"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Pozivi"</string>
@@ -3814,12 +3797,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Da biste provjerili mogu li se čuti dopušteni pozivi, provjerite je li uređaj postavljen na zvonjenje"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Za raspored \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" dolazni su pozivi blokirani. Možete prilagoditi postavke da bi vaša obitelj, prijatelji ili drugi kontakti mogli stupiti u kontakt s vama."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Kontakti označeni zvjezdicom"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one">Još <xliff:g id="NUM_PEOPLE">%d</xliff:g> osoba</item>
-      <item quantity="few">Još <xliff:g id="NUM_PEOPLE">%d</xliff:g> osobe</item>
-      <item quantity="other">Još <xliff:g id="NUM_PEOPLE">%d</xliff:g> osoba</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Nitko"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Nijedan}=1{{contact_1}}=2{{contact_1} i {contact_2}}=3{{contact_1}, {contact_2} i {contact_3}}one{{contact_1}, {contact_2} i njih još #}few{{contact_1}, {contact_2} i njih još #}other{{contact_1}, {contact_2} i njih još #}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Poruke"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"poruke"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Poruke"</string>
@@ -3828,12 +3806,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Dolazne su poruke blokirane za raspored \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\". Možete prilagoditi postavke da bi vaša obitelj, prijatelji ili drugi kontakti mogli stupiti u kontakt s vama."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Dostupni ste za sve poruke"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Dostupni ste za sve pozive"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Ništa"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontakt</item>
-      <item quantity="few"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontakta</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontakata</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Nijedan}=1{1 kontakt}one{# kontakt}few{# kontakta}other{# kontakata}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Svi"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Kontakti"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Kontakti označeni zvjezdicom"</string>
@@ -3871,24 +3844,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Sve obavijesti"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Neke obavijesti"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Odabrane osobe i dalje vam se mogu obratiti, čak i ako ne dopustite aplikacijama da prekidaju"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one"><xliff:g id="APP_NAMES">%s</xliff:g> može prekidati</item>
-      <item quantity="few"><xliff:g id="APP_NAMES">%s</xliff:g> mogu prekidati</item>
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> mogu prekidati</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"još <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Nijedna aplikacija ne može prekidati}=1{{app_1} može prekidati}=2{{app_1} i {app_2} mogu prekidati}=3{{app_1}, {app_2} i {app_3} mogu prekidati}one{{app_1}, {app_2} i još # aplikacija mogu prekidati}few{{app_1}, {app_2} i još # aplikacije mogu prekidati}other{{app_1}, {app_2} i još # aplikacija mogu prekidati}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Aplikacije"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Sve obavijesti"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Neke obavijesti"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Obavijesti koje mogu prekidati"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Dopusti sve obavijesti"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> mogu prekidati</item>
-      <item quantity="few"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> mogu prekidati</item>
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> mogu prekidati</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Ništa ne može prekidati"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"još <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Ništa ne može prekidati}=1{{sound_category_1} može prekidati}=2{{sound_category_1} i {sound_category_2} mogu prekidati}=3{{sound_category_1}, {sound_category_2} i {sound_category_3} mogu prekidati}one{{sound_category_1}, {sound_category_2} i još # zvuk mogu prekidati}few{{sound_category_1}, {sound_category_2} i još # zvuka mogu prekidati}other{{sound_category_1}, {sound_category_2} i još # zvukova mogu prekidati}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Ništa ne može prekidati"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Nitko ne može prekidati"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Neke osobe mogu prekidati"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Sve osobe mogu prekidati"</string>
@@ -4142,7 +4105,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB-om upravlja"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Povezani uređaj"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Ovaj uređaj"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Prebacivanje..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Prebacivanje…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Prebacivanje nije uspjelo"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Punjenje ovog uređaja"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Punjenje povezanog uređaja"</string>
@@ -4396,7 +4359,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Prikaz pojedinosti"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Štednja podat. prometa"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Neograničeni podaci"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Pozadinski su podaci isključeni"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Pozadinski su podaci isključeni"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Uključeno"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Isključeno"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Ograniči podatkovni promet"</string>
@@ -4419,7 +4382,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Spriječi unos odgovora ili drugog teksta u obavijesti kada je uređaj zaključan"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Zadana provjera pravopisa"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Odabir provjere pravopisa"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Upotreba provjere pravopisa"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Upotreba provjere pravopisa"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Nije odabrano"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(ništa)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4513,7 +4476,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Upravitelj pohrane uklanja fotografije i videozapise s uređaja za koje je napravljena sigurnosna kopija kako bi oslobodio prostor za pohranu."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Ukloni fotografije i videozapise"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Upravitelj pohrane"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Upotreba upravitelja pohrane"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Upotreba upravitelja pohrane"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automatski"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Priručnik"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Oslobodi prostor odmah"</string>
@@ -4551,6 +4514,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Dva dodira za provjeru"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Dvaput dodirnite da biste provjerili tablet"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Dvaput dodirnite da biste provjerili uređaj"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Prijeđite prstom za obavijesti"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Za prikaz obavijesti prijeđite prstom prema dolje na donjem rubu zaslona"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Način rada jednom rukom"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Koristi način rada jednom rukom"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Izađi pri prelasku s aplikacije na aplikaciju"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Privremeni prekid"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 sekunde"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 sekundi"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 sekundi"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"dostupnost"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Da biste pogledali vrijeme, obavijesti i druge informacije, dvaput dodirnite zaslon."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Provjera telefona podizanjem"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Podignite da biste provjerili tablet"</string>
@@ -4563,6 +4536,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Dodirnite da biste provjerili tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Dodirnite da biste provjerili uređaj"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Da biste pogledali vrijeme, obavijesti i druge informacije, dodirnite zaslon."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Gumb za uzbunu"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Brzo 5 puta pritisnite tipku za uključivanje/isključivanje da biste pokrenuli hitne SOS radnje."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Zvuk upozorenja"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Upozorenje prije pokretanja radnji"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Kontakti za hitne slučajeve"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Prelazak prstom preko senzora za obavijesti"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Prelazak prstom preko senzora"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Da biste pogledali obavijesti, prijeđite prstom prema dolje po senzoru otiska prsta na stražnjoj strani telefona."</string>
@@ -4724,7 +4702,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Omogućavanje za sve aplikacije"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Odabir upravljačkog programa za grafiku"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Zadano"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Upravljački program za igru"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Upravljački program za igru"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Upravljački program razvojnog programera"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Upravljački program za grafiku sustava"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4793,6 +4771,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Nije pronađena nijedna mreža. Pokušajte ponovo."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(zabranjeno)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Nema SIM kartice"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Nema SIM kartice"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Nema"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Potrebna je SIM kartica radi povezivanja"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Potrebna je SIM kartica operatera <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> radi povezivanja"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Način željene mreže: Preferirano WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Način željene mreže: Samo GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Način željene mreže: Samo WCDMA"</string>
@@ -4846,6 +4829,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobilni podaci"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Pristupi podacima pomoću mobilne mreže"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Telefon će automatski prijeći na tog mobilnog operatera kad bude u dometu"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Nije dostupna nijedna SIM kartica"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Preferencija za pozive"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Preferencija za SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Pitaj svaki put"</string>
@@ -5031,10 +5015,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Dopustite preklapanja na zaslonu na Postavkama"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Dopustite aplikacije koje se mogu prikazivati iznad drugih da se preklapaju na zaslonima Postavki"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Mediji"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Sakrij player kad se medijska sesija završi"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Player vam omogućuje da nastavite sesiju iz proširene ploče Brze postavke."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Player medija u Brzim postavkama"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Prikažite player medija dulje vrijeme da biste lako nastavili reprodukciju"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Sakrij player"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Prikaži player"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Nijedan player nije dostupan"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Dopuštene aplikacije"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"mediji"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth će se uključiti"</string>
 </resources>
diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml
index 8ea94c5..6fe7f5c 100644
--- a/res/values-hu/arrays.xml
+++ b/res/values-hu/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Közepes"</item>
     <item msgid="6740026006576843477">"Hosszú"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Rövid"</item>
+    <item msgid="7397961711906421599">"Közepes"</item>
+    <item msgid="4079132024502041928">"Hosszú"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Alapértelmezett"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Globális"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Csak TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Globális"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index a061e62..ba8fe2e 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Profiladatok megjelenítése a lezáró képernyőn"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Fiókok"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Tartózkodási hely"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Helyadatok használata"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Helyadatok használata"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Ki"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">Be – <xliff:g id="COUNT_1">%1$d</xliff:g> alkalmazás hozzáfér a helyadatokhoz</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Arc használata hitelesítéshez"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Kezdés"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"A kisegítő arcalapú feloldás ki van kapcsolva, ezért előfordulhat, hogy egyes beállítási lépések nem működnek megfelelően a TalkBack funkcióval."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Vissza"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Beállítás folytatása"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Kisegítő beállítás használata"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="one"><xliff:g id="NUMBER_0">%d</xliff:g> számjegynél rövidebbnek kell lennie</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Az eszközrendszergazda nem engedélyezi a legutóbbi PIN-kódok használatát"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Rendszergazdája letiltotta a gyakran használt PIN-kódokat. Próbálkozzon másik PIN-kóddal."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Ez nem tartalmazhat érvénytelen karaktert"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Tartalmazzon legalább egy betűt"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Tartalmazzon legalább egy számjegyet"</string>
@@ -653,7 +655,6 @@
       <item quantity="one">Tartalmaznia kell legalább 1 olyan karaktert, amely nem szám</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Az eszközrendszergazda nem engedélyezi a legutóbbi jelszavak használatát"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Rendszergazdája letiltotta a gyakran használt jelszavakat. Próbálkozzon másik jelszóval."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Növekvő, csökkenő vagy ismétlődő számsor megadása nem engedélyezett"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Megerősítés"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Mégse"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Wi-Fi bekapcsolása"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Wi-Fi használata"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Wi-Fi használata"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wi-Fi beállítások"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Vezeték nélküli hozzáférési pontok beállítása és kezelése"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Irányítsa a QR-kódot az alábbi panel közepére, hogy hozzáadja az eszközt a(z) <xliff:g id="SSID">%1$s</xliff:g> hálózathoz"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Csatlakozzon Wi-Fi-hálózathoz QR-kód beolvasásával"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Wi‑Fi megosztása"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"A(z) „<xliff:g id="SSID">%1$s</xliff:g>” hálózathoz való csatlakozás érdekében olvassa be ezt a QR-kódot, és ossza meg a jelszót"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Ha csatlakozni szeretne a(z) „<xliff:g id="SSID">%1$s</xliff:g>” hálózathoz egy másik eszközzel, olvassa be ezt a QR-kódot"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"A(z) „<xliff:g id="SSID">%1$s</xliff:g>” hálózathoz való csatlakozás érdekében olvassa be ezt a QR-kódot"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Próbálja újra. Ha a probléma továbbra is fennáll, vegye fel a kapcsolatot az eszköz gyártójával."</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Hiba történt"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi-Fi-jelszó: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Hotspot jelszava: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Automatikus csatlakozás"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"A telefon automatikusan csatlakozhat e hálózat közelében"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"A táblagép automatikusan csatlakozhat e hálózat közelében"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"A hálózathoz való csatlakozás engedélyezése hatótávolságon belül"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Eszköz hozzáadása"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Használjon QR-kódot, ha új eszközt szeretne hozzáadni a hálózathoz"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"A QR-kód nem érvényes formátum"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Rendszertanúsítvány használata"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Ne adja meg"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Ne hitelesítse"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Nincs megadva tanúsítvány. A kapcsolat nem privát jellegű lesz."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"A hálózat neve túl hosszú."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"A domain megadása kötelező."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Tanúsítvány szükséges."</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Kapcsolódás"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi bekapcsolva"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Kapcsolódva a(z) <xliff:g id="NETWORK_NAME">%1$s</xliff:g> hálózathoz"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Csatlakozás a következőhöz: <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Csatlakozás…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Nem sikerült hálózathoz csatlakozni."</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"A hálózat nincs hatókörön belül"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Az alkalmazás tartalmat oszt meg. Az internetkapcsolat megosztásához kapcsolja ki, majd újra be a hotspotot"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Nincs beállítva jelszó"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Hotspot neve"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> bekapcsolása…"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> bekapcsolása…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Más eszközök is csatlakozhatnak a(z) <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> hotspothoz"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Hotspot jelszava"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP-sáv"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Néhány tartalomnál automatikusan megemeli a frissítés gyakoriságát 60-ról 90 Hz-re. Növeli az akkumulátorhasználatot."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"90 Hz-es frissítési gyakoriság kényszerítése"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Legnagyobb frissítési gyakoriság a kifinomultabb érintési érzékenység és a jobb minőségű animációk érdekében. Növeli az akkumulátorhasználatot."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Képernyőfigyelő"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Be / A képernyő nem kapcsol majd ki, ha Ön épp azt nézi"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android verziója"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android biztonsági frissítés"</string>
     <string name="model_info" msgid="8997566254717810904">"Modell"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Modell: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Modell és hardver"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Hardververzió"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Eszközazonosító"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"A hálózati beállítások vissza lettek állítva."</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Nem lehet törölni a SIM-eket"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Hiba történt, ezért nem sikerült a letöltött SIM törlése.\n\nIndítsa újra az eszközt, majd próbálja újra."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Összes adat törlése (gyári beállítások visszaállítása)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Az összes adat törlése"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Ez minden adatot töröl a táblagép "<b>"belső tárhelyéről"</b>", többek között: \n\n"<li>"az Ön Google-fiókját"</li>\n<li>"a rendszer- és alkalmazásadatokat és a beállításokat"</li>\n<li>"a letöltött alkalmazásokat"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Ez minden adatot töröl a telefon "<b>"belső tárhelyéről"</b>", többek között:\n\n"<li>"az Ön Google-fiókját"</li>\n<li>"a rendszer- és alkalmazásadatokat és a beállításokat"</li>\n<li>"a letöltött alkalmazásokat"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Jelenleg a következő fiókokba van bejelentkezve:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Más felhasználók is vannak ezen az eszközön.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Zene"</li>\n<li>"Fotók"</li>\n<li>"Más felhasználói adatok"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM-ek"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Ezzel nem szünteti meg mobil-előfizetését."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"A zenék, képek és más felhasználói adatok törléséhez az "<b>"USB-tárat"</b>" is törölnie kell."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"A zenék, képek és más felhasználói adatok törléséhez az "<b>"SD-kártyát"</b>" is törölnie kell."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Összes adat törlése (gyári beállítások visszaállítása)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Összes adat törlése"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Ez minden adatot töröl a táblagép "<b>"belső tárhelyéről"</b>", többek között: \n\n"<li>"az Ön Google-fiókját"</li>\n<li>"a rendszer- és alkalmazásadatokat és a beállításokat"</li>\n<li>"a letöltött alkalmazásokat"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Ez minden adatot töröl a telefon "<b>"belső tárhelyéről"</b>", többek között:\n\n"<li>"az Ön Google-fiókját"</li>\n<li>"a rendszer- és alkalmazásadatokat és a beállításokat"</li>\n<li>"a letöltött alkalmazásokat"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Jelenleg a következő fiókokba van bejelentkezve:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Más felhasználók is vannak ezen az eszközön.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Zene"</li>\n<li>"Fotók"</li>\n<li>"Más felhasználói adatok"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM-ek"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Ezzel nem szünteti meg mobil-előfizetését."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"A zenék, képek és más felhasználói adatok törléséhez az "<b>"USB-háttértárat"</b>" is törölnie kell."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"A zenék, képek és más felhasználói adatok törléséhez az "<b>"SD-kártyát"</b>" is törölnie kell."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USB-tár törlése"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SD-kártya törlése"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Minden adat, például zenék és képek törlése a belső USB-tárról"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Minden adat, például zenék és képek törlése az SD-kártyáról"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Minden adat törlése"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Minden adat törlése"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Az összes személyes információt és letöltött alkalmazást törli. Ez a művelet nem vonható vissza."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Az összes személyes adata törlődik (beleértve a letöltött alkalmazásokat és SIM-eket is). Ez a művelet nem vonható vissza."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Minden törlése"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Nem történt visszaállítás, mert a Rendszertisztítás szolgáltatás nem érhető el."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Törli az összes adatot?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"A gyári beállítások visszaállítása nem hajtható végre ennél a felhasználónál"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Törlés"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Kérjük, várjon…"</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Minden adat törlése"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Minden adat törlése"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Az összes személyes adatot és letöltött alkalmazást törli. Ez a művelet nem vonható vissza."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Az összes személyes adata törlődik (beleértve a letöltött alkalmazásokat és SIM-eket is). Ez a művelet nem vonható vissza."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Törli az összes adatot?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"A gyári beállítások visszaállítása nem hajtható végre ennél a felhasználónál"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Törlés"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Kis türelmet…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Hívásbeállítások"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Hangposta, hívásátirányítás, hívásvárakoztatás és hívóazonosító beállítása"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB-megosztás"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Nem köthető több mint <xliff:g id="MAXCONNECTION">%1$d</xliff:g> eszközhöz."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> megosztása meg lesz szüntetve."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ethernet megosztása"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"A telefon internetkapcsolatának megosztása USB Etherneten keresztül"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"A telefon internetkapcsolatának megosztása Etherneten keresztül"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Hotspotot és internetmegosztást használhat annak érdekében, hogy internetet biztosítson más eszközöknek mobiladat-kapcsolat segítségével. Az alkalmazások is létrehozhatnak hotspotokat, hogy tartalmakat osszanak meg a közeli eszközökkel."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"A hotspot és az internetmegosztás funkcióval más eszközöknek biztosíthat internet-hozzáférést saját Wi‑Fi- vagy mobiladat-kapcsolatán keresztül. Az alkalmazások szintén létrehozhatnak hotspotot, hogy tartalmat osszanak meg a közeli eszközökkel."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Súgó"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Feliratbeállítások"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Nagyítás"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Nagyítási terület"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Nagyítás engedélyezve"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Válassza ki, hogy mely nagyítási területeket szeretné használni a képernyő nagyításakor"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Teljes képernyő"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Képernyő bizonyos része"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Teljes képernyő és képernyő bizonyos része"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Teljes képernyő nagyítása"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Képernyő bizonyos részének nagyítása"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Átvált a kisegítő lehetőségek gombra?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Ha három koppintással felnagyítja a képernyő valamelyik részét, a gépelés és más műveletek késleltetve működnek.\n\nSzeretné inkább a nagyításhoz a kisegítő lehetőségek gombot használni?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Váltás a kisegítő lehetőségek gombra"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Továbbra is a három koppintást használom a nagyításhoz"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Nagyítási beállítások"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Nagyítás három koppintással"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Nagyítás gyorsparanccsal"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"A bekapcs. gomb megszakítja a hívást"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Nagy egérmutató"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Animációk eltávolítása"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Monó hang"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Csatornák egyesítése hang lejátszásakor"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Hangegyensúly"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Bal"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Jobb"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Monó hang"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Csatornák kombinálása hang lejátszásakor"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Hangegyensúly"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Balra"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Jobbra"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Alapértelmezett"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 másodperc"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 másodperc"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Értesítések rezgése"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Csengés rezgése"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Visszajelzés az érintésekről"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> használata"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> megnyitása"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Színkorrekció használata"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Felirat megjelenítése"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Csak támogatott alkalmazásnál"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> használata"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> megnyitása"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Színkorrekció használata"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Felirat megjelenítése"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Csak támogatott alkalmazásnál"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Feliratméret és -stílus"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> betűméret"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"További lehetőségek"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomália"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomália"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomália"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Szürkeárnyalatos"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Vörös-zöld"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Vörös-zöld"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Kék-sárga"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Háttérben történő használat korlátozása"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Az alkalmazás háttérben futásának engedélyezése"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Az alkalmazás háttérben futása le van tiltva"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"A háttérben történő használat nem korlátozható"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"A háttérben történő használat nem korlátozható"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Korlátozza a háttértevékenységet?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Ha korlátozza az alkalmazások háttértevékenységét, lehetséges, hogy hibásan fognak működni"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Az alkalmazás nem korlátozható, mert nincs beállítva az akkumulátor optimalizálására.\n\nA korlátozáshoz kapcsolja be az akkumulátoroptimalizálást."</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Ütemezés beállítása"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Az akkumulátor élettartamának növelése"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Kikapcsolás töltés közben"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Az Akkumulátorkímélő mód <xliff:g id="PERCENT">%1$s</xliff:g>-os töltöttségi szint elérésekor kikapcsol"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Az Akkumulátorkímélő mód <xliff:g id="PERCENT">%1$s</xliff:g>-os töltöttségi szint elérésekor kikapcsol"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Az Akkumulátorkímélő mód <xliff:g id="PERCENT">%1$s</xliff:g>-os töltöttségi szint elérésekor kikapcsol"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Az Akkumulátorkímélő mód kikapcsol, ha a telefon akkumulátora <xliff:g id="PERCENT">%1$s</xliff:g>-os szintre emelkedik."</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Az Akkumulátorkímélő mód kikapcsol, ha a táblagép akkumulátora <xliff:g id="PERCENT">%1$s</xliff:g>-os szintre emelkedik."</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Az Akkumulátorkímélő mód kikapcsol, ha az eszköz akkumulátora <xliff:g id="PERCENT">%1$s</xliff:g>-os szintre emelkedik."</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Bekapcsolás"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Visszaállítás"</string>
     <string name="tts_play" msgid="2945513377250757221">"Lejátszás"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Adaptív kapcsolódás"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"A hálózati kapcsolatok automatikus kezelésével megnöveli az akkumulátor élettartamát és javítja az eszköz teljesítményét"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Hitelesítési adatok tárolója"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Tanúsítvány telepítése"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Tanúsítványok telepítése tárhelyről"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Felhasználó hitelesítési adatai"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"A tárolt hitelesítési adatok megtekintése és módosítása"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Speciális"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Tárhelytípus"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardveresen támogatott"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Kizárólag szoftveres"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"A hitelesítési adatok nem érhetők el ennél a felhasználónál"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN-hez és alkalmazásokhoz telepítve"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi-hez telepítve"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Fizetés a terminálnál"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Állítson be egy alkalmazást a fizetéshez. Ezután elég csak telefonja hátulját odatartani az érintéses fizetést jelző szimbólummal ellátott terminálhoz."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Értem"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Egyebek…"</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Továbbiak…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Alapértelmezett fizetési alkalmazás beállítása"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Alapértelmezett fizetési alkalmazás frissítése"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Érintéses terminálon a következő alkalmazással fizethet: <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Mindig ezt használja hívásokhoz"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"SIM kiválasztása az adathasználathoz"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"SIM-kártya kiválasztása SMS-ekhez"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Váltás az adatforgalomhoz használt SIM kártyák között, ez legfeljebb egy percet vesz igénybe."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Az adatforgalomhoz használt SIM-kártya váltása folyamatban – ez legfeljebb egy percet vesz igénybe…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Hívás a következővel:"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Válasszon egy SIM kártyát"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"<xliff:g id="CARD_NUMBER">%1$d</xliff:g>. SIM-kártya"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"rutin, ütemezés, akkumulátorkímélő mód, energiamegtakarítás, akkumulátor, automatikus, százalék"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, továbbfejlesztett telefonhívás, 4G-hívás"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"nyelv hozzáadása, egy nyelv hozzáadása"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"betűméret"</string>
     <string name="default_sound" msgid="6604374495015245195">"Alapértelmezett hang"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Csörgetés és értesítések hangereje <xliff:g id="PERCENTAGE">%1$s</xliff:g>-on"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Hangerő, rezgés, Ne zavarjanak"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Indítási hangok"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Élő feliratozás"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Automatikus feliratozás"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Nincs"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ütemezés beállítva</item>
-      <item quantity="one">1 ütemezés beállítva</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Nincs}=1{1 ütemezés beállítva}other{# ütemezés beállítva}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Ne zavarjanak"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Értesítés fogadása csak fontos személyektől és alkalmazásoktól"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"A megszakítások korlátozása"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Csak prioritásos"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Be/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Ki/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Ki"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Be"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Mindig kérdezzen rá"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Kikapcsolásig"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> óra</item>
-      <item quantity="one">1 óra</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> perc"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> szabály automatikusan bekapcsolhat</item>
-      <item quantity="one">1 szabály automatikusan bekapcsolhat</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 óra}other{# óra}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 perc}other{# perc}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Ki}=1{Ki / 1 szabály automatikusan bekapcsolhat}other{Ki / # szabály automatikusan bekapcsolhat}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Mi szakíthatja meg a „Ne zavarjanak” módot?"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Személyek"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Alkalmazások"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Az alacsonyabb prioritású értesítések automatikus beállítása diszkrétre"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Értesítések adaptív rangsorolása"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Értesítések automatikus rangsorolása relevancia szerint"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Visszajelzés adaptív értesítésekről"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Az értesítések módosításainak jelzése, valamint a rendszernek küldhető visszajelzési lehetőség megjelenítése"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Javasolt műveletek és válaszok"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Javasolt műveletek és válaszok automatikus megjelenítése"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Legutóbbi és elhalasztott értesítések megjelenítése"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"„Ne zavarjanak” elérés"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"A Ne zavarjanak mód engedélyezése"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Egy telepített alkalmazás sem kért „Ne zavarjanak” elérést"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Alkalmazások betöltése…"</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Alkalmazások betöltése…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Kérésére az Android letiltotta a jelen alkalmazás értesítéseinek megjelenését ezen az eszközön"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Kérésére az Android letiltotta a jelen értesítési kategória megjelenését ezen az eszközön"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Kérésére az Android letiltotta az értesítések jelen csoportjának megjelenését ezen az eszközön"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Az összes beszélgetés"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Elsődleges beszélgetések"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Nincs"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> beszélgetés</item>
-      <item quantity="one">1 beszélgetés</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Nincs"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Nincs}=1{1 beszélgetés}other{# beszélgetés}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Megszakítás engedélyezve"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Hívások"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Hívások"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Győződjön meg arról, hogy az eszköz csörgésre van állítva, hogy az engedélyezett hívások hangot adhassanak ki"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"A(z) „<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>” ütemezésnél a bejövő hívások le vannak tiltva. A beállítások módosításával lehetővé teheti, hogy ismerősei, családtagjai vagy a névjegyei között megtalálható más személyek elérhessék Önt."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Csillagozott névjegyek"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> további</item>
-      <item quantity="one">1 további</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Nincs"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Nincs}=1{{contact_1}}=2{{contact_1} és {contact_2}}=3{{contact_1}, {contact_2} és {contact_3}}other{{contact_1}, {contact_2} és további #}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Üzenetek"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"üzenet"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"SMS-ek"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"A(z) „<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>” ütemezésnél le vannak tiltva a beérkező üzenetek. A beállítások módosításával lehetővé teheti, hogy ismerősei, családtagjai vagy a névjegyei között megtalálható más személyek elérhessék Önt."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Minden üzenet eljuthat Önhöz"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Minden hívás eljuthat Önhöz"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Nincs"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> névjegy</item>
-      <item quantity="one">1 névjegy</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Nincs}=1{1 névjegy}other{# névjegy}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Bárki"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Névjegyek"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Csillagozott névjegyek"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Összes értesítés"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Egyes értesítések"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"A kiválasztott személyek továbbra is elérhetik Önt, akkor is, ha nem engedélyezi az alkalmazásoknak, hogy megzavarják"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other">A következők megszakíthatják a „Ne zavarjanak” módot: <xliff:g id="APP_NAMES">%s</xliff:g></item>
-      <item quantity="one">A következő megszakíthatja a „Ne zavarjanak” módot: <xliff:g id="APP_NAME_0">%s</xliff:g></item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> további"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Egy alkalmazás sem szakíthatja meg a „Ne zavarjanak” módot}=1{A következő megszakíthatja a „Ne zavarjanak” módot: {app_1}}=2{A következők megszakíthatják a „Ne zavarjanak” módot: {app_1} és {app_2}}=3{A következők megszakíthatják a „Ne zavarjanak” módot: {app_1}, {app_2} és {app_3}}other{A következők megszakíthatják a „Ne zavarjanak” módot: {app_1}, {app_2} és # egyéb}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Alkalmazások"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Összes értesítés"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Egyes értesítések"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Azok az értesítések, amelyeknél engedélyezve van a megszakítás"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Összes értesítés engedélyezése"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other">A következők megszakíthatják a „Ne zavarjanak” módot: <xliff:g id="SOUND_CATEGORIES">%s</xliff:g></item>
-      <item quantity="one">A következő megszakíthatja a „Ne zavarjanak” módot: <xliff:g id="SOUND_CATEGORY">%s</xliff:g></item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Semmi sem szakíthatja meg a „Ne zavarjanak” módot"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> további"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Semmi sem szakíthatja meg a „Ne zavarjanak” módot}=1{A következő megszakíthatja a „Ne zavarjanak” módot: {sound_category_1}}=2{A következők megszakíthatják a „Ne zavarjanak” módot: {sound_category_1} és {sound_category_2}}=3{A következők megszakíthatják a „Ne zavarjanak” módot: {sound_category_1}, {sound_category_2} és {sound_category_3}}other{A következők megszakíthatják a „Ne zavarjanak” módot: {sound_category_1}, {sound_category_2} és # egyéb}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Semmi sem szakíthatja meg a „Ne zavarjanak” módot"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Senki sem szakíthatja meg a „Ne zavarjanak” módot"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Néhány személy megszakíthatja a „Ne zavarjanak” módot"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Minden személy megszakíthatja a „Ne zavarjanak” módot"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"Az USB-t vezérli:"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Társított eszköz"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Ez az eszköz"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Átváltás folyamatban..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Átváltás…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Sikertelen átváltás"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Az eszköz töltése"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Folyamatban van a csatlakoztatott eszköz töltése"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Részletek"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Adatforgalom-csökkentő"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Korlátlan adat"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Háttéradatok kikapcsolva"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Háttéradatok kikapcsolva"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Be"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Ki"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Az Adatforgalom-csökkentő használata"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Ha az eszköz zárolva van, ne lehessen választ vagy egyéb szöveget beírni az értesítéseknél"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Szokásos helyesírás-ellenőrző"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Helyesírás-ellenőrző"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Helyesírás-ellenőrző használata"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Helyesírás-ellenőrző használata"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Nincs kiválasztva"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(nincs)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"A tárhelykezelő tárhely felszabadítása érdekében eltávolítja az eszközről azokat a fotókat és videókat, amelyekről már készült biztonsági másolat."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Fotók és videók eltávolítása"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Tárhelykezelő"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Tárhelykezelő használata"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Tárhelykezelő használata"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automatikus"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Kézi"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Szabadítson fel tárhelyet most"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Dupla koppintás a képernyő megtekintéséhez"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Koppintson duplán a táblagép képernyőjének megtekintéséhez"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Koppintson duplán az eszköz képernyőjének megtekintéséhez"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Értesítések csúsztatással"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Csúsztassa lefelé az ujját a képernyő alsó részén az értesítések megtekintéséhez"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Egykezes mód"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Egykezes mód használata"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Kilépés alkalmazások váltásakor"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Időkorlát"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 másodperc"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 másodperc"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 másodperc"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"elérhetőség"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Az idő, az értesítések és egyéb információk megtekintéséhez koppintson duplán a képernyőre."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Ellenőrzés felemeléssel"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Ellenőrzés a táblagép felemelésével"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Koppintson a táblagép megtekintéséhez"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Koppintson az eszköz megtekintéséhez"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Az idő, az értesítések és egyéb információk megtekintéséhez koppintson a képernyőre."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Pánik gomb"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"A bekapcsológombot egymás után gyorsan ötször lenyomva vészhelyzeti műveleteket kezdeményezhet."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Figyelmeztetés hangja"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Értesítés a műveletek indítása előtt"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Vészhelyzet esetén értesítendő személyek"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Értesítések ujjlenyomattal"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Ujjlenyomat csúsztatása"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Megtekintheti értesítéseit, ha ujját lefelé húzza a telefonja hátulján található ujjlenyomat-érzékelőn."</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Engedélyezés minden alkalmazásnál"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Grafikus driver kiválasztása"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Alapértelmezett"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Játékdriver"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Játékdriver"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Fejlesztői driver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Rendszer grafikus drivere"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Nincs hálózat. Próbálja újra."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(tiltott)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Nincs SIM-kártya"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Nincs SIM-kártya"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Nincs"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"A csatlakozáshoz SIM-kártya szükséges"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"A csatlakozáshoz <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> SIM-kártya szükséges"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Előnyben részesített hálózati mód: preferált WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Előnyben részesített hálózati mód: csak GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Előnyben részesített hálózati mód: csak WCDMA"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobiladat"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Adathozzáférés a mobilhálózaton keresztül"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"A telefon automatikusan erre a szolgáltatóra vált, ha hatókörön belül van"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Nem áll rendelkezésre SIM-kártya"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Hívásokra vonatkozó preferencia"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS-preferencia"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Mindig kérdezzen rá"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Beállítások feletti képernyőfedvény engedélyezése"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Engedélyezi a más alkalmazások felett megjeleníthető alkalmazások számára a Beállítások képernyők fedését"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Média"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Lejátszó elrejtése a munkamenet befejezésekor"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"A lejátszó lehetővé teszi a munkamenet folytatását a kibontott Gyorsbeállítások panelen."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Médialejátszó a Gyorsbeállításokban"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Médialejátszó hosszabb időtartamon keresztüli megjelenítése a lejátszás könnyebb folytatása érdekében"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Lejátszó elrejtése"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Lejátszó megjelenítése"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Nincs rendelkezésre álló lejátszó"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Engedélyezett alkalmazások"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"média"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"A Bluetooth bekapcsol"</string>
 </resources>
diff --git a/res/values-hy/arrays.xml b/res/values-hy/arrays.xml
index 50238b9..76e669e 100644
--- a/res/values-hy/arrays.xml
+++ b/res/values-hy/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Միջին"</item>
     <item msgid="6740026006576843477">"Երկար"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Կարճ"</item>
+    <item msgid="7397961711906421599">"Միջին"</item>
+    <item msgid="4079132024502041928">"Երկար"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Կանխադրված"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA+LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Համաշխարհային"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Միայն TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Գլոբալ"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index a3ae8f8..ea24a14 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Կողպէկրանին ցույց տալ պրոֆիլի տվյալները"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Հաշիվներ"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Տեղադրություն"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Օգտագործել տեղորոշումը"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Օգտագործել տեղորոշումը"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Անջատված է"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">Միացված է – Տեղադրության տվյալները հասանելի են <xliff:g id="COUNT_1">%1$d</xliff:g> հավելվածի</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Օգտագործեք դեմքը՝ նույնականացման համար"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Սկսել"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Եթե դեմքով ապակողպման պարզեցված եղանակն անջատված է, կարգավորման որոշ քայլեր կարող են ինչպես հարկն է չաշխատել TalkBack-ի հետ։"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Հետ"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Շարունակել կարգավորումը"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Ցուցադրել հասանելիութ. կարգավոր."</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="other">Պետք է <xliff:g id="NUMBER_1">%d</xliff:g>-ից քիչ թվանշան պարունակի</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Սարքի ադմինիստրատորը չի թույլատրում օգտագործել վերջին PIN կոդերը"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"ՏՏ ադմինիստրատորն արգելափակել է պարզ PIN կոդերը: Փորձեք մեկ այլ PIN:"</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Այն չի կարող պարունակել անվավեր գրանշան"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Պետք է պարունակի առնվազն մեկ տառ"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Պետք է պարունակի առնվազն մեկ թվանշան"</string>
@@ -653,7 +655,6 @@
       <item quantity="other">Պետք է պարունակի առնվազն <xliff:g id="COUNT">%d</xliff:g> ոչ թվային նիշ</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Սարքի ադմինիստրատորը թույլ չի տալիս օգտագործել վերջին գաղտնաբառը"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"ՏՏ ադմինիստրատորն արգելափակել է պարզ գաղտնաբառերը: Փորձեք մեկ այլ գաղտնաբառ:"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Թվանշանների աճող, նվազող կամ կրկնվող հաջորդականությունն արգելված է"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Հաստատել"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Չեղարկել"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Միացնել Wi-Fi-ը"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Օգտագործել Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Օգտագործել Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wi‑Fi կարգավորումներ"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Կարգավորել և կառավարել անլար միացման կետերը"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"«<xliff:g id="SSID">%1$s</xliff:g>» ցանցին միանալու համար տեսախցիկը պահեք QR կոդի վրա"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Wi‑Fi ցանցին միանալու համար սկանավորեք QR կոդը"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Կիսվել Wi‑Fi-ով"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"«<xliff:g id="SSID">%1$s</xliff:g>» ցանցին միանալու և գաղտնաբառով կիսվելու համար սկանավորեք այս QR կոդը"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"«<xliff:g id="SSID">%1$s</xliff:g>» ցանցին միանալու համար սկանավորեք այս QR կոդը մեկ այլ սարքով"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"«<xliff:g id="SSID">%1$s</xliff:g>» ցանցին միանալու համար սկանավորեք այս QR կոդը"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Նորից փորձեք: Եթե խնդիրը չվերանա, դիմեք սարքի արտադրողին"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Սխալ առաջացավ"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi-Fi-ի գաղտնաբառ՝ <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Թեժ կետի գաղտնաբառը՝ <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Ավտոմատ միացում"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Թույլատրել հեռախոսին ավտոմատ միանալ այս ցանցի տարածքում"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Թույլատրել պլանշետին ավտոմատ միանալ այս ցանցի տարածքում"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Թույլատրեք միանալ այս ցանցին, երբ այն հասանելի լինի"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Ավելացնել սարք"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Այս ցանցին սարք ավելացնելու համար օգտագործեք QR կոդ"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR կոդը վավեր ձևաչափ չէ"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Օգտագործել համակարգի հավաստագրերը"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Չտրամադրել"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Չվավերացնել"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Վկայականը նշված չէ: Միացումը գաղտնի չի լինի:"</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Ցանցի անունը չափազանց երկար է։"</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Անհրաժեշտ է նշել տիրույթը:"</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Պահանջվում է հավաստագիր։"</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Միանալ"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi-ը միացած է"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Միացած է <xliff:g id="NETWORK_NAME">%1$s</xliff:g> ցանցին"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Միացում <xliff:g id="NETWORK_NAME">%1$s</xliff:g> ցանցին"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Միացում…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Ցանցին միանալ չհաջողվեց"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Ցանցն անհասանելի է"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Հավելվածը բովանդակություն է տարածում: Ինտերնետ կապ տրամադրելու համար անջատեք, ապա կրկին միացրեք թեժ կետը:"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Գաղտնաբառ նշված չէ"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Թեժ կետի անունը"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>-ը միանում է…"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> թեժ կետը միանում է…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Այլ սարքերը կարող են միանալ <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>-ին"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Թեժ կետի գաղտնաբառը"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Հաճախականությունների միջակայք"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Սահուն պատկեր"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Որոշակի բովանդակության համար թարմացման հաճախականությունը 60-ից կդառնա 90 Հց։ Երկարացնում է մարտկոցի օգտագործման ժամանակը։"</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Սահուն պատկեր"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Պարտադիր միացնել 90 Հց թարմացման հաճախականությունը"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Էկրանի թարմացման բարձր հաճախականությունը լավացնում է հպման արձագանքը և շարժանկարների որակը։ Այն նաև երկարացնում է մարտկոցի օգտագործման ժամանակը։"</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Ադապտիվ քնի ռեժիմ"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Միացված է – Եթե նայում եք էկրանին, այն չի անջատվի։"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android-ի տարբերակը"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android-ի անվտանգության համակարգի թարմացում"</string>
     <string name="model_info" msgid="8997566254717810904">"Մոդելը"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Մոդել՝ %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Մոդել և սարքակազմ"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Սարքակազմի տարբերակը"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Սարքավորման ID-ն"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Ցանցի կարգավորումները վերակայվել են"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Չհաջողվեց ջնջել SIM քարտերը"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Սխալի պատճառով չհաջողվեց ջնջել ներբեռնված SIM-երը։\n\nՎերագործարկեք սարքը և նորից փորձեք։"</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Ջնջել բոլոր տվյալները (գործարանային կարգավորումների վերականգնում)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Ջնջել բոլոր տվյալները (գործարանային կարգավորումների վերականգնում)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Կջնջվեն բոլոր տվյալները ձեր պլանշետի "<b>"ներքին հիշողությունից"</b>", այդ թվում՝\n\n"<li>"Ձեր Google հաշիվը"</li>\n<li>"Համակարգի և հավելվածների տվյալներն ու կարգավորումները"</li>\n<li>"Ներբեռնված հավելվածները"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Կջնջվեն բոլոր տվյալները ձեր հեռախոսի "<b>"ներքին հիշողությունից"</b>", այդ թվում՝\n\n"<li>"Ձեր Google հաշիվը"</li>\n<li>"Համակարգի և հավելվածների տվյալներն ու կարգավորումները"</li>\n<li>"Ներբեռնված հավելվածները"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Հաշիվներն այս սարքում՝\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Այս սարքում այլ օգտատերերի հաշիվներ կան:\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Երաժշտություն"</li>\n<li>"Լուսանկարներ"</li>\n<li>"Օգտվողի այլ տվյալներ"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM քարտեր"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Բջջային ծառայությունների ձեր փաթեթը չի չեղարկվի:"</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Երաժշտությունը, նկարները և այլ տվյալները ջնջելու համար "<b>"USB կրիչը "</b>"պետք է ջնջվի:"</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Երաժշտությունը, նկարները և այլ տվյալները "<b>"SD քարտից"</b>" մաքրելու համար` այն պետք է ջնջել:"</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Ջնջել բոլոր տվյալները (գործ. վերակայում)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Ջնջել բոլոր տվյալները (գործ. վերակայում)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Ձեր պլանշետի "<b>"ներքին հիշողությունից"</b>" կջնջվեն բոլոր տվյալները, այդ թվում՝\n\n"<li>"Ձեր Google հաշիվը"</li>\n<li>"Համակարգի և հավելվածների տվյալներն ու կարգավորումները"</li>\n<li>"Ներբեռնված հավելվածները"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Ձեր հեռախոսի "<b>"ներքին հիշողությունից"</b>" կջնջվեն բոլոր տվյալները, այդ թվում՝\n\n"<li>"Ձեր Google հաշիվը"</li>\n<li>"Համակարգի և հավելվածների տվյալներն ու կարգավորումները"</li>\n<li>"Ներբեռնված հավելվածները"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Հաշիվներն այս սարքում՝\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Այս սարքում այլ օգտատերերի հաշիվներ կան։\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Երաժշտությունը"</li>\n<li>"Լուսանկարները"</li>\n<li>"Օգտատիրոջ մյուս տվյալները"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM քարտեր"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Ձեր սակագնային պլանը չի չեղարկվի։"</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Երաժշտությունը, նկարները և մյուս տվյալները հեռացնելու համար անհրաժեշտ է մաքրել "<b>"USB կրիչը "</b>"։"</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Երաժշտությունը, նկարները և մյուս տվյալները հեռացնելու համար անհրաժեշտ է մաքրել "<b>"SD քարտը"</b>"։"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Ջնջել USB կրիչը"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Ջնջել SD քարտը"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Ջնջել ներքին USB կրիչի բոլոր տվյալները, ինչպիսիք են երաժշտությունը կամ լուսանկարները"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Ջնջել SD քարտի բոլոր տվյալները, ինչպիսիք են երաժշտությունը կամ լուսանկարները"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Ջնջել բոլոր տվյալները"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Ջնջել բոլոր տվյալները"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Ձեր բոլոր անձնական տվյալները և ներբեռնված հավելվածները կջնջվեն։ Այս գործողությունը չեք կարող հետարկել:"</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Ձեր բոլոր անձնական տվյալները, այդ թվում՝ ներբեռնված հավելվածները և SIM քարտերը կջնջվեն։ Այս գործողությունը չեք կարող հետարկել:"</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Ջնջել ամենը"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Վերականգնում տեղի չի ունեցել, քանի որ համակարգի մաքրիչ ծառայությունը հասանելի չէ:"</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Ջնջե՞լ բոլոր տվյալները"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Այս օգտատերը չի կարող վերակայել սարքը և վերականգնել գործարանային կարգավորումները"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Ջնջում"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Խնդրում ենք սպասել..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Ջնջել բոլոր տվյալները"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Ջնջել բոլոր տվյալները"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Ձեր բոլոր անձնական տվյալները և ներբեռնված հավելվածները կջնջվեն։ Այս գործողությունը չեք կարող հետարկել։"</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Ձեր բոլոր անձնական տվյալները, այդ թվում՝ ներբեռնված հավելվածները և SIM քարտերը կջնջվեն։ Այս գործողությունը չեք կարող հետարկել։"</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Ջնջե՞լ բոլոր տվյալները"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Այս օգտատերը չի կարող վերակայել սարքը և վերականգնել գործարանային կարգավորումները"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Ջնջում"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Սպասեք…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Զանգի կարգավորումները"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Կարգավորեք ձայնային փոստը, զանգի վերահասցեավորումը, զանգի սպասումը, զանգողի ID-ն"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB մոդեմ"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Հնարավոր չէ միանալ ավելի քան <xliff:g id="MAXCONNECTION">%1$d</xliff:g> սարքերի հետ:"</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-ը կանջատվի:"</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ethernet մոդեմ"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Տարածել հեռախոսի ինտերնետ կապը USB Ethernet-ով"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Տարածել հեռախոսի ինտերնետ կապը Ethernet-ով"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Օգտագործեք թեժ կետն ու մոդեմի ռեժիմը՝ բջջային ցանցի միջոցով մյուս սարքերին ինտերնետային կապ տրամադրելու համար: Հավելվածները նաև կարող են ստեղծել թեժ կետ՝ մոտակա սարքերին նյութեր փոխանցելու համար:"</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Օգտագործեք թեժ կետն ու մոդեմի ռեժիմը՝ ձեր Wi-Fi-ի կամ բջջային ցանցի միջոցով մյուս սարքերին ինտերնետ կապ տրամադրելու համար։ Հավելվածները նույնպես կարող են թեժ կետ ստեղծել՝ մոտակա սարքերի հետ բովանդակությամբ կիսվելու համար։"</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Օգնություն"</string>
@@ -1899,7 +1896,7 @@
     <string name="enable_compatibility" msgid="1163387233622859712">"Աստիճանակարգել հավելվածները"</string>
     <string name="unknown" msgid="8192160131923461175">"Անհայտ"</string>
     <string name="sort_order_alpha" msgid="3400680865280266582">"Դասակարգել ըստ անունների"</string>
-    <string name="sort_order_size" msgid="7731928486199737223">"Տեսակավորել ըստ չափի"</string>
+    <string name="sort_order_size" msgid="7731928486199737223">"Դասավորել ըստ չափի"</string>
     <string name="sort_order_recent_notification" msgid="1496198895330443073">"Վերջինները"</string>
     <string name="sort_order_frequent_notification" msgid="4063700985742284794">"Հաճախ ուղարկողները"</string>
     <string name="show_running_services" msgid="8666008279959853318">"Ցույց տալ ընթացիկ ծառայությունները"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Ենթագրերի կարգավորումներ"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Խոշորացում"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Խոշորացման հատվածը"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Խոշորացումը միացված է"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Ընտրեք, թե էկրանի որ հատված(ներ)ն է պետք խոշորացնել"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Լիաէկրան"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Էկրանի հատվածը"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Լիաէկրան ռեժիմ և մասնակի էկրանի ռեժիմ"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Խոշորացնել ամբողջ էկրանը"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Խոշորացնել էկրանի որոշակի հատվածը"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Օգտագործե՞լ «Հատուկ գործառույթներ» կոճակը"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Երբ դուք օգտագործում եք եռակի հպումը՝ էկրանի որոշակի հատված խոշորացնելու համար, տեքստի մուտքագրումը և այլ գործողություններ կարող են դանդաղել։\n\nՕգտագործե՞լ «Հատուկ գործառույթներ» կոճակը խոշորացման համար։"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Օգտագործել «Հատուկ գործառույթներ» կոճակը"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Խոշորացնել էկրանը եռակի հպման միջոցով"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Խոշորացման կարգավորումներ"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Խոշորացում եռակի հպման միջոցով"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Խոշորացում դյուրանցման միջոցով"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Սնուցման կոճակը ավարտում է զանգը"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Մկնիկի խոշոր նշորդ"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Անջատել շարժունացումը"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Մոնո"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Աուդիո նվագարկելիս միավորել ալիքները"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Աուդիո բալանս"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Ձախ"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Աջ"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Մոնո"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Աուդիո նվագարկելիս միավորել ալիքները"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Աուդիո բալանս"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Ձախ"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Աջ"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Կանխադրված"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 վայրկյան"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 վայրկյան"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Թրթռոց ծանուցման ժամանակ"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Թրթռազանգ"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Հպման արձագանք"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Օգտագործել <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> հավելվածը"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Բացել <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> հավելվածը"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Օգտագործել գունաշտկումը"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Ցուցադրել ենթագրերը"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Միայն աջակցվող հավելվածի համար"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Օգտագործել <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>-ը"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Բացել <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> հավելվածը"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Օգտագործել գունաշտկումը"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Ցուցադրել ենթագրերը"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Միայն աջակցվող հավելվածի համար"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Ենթագրերի չափը և ոճը"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Տեքստի չափը – <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Այլ ընտրանքներ"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Դեյտերանոմալիա"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Պրոտանոմալիա"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Տրիտանոմալիա"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Մոխրագույնի երանգներ"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Կարմիր-կանաչ"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Կարմիր-կանաչ"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Կապույտ-դեղին"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Ֆոնային ռեժիմում աշխատանքի սահմանափակում"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Թույլ տալ հավելվածին աշխատել ֆոնային ռեժիմում"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Հավելվածին չի թույլատրվում աշխատել ֆոնում"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Ֆոնային ռեժիմում աշխատանքը հնարավոր չէ սահմանափակել"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Ֆոնային ռեժիմում աշխատանքը հնարավոր չէ սահմանափակել"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Սահմանափակե՞լ ֆոնային գործողությունները"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Հավելվածի ֆոնային գործողությունների սահմանափակումը կարող է ազդել վերջինիս աշխատանքի վրա"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Մարտկոցի օպտիմալացումն այս հավելվածի համար կարգավորված չէ։\n\nՄիացրեք այն՝ հավելվածը սահմանափակելու համար։"</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Ստեղծել ժամանակացույց"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Երկարացնել մարտկոցի աշխատաժամանակը"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Անջատել, երբ լիցքավորվի"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Մարտկոցի տնտեսման ռեժիմն անջատվում է, երբ հեռախոսի լիցքը <xliff:g id="PERCENT">%1$s</xliff:g> է"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Մարտկոցի տնտեսման ռեժիմն անջատվում է, երբ պլանշետի լիցքը <xliff:g id="PERCENT">%1$s</xliff:g> է"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Մարտկոցի տնտեսման ռեժիմն անջատվում է, երբ ձեր սարքի լիցքը <xliff:g id="PERCENT">%1$s</xliff:g> է"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Մարտկոցի տնտեսման ռեժիմն անջատվում է, երբ հեռախոսի լիցքը <xliff:g id="PERCENT">%1$s</xliff:g>-ից անցնում է։"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Մարտկոցի տնտեսման ռեժիմն անջատվում է, երբ պլանշետի լիցքը <xliff:g id="PERCENT">%1$s</xliff:g>-ից անցնում է։"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Մարտկոցի տնտեսման ռեժիմն անջատվում է, երբ սարքի լիցքը <xliff:g id="PERCENT">%1$s</xliff:g>-ից անցնում է։"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Միացնել"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Վերակայել"</string>
     <string name="tts_play" msgid="2945513377250757221">"Նվագարկել"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Հարմարվող կապ"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Ձեր ցանցային կապերն ավտոմատ կառավարելու միջոցով երկարացնում է մարտկոցի աշխատանքի տևողությունը և բարելավում սարքի արդյունավետությունը"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Մուտքի տվյալների պահոց"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Հավաստագրի տեղադրում"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Տեղադրել հավաստագրերը պահոցից"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Օգտատիրոջ մուտքի տվյալներ"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Դիտել և փոփոխել պահված մուտքի տվյալները"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Ընդլայնված"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Պահոցի տեսակը"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Սարքակազմ"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Միայն ծրագրային"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Հավատարմագրերը հասանելի չեն այս օգտատիրոջ"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Տեղադրվել է VPN-ի և հավելվածների համար"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Տեղադրվել է Wi-Fi-ի համար"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Վճարում տերմինալով"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Կարգավորեք վճարային հավելվածը, ապա հեռախոսի հետևի մասով հպեք անհպում վճարման նշան ունեցող որևէ տերմինալի։"</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Պարզ է"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Ավելին..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Ավելին…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Ընտրեք վճարման կանխադրված հավելված"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Թարմացնել վճարման կանխադրված հավելվածը"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Անհպում վճարման դեպքում կօգտագործվի <xliff:g id="APP">%1$s</xliff:g> հավելվածը"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Միշտ օգտագործել այս քարտը՝ զանգերի համար"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Ընտրեք SIM քարտը տվյալների համար"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Ընտրեք SIM քարտ SMS-ների համար"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Տվյալների SIM քարտը փոխարկվում է: Դա կարող է մինչև մեկ րոպե տևել..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Անցում է կատարվում բջջային ինտերնետի SIM քարտին։ Դա կարող է մինչև մեկ րոպե տևել…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Զանգել հետևյալով"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Ընտրեք SIM քարտը"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3268,7 +3268,7 @@
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"մատնահետք, ավելացնել մատնահետք"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"խամրեցված էկրան, հպէկրան, մարտկոց, խելացի պայծառություն, դինամիկ պայծառություն, ավտոմատ պայծառություն"</string>
     <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"խամրած էկրան, քնի ռեժիմ, մարտկոց, ժամանակի սպառում, ուշադրություն, էկրան, ցուցադրել, անգործուն ռեժիմ"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"պտտել, շրջել, պտույտ, ուղղահայաց, հորիզոնական, դիրք, դիմանկար, բնանկար"</string>
+    <string name="keywords_auto_rotate" msgid="7914655570000378975">"պտտել, շրջել, պտույտ, ուղղաձիգ, հորիզոնական, դիրք, դիմանկար, բնանկար"</string>
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"թարմացնել, Android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"չանհանգստացնել, ժամանակացույց, ծանուցումներ, արգելափակել, անձայն ռեժիմ, թրթռալ, քուն, աշխատանք, կենտրոնացում, ձայն, անջատել ձայնը, օր, աշխատանքային օր, հանգստյան օր, աշխատանքային օրվա երեկո, միջոցառում"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"էկրան, կողպման ժամանակը, անջատում, կողպէկրան"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"գործողությունների հերթականություն, ժամանակացույց, մարտկոցի տնտեսում, էներգախնայում, մարտկոց, ավտոմատ, տոկոս"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, ընդլայնված հնարավորություններով զանգեր, 4g զանգեր"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"ավելացնել լեզու, նոր լեզու"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"տեքստի չափը"</string>
     <string name="default_sound" msgid="6604374495015245195">"Կանխադրված զանգերանգը"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Զանգի ու ծանուցումների ազդանշանների ուժգնությունը <xliff:g id="PERCENTAGE">%1$s</xliff:g> է"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Ձայնի ուժգնություն, թրթռոց, Չանհանգստացնել ռեժիմ"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Միացման ձայներ"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Կենդանի ենթագրեր"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Ավտոմատ ավելացնել ենթագրեր"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Չկան"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one">Սահմանված է <xliff:g id="ON_COUNT">%d</xliff:g> ժամանակացույց</item>
-      <item quantity="other">Սահմանված է <xliff:g id="ON_COUNT">%d</xliff:g> ժամանակացույց</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Ոչ մի ժամանակացույց}=1{Սահմանված է 1 ժամանակացույց}one{Սահմանված է # ժամանակացույց}other{Սահմանված է # ժամանակացույց}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Չանհանգստացնել"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Ծանուցում ստանալ միայն կարևոր մարդկանցից և հավելվածներից"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Ընդհատումների սահմանափակում"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Միայն կարևորները"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>։ <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Միացված է/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Անջատված է/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Անջատված է"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Միացված է"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Ամեն անգամ հարցնել"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Մինչև չանջատեք"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> ժամ</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> ժամ</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> րոպե"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> ժամանակացույց կարող է ավտոմատ միանալ</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ժամանակացույց կարող է ավտոմատ միանալ</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 ժամ}one{# ժամ}other{# ժամ}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 րոպե}one{# րոպե}other{# րոպե}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Անջատված է}=1{Անջատված է / 1 ժամանակացույց կարող է ավտոմատ միանալ}one{Անջատված է / # ժամանակացույց կարող է ավտոմատ միանալ}other{Անջատված է / # ժամանակացույց կարող է ավտոմատ միանալ}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Ինչը կարող է ընդհատել «Չանհանգստացնել» ռեժիմը"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Մարդիկ"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Հավելվածներ"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"«Անձայն» ռեժիմի ավտոմատ սահմանում ցածր առաջնահերթությամբ ծանուցումների համար"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Առաջնահերթության ավտոմատ որոշում"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Ավտոմատ տեսակավորել ծանուցումներն ըստ կարևորության"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Հարմարվող ծանուցումների մասին կարծիքի հայտնում"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Նշել ծանուցումների հետ կապված ճշգրտումները և ցույց տալ, թե ինչպես կարծիք ուղարկել համակարգին"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Առաջարկվող գործողություններ և պատասխաններ"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Ավտոմատ ցուցադրել առաջարկվող գործողություններն ու պատասխանները"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Տեսնել վերջին և հետաձգված ծանուցումները"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"«Չանհանգստացնել» գործառույթի հասանելիություն"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Թույլատրել «Չանհանգստացնել» ռեժիմը"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Տեղադրված հավելվածներից ոչ մեկը Չանհանգստացնել հարցում չի ուղարկել"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Ծրագրերը բեռնվում են..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Հավելվածների բեռնում…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Դուք անջատել եք այս հավելվածի ծանուցումները"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Դուք անջատել եք ծանուցումների այս կատեգորիան"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Դուք անջատել եք ծանուցումների այս խումբը"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Բոլոր զրույցները"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Կարևոր զրույցները"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Ոչ մեկը"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> խոսակցություն</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> խոսակցություն</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Ոչ մեկը"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Ոչ մի զրույց}=1{1 զրույց}one{# զրույց}other{# զրույց}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Ով կարող է ընդհատել"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Զանգեր"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Զանգեր"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Որպեսզի համոզվեք, որ թույլատրված զանգերը կազդանշվեն, ստուգեք՝ արդյոք սարքում միացված է զանգի ձայնը։"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"«<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>» կանոնի համար մուտքային զանգերն արգելափակված են: Փոխեք կարգավորումները, որպեսզի ձեր մտերիմները և այլ կոնտակտներ կարողանան կապվել ձեզ հետ:"</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Աստղանշված կոնտակտներ"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one">ևս <xliff:g id="NUM_PEOPLE">%d</xliff:g> կոնտակտ</item>
-      <item quantity="other">ևս <xliff:g id="NUM_PEOPLE">%d</xliff:g> կոնտակտ</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Չկան"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Ոչ մի կոնտակտ}=1{{contact_1}}=2{{contact_1} և {contact_2}}=3{{contact_1}, {contact_2} և {contact_3}}one{{contact_1} և {contact_2} օգտատերերն ու ևս # հոգի}other{{contact_1} և {contact_2} օգտատերերն ու ևս # հոգի}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Հաղորդագրություններ"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"հաղորդագրություններ"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Հաղորդագրություններ"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Երբ գործում է «<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>» կանոնը, մուտքային հաղորդագրություններն արգելափակվում են: Դուք կարող եք փոխել կարգավորումները, որպեսզի ձեր մտերիմները և այլ կոնտակտներ կարողանան կապվել ձեզ հետ:"</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Կստանաք բոլոր հաղորդագրությունները"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Կստանաք բոլոր զանգերը"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Չկան"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> կոնտակտ</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> կոնտակտ</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Ոչ մի կոնտակտ}=1{1 կոնտակտ}one{# կոնտակտ}other{# կոնտակտ}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Բոլորը"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Կոնտակտներ"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Աստղանշված կոնտակտներ"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Բոլոր ծանուցումները"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Որոշ ծանուցումներ"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Ընտրված մարդիկ կարող են կապվել ձեզ հետ, նույնիսկ եթե չեք թույլատրում հավելվածներին ընդհատել"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one">«<xliff:g id="APP_NAMES">%s</xliff:g>» հավելվածը</item>
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g></item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"ևս <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Ոչ մի հավելված չի կարող ընդհատել}=1{{app_1} հավելվածը կարող է ընդհատել}=2{{app_1} և {app_2} հավելվածները կարող են ընդհատել}=3{{app_1}, {app_2} և {app_3} հավելվածները կարող են ընդհատել}one{{app_1} և {app_2} հավելվածներն ու ևս # հավելված կարող են ընդհատել}other{{app_1} և {app_2} հավելվածներն ու ևս # հավելված կարող են ընդհատել}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Հավելվածներ"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Բոլոր ծանուցումները"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Որոշ ծանուցումներ"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Ծանուցումներ, որոնք կարող են ընդհատել"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Թույլատրել բոլոր ծանուցումները"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g></item>
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g></item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Ոչինչ չի կարող ընդհատել"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"ևս <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Ոչինչ չի կարող ընդհատել}=1{«{sound_category_1}» կատեգորիայի ձայները կարող են ընդհատել}=2{«{sound_category_1}» և «{sound_category_2}» կատեգորիաների ձայները կարող են ընդհատել}=3{«{sound_category_1}», «{sound_category_2}» և «{sound_category_3}» կատեգորիաների ձայները կարող են ընդհատել}one{«{sound_category_1}» և «{sound_category_2}» կատեգորիաների ու ևս # կատեգորիայի ձայները կարող են ընդհատել}other{«{sound_category_1}» և «{sound_category_2}» կատեգորիաների ու ևս # կատեգորիայի ձայները կարող են ընդհատել}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Ոչինչ չի կարող ընդհատել"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Ոչ ոք չի կարող ընդհատել"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Որոշ մարդիկ"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Բոլոր մարդիկ"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB-ն վերահսկող սարքը"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Միացված սարք"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Այս սարքը"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Փոխարկում…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Սպասեք…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Չհաջողվեց փոխարկել"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Այս սարքի լիցքավորում"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Միացված սարքի լիցքավորում"</string>
@@ -4100,8 +4071,8 @@
     <string name="memory_details" msgid="6133226869214421347">"Մանրամասներ"</string>
     <string name="memory_use_summary" msgid="3915964794146424142">"Վերջին 3 ժամվա մեջ օգտագործվել է միջինը <xliff:g id="SIZE">%1$s</xliff:g> հիշողություն"</string>
     <string name="no_memory_use_summary" msgid="6708111974923274436">"Վերջին 3 ժամվա մեջ հիշողություն չի օգտագործվել"</string>
-    <string name="sort_avg_use" msgid="4416841047669186903">"Տեսակավորել ըստ միջին օգտագործման"</string>
-    <string name="sort_max_use" msgid="3370552820889448484">"Տեսակավորել ըստ առավելագույն օգտագործման"</string>
+    <string name="sort_avg_use" msgid="4416841047669186903">"Դասավորել ըստ միջին օգտագործման"</string>
+    <string name="sort_max_use" msgid="3370552820889448484">"Դասավորել ըստ առավելագույն օգտագործման"</string>
     <string name="memory_performance" msgid="5448274293336927570">"Արդյունավետություն"</string>
     <string name="total_memory" msgid="5244174393008910567">"Ընդհանուր հիշողությունը"</string>
     <string name="average_used" msgid="690235917394070169">"Միջին օգագործում (%)"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Տեսնել մանրամասները"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Թրաֆիկի տնտեսում"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Տվյալների անսահմանափակ օգտագործում"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Ֆոնային տվյալներն անջատված են"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Տվյալների փոխանակման ֆոնային ռեժիմն անջատված է"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Միացված է"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Անջատված է"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Միացնել թրաֆիկի տնտեսումը"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Արգելել ծանուցումներում պատասխանների կամ այլ տեքստերի մուտքագրումը, երբ սարքը կողպված է"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Կանխադրված ուղղագրիչ"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Ընտրեք ուղղագրիչը"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Օգտագործել ուղղագրիչը"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Օգտագործել ուղղագրիչը"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Ընտրված չէ"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(ոչ մեկը)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">"՝ "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Տարածք ազատելու նպատակով հիշողության կառավարիչը ձեր սարքից հեռացնում է պահուստավորած լուսանկարները և տեսանյութերը:"</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Հեռացնել լուսանկարները և տեսանյութերը"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Հիշողության կառավարիչ"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Օգտագործել հիշողության կառավարիչը"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Օգտագործել հիշողության կառավարիչը"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Ավտոմատ"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Ձեռքով"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Ազատել տարածք հիմա"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Կրկնակի հպել՝ հեռախոսը ստուգելու համար"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Կրկնակի հպեք՝ պլանշետը ստուգելու համար"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Կրկնակի հպեք՝ սարքը ստուգելու համար"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Ինչպես ծանուցումներ դիտել"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Ծանուցումները դիտելու համար մատը սահեցրեք ներքև էկրանի ստորին մասում"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Մեկ ձեռքի ռեժիմ"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Օգտագործել մեկ ձեռքի ռեժիմը"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Դուրս գալ՝ մյուս հավելված անցնելու ժամանակ"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Սպասման ժամանակ"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 վայրկյան"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 վայրկյան"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 վայրկյան"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"մատչելիություն"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Ժամը, ծանուցումները և այլ տեղեկություններ տեսնելու համար կրկնակի հպել էկրանին:"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Բարձրացնել՝ հեռախոսը ստուգելու համար"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Բարձրացրեք՝ պլանշետը ստուգելու համար"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Հպեք՝ պլանշետը ստուգելու համար"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Հպեք՝ սարքը ստուգելու համար"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Ժամը, ծանուցումները և այլ տեղեկություններ տեսնելու համար կրկնակի հպեք էկրանին:"</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Խուճապային ազդանշանի կոճակ"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Արտակարգ իրավիճակներում գործարկեք SOS գործողությունները՝ սնուցման կոճակը 5 անգամ արագ սեղմելով։"</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Նախազգուշացնող ազդանշան"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Զգուշացնել նախքան գործողությունները սկսելը"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Շտապ դեպքերի համար նշված կոնտակտներ"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Ծանուցումները դիտելու համար օգտագործել մատնահետքերի սկաները"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Մատնահետքերի սկաներ"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Ծանուցումները տեսնելու համար՝ մատը սահեցրեք ներքև հեռախոսի հետևի մասում գտնվող մատնահետքերի սկաների վրա"</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Միացնել բոլոր հավելվածների համար"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Ընտրեք գրաֆիկական սարքավարը"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Կանխադրված"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Խաղային սարքավար"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Խաղային սարքավար"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Մշակողների համար նախատեսված սարքավար"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Համակարգի գրաֆիկական սարքավար"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Չհաջողվեց ցանցեր գտնել: Նորից փորձեք:"</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(արգելված)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"SIM քարտ չկա"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM քարտ"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"SIM քարտ չկա"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Չկա"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Միանալու համար անհրաժեշտ է SIM քարտ"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Միանալու համար անհրաժեշտ է <xliff:g id="WIRELESS_CARRIER">%s</xliff:g>-ի SIM քարտ"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Ցանցի նախընտրելի ռեժիմը՝ WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Ցանցի նախընտրելի ռեժիմը՝ միայն GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Ցանցի նախընտրելի ռեժիմը՝ միայն WCDMA"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Բջջային ինտերնետ"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Օգտվել բջջային ինտերնետից"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Հեռախոսն ավտոմատ կանցնի այս օպերատորին, երբ այն հասանելի լինի"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"SIM քարտը հասանելի չէ"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Զանգերի կարգավորում"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS-ների կարգավորում"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Ամեն անգամ հարցնել"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Թույլատրել Կարգավորումների էկրանների վրադրումները"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Թույլատրել հավելվածներին, որոնք կարող են ցուցադրվել այլ հավելվածների վրա, վրադրել Կարգավորումների էկրանները"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Մեդիա"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Թաքցնել նվագարկիչը, երբ մեդիայի աշխատաշրջանն ավարտվում է"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Աշխատաշրջանը հնարավոր է վերականգնել նվագարկիչի Արագ կարգավորումների ծավալված վահանակից։"</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Մեդիա նվագարկիչը՝ արագ կարգավորումներում"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Ցուցադրել մեդիա նվագարկիչը երկար ժամանակով՝ նվագարկումը հեշտությամբ վերսկսելու համար"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Թաքցնել նվագարկիչը"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Ցուցադրել նվագարկիչը"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Հասանելի նվագարկիչներ չկան"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Թույլատրված հավելվածներ"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"մեդիա"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Կմիանա Bluetooth-ը"</string>
 </resources>
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index 0974a2b..894a9cb 100644
--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Sedang"</item>
     <item msgid="6740026006576843477">"Lama"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Singkat"</item>
+    <item msgid="7397961711906421599">"Sedang"</item>
+    <item msgid="4079132024502041928">"Lama"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Default"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Hanya TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Global"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 7f2fd81..2278f0f 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Tampilkan info profil di layar kunci"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Akun"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Lokasi"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Gunakan lokasi"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Gunakan lokasi"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Nonaktif"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">Aktif - <xliff:g id="COUNT_1">%1$d</xliff:g> aplikasi memiliki akses ke lokasi</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Gunakan wajah Anda untuk mengautentikasi"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Mulai"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Jika face unlock aksesibilitas dinonaktifkan, beberapa langkah penyiapan mungkin tidak akan berfungsi baik dengan TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Kembali"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Lanjutkan penyiapan"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Gunakan penyiapan aksesibilitas"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="one">Harus kurang dari <xliff:g id="NUMBER_0">%d</xliff:g> digit</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Admin perangkat tidak mengizinkan penggunaan PIN terbaru."</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"PIN umum diblokir oleh admin IT. Coba PIN lain."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Tidak boleh berisi karakter yang tidak valid"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Minimal berisi satu huruf"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Minimal berisi satu digit"</string>
@@ -653,7 +655,6 @@
       <item quantity="one">Minimal harus berisi 1 karakter bukan numerik</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Admin perangkat tidak mengizinkan penggunaan sandi terbaru."</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Sandi umum diblokir oleh admin IT. Coba sandi lain."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Urutan digit naik, turun, atau berulang tidak diizinkan"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Konfirmasi"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Batal"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Nyalakan Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Gunakan Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Gunakan Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Setelan Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Siapkan &amp; kelola titik akses nirkabel"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Posisikan kode QR di tengah jendela kamera untuk menyambungkan ke “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Hubungkan ke Wi‑Fi dengan memindai kode QR"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Bagikan Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Pindai kode QR ini untuk terhubung ke “<xliff:g id="SSID">%1$s</xliff:g>” dan membagikan sandi"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Pindai kode QR ini dengan perangkat lain untuk bergabung ke “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Pindai kode QR ini untuk terhubung ke “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Coba lagi. Jika masalah berlanjut, hubungi produsen perangkat"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Ada masalah"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Sandi Wi‑Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Sandi hotspot: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Hubungkan otomatis"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Izinkan ponsel untuk terhubung otomatis di dekat jaringan ini"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Izinkan tablet untuk terhubung otomatis di dekat jaringan ini"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Izinkan sambungan ke jaringan ini saat berada dalam jangkauan"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Tambahkan perangkat"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Gunakan kode QR untuk menambahkan perangkat ke jaringan ini"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"Format kode QR tidak valid"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Gunakan sertifikat sistem"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Jangan berikan"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Jangan validasi"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Sertifikat tidak ditentukan. Sambungan tidak bersifat pribadi."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Nama jaringan terlalu panjang."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Domain harus ditentukan."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Perlu sertifikat."</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Sambungkan"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi diaktifkan"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Terhubung ke <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Menghubungkan ke <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Menyambungkan…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Gagal menyambung ke jaringan"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Jaringan di luar jangkauan"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Aplikasi membagikan konten. Untuk membagikan koneksi internet, nonaktifkan hotspot lalu aktifkan kembali"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Sandi tidak disetel"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Nama hotspot"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Mengaktifkan <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Mengaktifkan <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> …"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Perangkat lainnya dapat terhubung ke <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Sandi hotspot"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP Band"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Otomatis meningkatkan rasio pembaruan dari 60 menjadi 90 Hz untuk beberapa konten. Meningkatkan penggunaan baterai."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Paksa rasio pembaruan 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Rasio pembaruan tertinggi untuk penyempurnaan respons sentuhan &amp; kualitas animasi. Meningkatkan penggunaan baterai."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Fokus ke layar"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Aktif / Layar tidak akan mati jika Anda sedang melihatnya"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Versi Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Update keamanan Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Model"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Model: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Model &amp; hardware"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Versi hardware"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ID Peralatan"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Setelan jaringan telah direset"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Tidak dapat menghapus SIM"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"SIM hasil download tidak dapat dihapus karena terjadi error.\n\nMulai ulang perangkat Anda, lalu coba lagi."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Reset ke setelan pabrik"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Reset ke setelan pabrik"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Tindakan ini akan menghapus semua data dari "<b>"penyimpanan internal"</b>" tablet Anda, termasuk:\n\n"<li>"Akun Google Anda"</li>\n<li>"Data sistem dan aplikasi serta setelan"</li>\n<li>"Aplikasi yang didownload"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Tindakan ini akan menghapus semua data dari "<b>"penyimpanan internal"</b>" ponsel Anda, termasuk:\n\n"<li>"Akun Google Anda"</li>\n<li>"Data sistem dan aplikasi serta setelan"</li>\n<li>"Aplikasi yang didownload"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Saat ini Anda telah login ke akun berikut:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Ada pengguna lain yang aktif di perangkat ini.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Musik"</li>\n<li>"Foto"</li>\n<li>"Data pengguna lainnya"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Tindakan ini tidak akan membatalkan paket layanan seluler."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Untuk menghapus gambar, musik, dan data pengguna lainnya, "<b>"penyimpanan USB"</b>" perlu dihapus."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Untuk menghapus musik, gambar, dan data pengguna lainnya, "<b>"kartu SD"</b>" perlu dihapus."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Reset ke setelan pabrik"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Reset ke setelan pabrik"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Tindakan ini akan menghapus semua data dari "<b>"penyimpanan internal"</b>" tablet Anda, termasuk:\n\n"<li>"Akun Google Anda"</li>\n<li>"Data sistem dan aplikasi serta setelan"</li>\n<li>"Aplikasi yang didownload"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Tindakan ini akan menghapus semua data dari "<b>"penyimpanan internal"</b>" ponsel Anda, termasuk:\n\n"<li>"Akun Google Anda"</li>\n<li>"Data sistem dan aplikasi serta setelan"</li>\n<li>"Aplikasi yang didownload"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Saat ini Anda telah login ke akun berikut:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Ada pengguna lain yang aktif di perangkat ini.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Musik"</li>\n<li>"Foto"</li>\n<li>"Data pengguna lainnya"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Tindakan ini tidak akan membatalkan paket layanan seluler."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Untuk menghapus musik, gambar, dan data pengguna lainnya, "<b>"penyimpanan USB"</b>" perlu dihapus."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Untuk menghapus musik, gambar, dan data pengguna lainnya, "<b>"kartu SD"</b>" perlu dihapus."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Hapus penyimpanan USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Hapus kartu SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Hapus semua data di penyimpanan USB internal, seperti musik atau foto."</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Hapus semua data di kartu SD, seperti musik atau foto"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Hapus semua data"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Hapus semua data"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Semua informasi pribadi dan aplikasi yang didownload akan dihapus. Anda tidak dapat mengurungkan tindakan ini."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Semua informasi pribadi, termasuk aplikasi &amp; SIM yang telah download, akan dihapus. Anda tidak dapat mengurungkan tindakan ini."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Hapus semua"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Peresetan tidak dilakukan karena layanan System Clear tidak tersedia."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Hapus semua data?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Fitur kembalikan ke setelan pabrik tidak tersedia untuk pengguna ini"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Menghapus"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Harap tunggu..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Hapus semua data"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Hapus semua data"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Semua informasi pribadi dan aplikasi yang didownload akan dihapus. Anda tidak dapat mengurungkan tindakan ini."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Semua informasi pribadi, termasuk aplikasi &amp; SIM yang telah didownload, akan dihapus. Anda tidak dapat mengurungkan tindakan ini."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Hapus semua data?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Reset ke setelan pabrik tidak tersedia untuk pengguna ini"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Menghapus"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Harap tunggu …"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Setelan panggilan"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Siapkan kotak pesan, penerusan panggilan, nada tunggu, nomor penelepon"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Tethering USB"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Tidak dapat menambatkan ke lebih dari <xliff:g id="MAXCONNECTION">%1$d</xliff:g> perangkat."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan dilepas dari penambatan."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Tethering ethernet"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Bagikan koneksi internet ponsel melalui Ethernet USB"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Bagikan koneksi internet ponsel melalui Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Gunakan hotspot dan tethering untuk menyediakan koneksi internet bagi perangkat lain melalui koneksi kuota seluler Anda. Aplikasi juga dapat membuat hotspot untuk berbagi konten dengan perangkat sekitar."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Gunakan hotspot dan tethering untuk menyediakan koneksi internet bagi perangkat lain melalui koneksi Wi‑Fi atau data seluler Anda. Aplikasi juga dapat membuat hotspot untuk membagikan konten ke perangkat di sekitar."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Bantuan"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Preferensi teks"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Pembesaran"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Area pembesaran"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Aktifkan pembesaran"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Pilih area pembesaran yang ingin digunakan saat memperbesar layar"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Layar penuh"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Sebagian layar"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Layar penuh &amp; sebagian layar"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Perbesar seluruh layar"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Perbesar sebagian layar"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Beralih ke tombol Aksesibilitas?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Menggunakan ketuk tiga kali untuk memperbesar bagian layar akan menyebabkan pengetikan dan tindakan lainnya tertunda.\n\nIngin beralih ke tombol Aksesibilitas untuk memperbesar?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Beralih ke tombol Aksesibilitas"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Tetap gunakan ketuk tiga kali untuk memperbesar"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Setelan pembesaran"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Perbesar dengan ketuk 3 kali"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Perbesar dengan pintasan"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Tombol daya untuk tutup telepon"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Penunjuk mouse besar"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Hapus animasi"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Audio mono"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Gabungkan saluran saat memutar audio"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Keseimbangan audio"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Kiri"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Kanan"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Audio mono"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Gabungkan saluran saat memutar audio"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Keseimbangan audio"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Kiri"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Kanan"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Default"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 detik"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 detik"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Getaran notifikasi"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Getaran dering"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Masukan sentuhan"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Gunakan <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Buka <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Gunakan koreksi warna"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Tampilkan teks"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Hanya untuk aplikasi yang didukung"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Gunakan <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Buka <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Gunakan koreksi warna"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Tampilkan teks"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Hanya untuk aplikasi yang didukung"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Ukuran dan gaya teks"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Ukuran teks <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Opsi lainnya"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomali"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomali"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomali"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Hitam putih"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Merah-hijau"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Merah-hijau"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Biru-kuning"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Pembatasan akses latar belakang"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Izinkan aplikasi berjalan di latar belakang"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Aplikasi tidak diizinkan berjalan di background"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Penggunaan background tidak dapat dibatasi"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Penggunaan latar belakang tidak dapat dibatasi"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Batasi aktivitas background?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Jika aktivitas background aplikasi dibatasi, mungkin fungsinya terganggu."</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Anda tidak dapat membatasi aplikasi karena tidak disetel untuk mengoptimalkan baterai.\n\nAktifkan pengoptimalan baterai untuk membatasi aplikasi."</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Setel jadwal"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Memperpanjang masa pakai baterai"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Nonaktifkan saat diisi dayanya"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Penghemat Baterai nonaktif saat daya ponsel Anda mencapai <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Penghemat Baterai nonaktif saat daya tablet Anda mencapai <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Penghemat Baterai nonaktif saat daya perangkat Anda mencapai <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Penghemat Baterai nonaktif saat daya ponsel terisi lebih dari <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Penghemat Baterai nonaktif saat daya tablet terisi lebih dari <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Penghemat Baterai nonaktif saat daya perangkat terisi lebih dari <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Aktifkan"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Reset"</string>
     <string name="tts_play" msgid="2945513377250757221">"Putar"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Konektivitas adaptif"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Memperpanjang masa pakai baterai dan meningkatkan performa perangkat dengan mengelola koneksi jaringan Anda secara otomatis"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Penyimpanan kredensial"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Menginstal sertifikat"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Instal sertifikat dari penyimpanan"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Kredensial pengguna"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Lihat dan ubah kredensial yang tersimpan"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Lanjutan"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Jenis penyimpanan"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Menggunakan hardware"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Khusus software"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Kredensial tidak tersedia untuk pengguna ini"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Dipasang untuk VPN dan aplikasi"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Dipasang untuk Wi-Fi"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Membayar di terminal"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Siapkan aplikasi pembayaran. Lalu, cukup dekatkan bagian belakang ponsel ke terminal mana saja yang memiliki simbol nirkontak."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Mengerti"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Lainnya..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Lainnya …"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Setel aplikasi pembayaran default"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Update aplikasi pembayaran default"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Di terminal tanpa kontak kartu fisik, bayar dengan <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Selalu gunakan ini untuk telepon"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Pilih SIM untuk data"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Pilih SIM untuk SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Mengalihkan SIM data, mungkin perlu waktu beberapa saat..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Mengalihkan SIM data, mungkin perlu waktu beberapa saat …"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Telepon dengan"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Pilih kartu SIM"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"rutinitas, jadwal, penghemat baterai, penghemat daya, baterai, otomatis, persen"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, panggilan telepon lanjutan, panggilan telepon 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"tambahkan bahasa, tambahkan sebuah bahasa"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"ukuran teks"</string>
     <string name="default_sound" msgid="6604374495015245195">"Suara default"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Volume dering &amp; notifikasi pada <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Volume, getar, Jangan Ganggu"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Aktifkan suara"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Teks Otomatis"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Otomatis tambahkan teks ke media"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Tidak ada"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> jadwal disetel</item>
-      <item quantity="one">1 jadwal disetel</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Tidak ada}=1{1 jadwal disetel}other{# jadwal disetel}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Jangan Ganggu"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Hanya dapatkan notifikasi dari aplikasi dan orang yang penting"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Batasi gangguan"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Hanya untuk prioritas"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Aktif / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Nonaktif / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Nonaktif"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Aktif"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Selalu tanya"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Sampai Anda menonaktifkannya"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> jam</item>
-      <item quantity="one">1 jam</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> menit"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> jadwal dapat aktif otomatis</item>
-      <item quantity="one">1 jadwal dapat aktif otomatis</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 jam}other{# jam}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 menit}other{# menit}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Nonaktif}=1{Nonaktif/1 jadwal dapat aktif otomatis}other{Nonaktif/# jadwal dapat aktif otomatis}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Apa yang dapat mengganggu fitur Jangan Ganggu"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Orang"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Aplikasi"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Otomatis setel notifikasi dengan prioritas yang lebih rendah ke Senyap"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Urutan notifikasi adaptif"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Otomatis mengurutkan notifikasi menurut relevansi"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Masukan notifikasi adaptif"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Menunjukkan penyesuaian yang dilakukan pada notifikasi dan menampilkan opsi untuk memberikan masukan ke sistem"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Saran tindakan dan balasan"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Otomatis tampilkan saran tindakan &amp; balasan"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Tampilkan notifikasi baru-baru ini dan yang ditunda"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Akses Jangan Ganggu"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Izinkan Mode Jangan Ganggu"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Tidak ada aplikasi terpasang yang meminta akses Jangan Ganggu"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Memuat aplikasi..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Memuat aplikasi …"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Sesuai permintaan, Android memblokir notifikasi aplikasi ini agar tidak muncul di perangkat ini"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Sesuai permintaan, Android memblokir kategori notifikasi ini agar tidak muncul di perangkat ini"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Sesuai permintaan, Android memblokir grup notifikasi ini agar tidak muncul di perangkat ini"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Semua percakapan"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Percakapan prioritas"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Tidak ada"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> percakapan</item>
-      <item quantity="one">1 percakapan</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Tidak ada"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Tidak ada}=1{1 percakapan}other{# percakapan}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Siapa yang dapat mengganggu"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Panggilan telepon"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Panggilan telepon"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Untuk memastikan panggilan yang diizinkan mengeluarkan suara, pastikan perangkat disetel untuk berdering"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Untuk ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’, panggilan masuk akan diblokir. Anda dapat menyesuaikan setelan untuk mengizinkan teman, keluarga, atau kontak lain menghubungi Anda."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Kontak berbintang"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> lainnya</item>
-      <item quantity="one">1 lainnya</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Tidak ada"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Tidak ada}=1{{contact_1}}=2{{contact_1} dan {contact_2}}=3{{contact_1}, {contact_2}, dan {contact_3}}other{{contact_1}, {contact_2}, dan # lainnya}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Pesan"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"pesan"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Pesan"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Untuk ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’, pesan masuk akan diblokir. Anda dapat menyesuaikan setelan untuk mengizinkan teman, keluarga, atau kontak lain menghubungi Anda."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Semua pesan dapat ditampilkan"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Semua panggilan dapat ditampilkan"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Tidak ada"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontak</item>
-      <item quantity="one">1 kontak</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Tidak ada}=1{1 kontak}other{# kontak}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Siapa saja"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Kontak"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Kontak berbintang"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Semua notifikasi"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Beberapa notifikasi"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Orang yang dipilih tetap dapat menghubungi Anda, meski aplikasi tidak diizinkan untuk mengganggu"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> dapat mengganggu</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> dapat mengganggu</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> lainnya"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Tidak ada aplikasi yang dapat mengganggu}=1{{app_1} dapat mengganggu}=2{{app_1} dan {app_2} dapat mengganggu}=3{{app_1}, {app_2}, dan {app_3} dapat mengganggu}other{{app_1}, {app_2}, dan # lainnya dapat mengganggu}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Aplikasi"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Semua notifikasi"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Beberapa notifikasi"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Notifikasi yang dapat mengganggu"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Izinkan semua notifikasi"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> dapat mengganggu</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> dapat mengganggu</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Tidak ada yang dapat mengganggu"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> lainnya"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Tidak ada yang dapat mengganggu}=1{{sound_category_1} dapat mengganggu}=2{{sound_category_1} dan {sound_category_2} dapat mengganggu}=3{{sound_category_1}, {sound_category_2}, dan {sound_category_3} dapat mengganggu}other{{sound_category_1}, {sound_category_2}, dan # lainnya dapat mengganggu}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Tidak ada yang dapat mengganggu"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Tidak ada yang dapat mengganggu"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Beberapa orang dapat mengganggu"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Semua orang dapat mengganggu"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB dikontrol oleh"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Perangkat yang terhubung"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Perangkat ini"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Beralih..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Mengalihkan …"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Tidak dapat beralih"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Mengisi baterai perangkat ini"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Mengisi daya perangkat yang terhubung"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Lihat detail"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Penghemat Data"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Data tidak dibatasi"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Data latar belakang nonaktif"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Data latar belakang nonaktif"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Aktif"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Nonaktif"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Gunakan Penghemat Data"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Jika perangkat terkunci, cegah mengetik balasan atau teks lainnya di notifikasi"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Pemeriksa ejaan default"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Pilih pemeriksa ejaan"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Gunakan pemeriksa ejaan"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Gunakan pemeriksa ejaan"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Tidak dipilih"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(tidak ada)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Untuk membantu mengosongkan ruang penyimpanan, pengelola penyimpanan menghapus foto dan video cadangan dari perangkat Anda."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Hapus foto &amp; video"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Pengelola penyimpanan"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Gunakan Pengelola penyimpanan"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Gunakan Pengelola penyimpanan"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Otomatis"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Kosongkan ruang sekarang"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Ketuk dua kali untuk memeriksa ponsel"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Ketuk dua kali untuk memeriksa tablet"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Ketuk dua kali untuk memeriksa perangkat"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Geser untuk notifikasi"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Geser ke bawah di bagian tepi bawah layar untuk menampilkan notifikasi"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Mode satu tangan"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Gunakan mode satu tangan"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Keluar saat beralih ke aplikasi lain"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Waktu habis"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 detik"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 detik"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 detik"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"jangkauan"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Untuk memeriksa waktu, notifikasi, dan info lainnya, ketuk dua kali layar Anda."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Angkat untuk memeriksa ponsel"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Angkat untuk memeriksa tablet"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Ketuk untuk memeriksa tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Ketuk untuk memeriksa perangkat"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Untuk memeriksa waktu, notifikasi, dan info lainnya, ketuk layar Anda."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Tombol panik"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Mulai tindakan SOS darurat dengan menekan cepat tombol daya sebanyak 5 kali."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Suara peringatan"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Memberi peringatan sebelum mengambil tindakan"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Kontak darurat"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Usapkan sidik jari untuk melihat notifikasi"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Usapkan sidik jari"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Untuk memeriksa notifikasi, usapkan jari ke bawah pada sensor sidik jari di bagian belakang ponsel."</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Aktifkan untuk semua aplikasi"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Pilih Driver Grafis"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Default"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Driver Game"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Driver Game"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Developer Driver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Driver Grafis Sistem"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Tidak dapat menemukan jaringan. Coba lagi."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(terlarang)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Tidak ada kartu SIM"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Tidak ada SIM"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Tidak ada"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Memerlukan SIM agar terhubung"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Memerlukan SIM <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> agar terhubung"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Mode jaringan pilihan: WCDMA dipilih"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Mode jaringan pilihan: hanya GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Mode jaringan pilihan: hanya WCDMA"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Data seluler"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Akses data menggunakan jaringan seluler"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Ponsel akan otomatis beralih ke operator ini saat berada dalam jangkauan"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Tidak ada kartu SIM yang tersedia"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Preferensi panggilan"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Preferensi SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Selalu tanya"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Mengizinkan overlay layar pada Setelan"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Izinkan aplikasi yang dapat ditampilkan di atas aplikasi lain untuk menempatkan layar Setelan"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Media"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Menyembunyikan pemutar saat sesi media berakhir"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Pemutar memungkinkan Anda melanjutkan sesi dari panel Setelan Cepat yang diperluas."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Pemutar media di Setelan Cepat"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Tampilkan pemutar media dalam waktu lama untuk melanjutkan pemutaran dengan mudah"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Sembunyikan pemutar"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Menampilkan pemutar"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Tidak ada pemutar yang tersedia"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Aplikasi yang diizinkan"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"media"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth akan diaktifkan"</string>
 </resources>
diff --git a/res/values-is/arrays.xml b/res/values-is/arrays.xml
index 90d6b3b..2d8956e 100644
--- a/res/values-is/arrays.xml
+++ b/res/values-is/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Meðallangt"</item>
     <item msgid="6740026006576843477">"Langt"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Stutt"</item>
+    <item msgid="7397961711906421599">"Miðlungs"</item>
+    <item msgid="4079132024502041928">"Löng"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Sjálfgefið"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Alþjóðlegt"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Aðeins TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Um allan heim"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index e39fcac3..20f3226 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Sýna notandaupplýsingar á lásskjá"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Reikningar"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Staðsetning"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Nota staðsetningu"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Nota staðsetningu"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Slökkt"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">Kveikt – <xliff:g id="COUNT_1">%1$d</xliff:g> forrit hefur aðgang að staðsetningu</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Notaðu andlitið til að staðfesta"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Hefjast handa"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Ef slökkt er á andlitsopnun fyrir aðgengi er ekki víst að öll skref virki eins og skyldi með TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Til baka"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Halda uppsetningu áfram"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Nota uppsetningu aðgengis"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="other">Má ekki vera lengra en <xliff:g id="NUMBER_1">%d</xliff:g> tölustafir</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Tækjastjóri leyfir ekki notkun nýlegs PIN-númers"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Kerfisstjórinn þinn hefur lokað á algeng PIN-númer. Prófaðu annað PIN-númer."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Þetta má ekki innihalda ógildan staf"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Verður að innihalda minnst einn bókstaf"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Verður að innihalda minnst einn tölustaf"</string>
@@ -653,7 +655,6 @@
       <item quantity="other">Verður að innihalda að minnsta kosti <xliff:g id="COUNT">%d</xliff:g> staftákn sem er ekki tölustafur</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Tækjastjóri leyfir ekki notkun nýlegs aðgangsorðs"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Kerfisstjórinn þinn hefur lokað á algeng aðgangsorð. Prófaðu annað aðgangsorð."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Hækkandi, lækkandi eða endurtekin röð tölustafa er óheimil"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Staðfesta"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Hætta við"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Kveikja á Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Nota Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Nota Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Stillingar Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Setja upp og stjórna þráðlausum aðgangsstöðum"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Færðu QR-kóðann í miðjan rammann til að tengja tækið við „<xliff:g id="SSID">%1$s</xliff:g>“"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Tengjast Wi‑Fi með því að skanna QR-kóða"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Deila Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Skannaðu þennan QR-kóða til að tengjast „<xliff:g id="SSID">%1$s</xliff:g>“ og deildu aðgangsorðinu"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Skannaðu þennan QR-kóða með öðru tæki til að tengjast „<xliff:g id="SSID">%1$s</xliff:g>“"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Skannaðu þennan QR-kóða til að tengjast „<xliff:g id="SSID">%1$s</xliff:g>“"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Reyndu aftur. Ef vandamálið er viðvarandi skaltu hafa samband við framleiðandi tækisins"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Eitthvað fór úrskeiðis"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi-Fi aðgangsorð: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Aðgangsorð fyrir heitan reit: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Sjálfvirk tenging"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Leyfa síma að tengjast sjálfkrafa nálægt þessu netkerfi"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Leyfa spjaldtölvu að tengjast sjálfkrafa nálægt þessu netkerfi"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Leyfa tengingu við þetta net þegar samband næst"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Bæta tæki við"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Nota QR-kóða til að bæta tæki við þetta net"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR-kóði er ekki gilt snið"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Nota kerfisvottorð"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Ekki bjóða upp á"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Ekki staðfesta"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Ekkert vottorð tilgreint. Tengingin verður ekki lokuð."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Heiti netkerfis er of langt."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Tilgreina þarf lén."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Vottorðs krafist."</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Tengjast"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Kveikt á Wi-Fi"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Tengt við <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Tengist <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Tengist…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Ekk tókst að tengjast neti"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Ekkert samband við netkerfi"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Forrit deilir efni. Til að deila nettengingu skaltu slökkva á heita reitnum og kveikja svo á honum aftur"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Ekkert aðgangsorð valið"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Heiti á heitum reit"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Kveikir á <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Kveikir á <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Önnur tæki geta tengst <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Aðgangsorð fyrir heitan reit"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Tíðnisvið"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Hnökralaus skjár"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Breytir endurnýjunarhraða sjálfkrafa úr 60 í 90 Hz fyrir sumt efni. Eykur rafhlöðunotkun."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Hnökralaus skjár"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Þvinga fram 90 Hz endurnýjunarhraða"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Mesti endurnýjunarhraði fyrir bætta snertisvörun og gæði hreyfimynda. Eykur rafhlöðunotkun."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Skjáskynjun"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Kveikt / Það slokknar ekki á skjánum ef þú horfir á hann"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android útgáfa"</string>
     <string name="security_patch" msgid="4071756145347865382">"Öryggisuppfærsla fyrir Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Gerð"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Gerð: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Gerð og vélbúnaður"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Vélbúnaðarútgáfa"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Auðkenni búnaðar"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Netstillingar voru endurstilltar"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Ekki tókst að eyða SIM-korti"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Ekki er hægt að eyða sóttum SIM-kortum vegna villu.\n\nEndurræstu tækið og reyndu aftur."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Eyða öllum gögnum (núllstilla)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Eyða öllum gögnum (núllstilla)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Þessi aðgerð eyðir öllum gögnum úr "<b>"innbyggðri geymslu"</b>" spjaldtölvunnar, þar á meðal:\n\n"<li>"Google reikningnum þínum"</li>\n<li>"Gögnum og stillingum forrita og kerfis"</li>\n<li>"Forritum sem hafa verið sótt"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Þessi aðgerð eyðir öllum gögnum úr "<b>"innbyggðri geymslu"</b>" símans, þar á meðal:\n\n"<li>"Google reikningnum þínum"</li>\n<li>"Gögnum og stillingum forrita og kerfis"</li>\n<li>"Forritum sem hafa verið sótt"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Þú ert skráð(ur) inn á eftirfarandi reikninga:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Aðrir notendur eru til staðar í þessu tæki.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Tónlist"</li>\n<li>"Myndum"</li>\n<li>"Öðrum notandagögnum"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM-kortum"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Þetta mun ekki segja upp farsímaáskrift þinni."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Til að hreinsa tónlist, myndir og önnur notandagögn þarf að hreinsa allt út af "<b>"USB-geymslunni"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Til að hreinsa tónlist, myndir og önnur notandagögn þarf að hreinsa allt út af "<b>"SD-kortinu"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Eyða öllum gögnum (núllstilla)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Eyða öllum gögnum (núllstilla)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Þessi aðgerð eyðir öllum gögnum úr "<b>"innbyggðri geymslu"</b>" spjaldtölvunnar, þar á meðal:\n\n"<li>"Google reikningnum þínum"</li>\n<li>"Gögnum og stillingum forrita og kerfis"</li>\n<li>"Forritum sem hafa verið sótt"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Þessi aðgerð eyðir öllum gögnum úr "<b>"innbyggðri geymslu"</b>" símans, þar á meðal:\n\n"<li>"Google reikningnum þínum"</li>\n<li>"Gögnum og stillingum forrita og kerfis"</li>\n<li>"Forritum sem hafa verið sótt"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Þú ert skráð(ur) inn á eftirfarandi reikninga:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Aðrir notendur eru til staðar í þessu tæki.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Tónlist"</li>\n<li>"Myndir"</li>\n<li>"Önnur notandagögn"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM-kort"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Þetta mun ekki segja upp farsímaáskrift þinni."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Til að hreinsa tónlist, myndir og önnur notandagögn þarf að hreinsa allt út af "<b>"USB-geymslunni"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Til að hreinsa tónlist, myndir og önnur notandagögn þarf að hreinsa allt út af "<b>"SD-kortinu"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Hreinsa út af USB-geymslu"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Hreinsa út af SD-korti"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Eyða öllum gögnum í innbyggðu USB-geymslunni, svo sem tónlist eða myndum"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Eyða öllum gögnum á SD-korti, svo sem tónlist eða ljósmyndum"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Eyða öllum gögnum"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Eyða öllum gögnum"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Öllum persónuupplýsingunum þínum og forritum sem hafa verið sótt verður eytt. Ekki er hægt að afturkalla þessa aðgerð."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Öllum persónuupplýsingunum þínum verður eytt, þar á meðal forritum og SIM-kortum sem hafa verið sótt. Ekki er hægt að afturkalla þessa aðgerð."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Eyða öllu"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Endurstilling var ekki framkvæmd vegna þess að kerfishreinsunarþjónustan er ekki tiltæk."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Viltu eyða öllum gögnum?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Núllstilling er ekki í boði fyrir þennan notanda"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Þurrkað út"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Augnablik..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Eyða öllum gögnum"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Eyða öllum gögnum"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Öllum persónuupplýsingunum þínum og forritum sem hafa verið sótt verður eytt. Ekki er hægt að afturkalla þessa aðgerð."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Öllum persónuupplýsingunum þínum verður eytt, þar á meðal forritum og SIM-kortum sem hafa verið sótt. Ekki er hægt að afturkalla þessa aðgerð."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Viltu eyða öllum gögnum?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Núllstilling er ekki í boði fyrir þennan notanda"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Eyðir"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Augnablik…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Símtalsstillingar"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Setja upp talhólf, framsendingu símtala, símtöl í bið, númerabirtingu"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB-tjóðrun"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Ekki er hægt að tjóðra fleiri en <xliff:g id="MAXCONNECTION">%1$d</xliff:g> tæki."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Tjóðrun <xliff:g id="DEVICE_NAME">%1$s</xliff:g> verður slitið."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ethernet-tjóðrun"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Deila nettengingu símans gegnum USB Ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Deila nettengingu símans gegnum Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Notaðu heitan reit og tjóðrun til að tengja önnur tæki við internetið í gegnum farsímagagnatenginguna þína. Forrit geta einnig búið til heitan reit til að deila efni með nálægum tækjum."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Notaðu heitan reit og tjóðrun til að tengja önnur tæki við internetið í gegnum Wi-Fi eða farsímagagnatenginguna þína. Forrit geta einnig búið til heitan reit til að deila efni með nálægum tækjum."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Hjálp"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Kjörstillingar skjátexta"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Stækkun"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Stækkunarsvæði"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Kveikja á stækkun"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Veldu svæðin sem eru stækkuð þegar þú stækkar skjáinn"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Allur skjárinn"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Hluti skjás"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Allur skjárinn eða hluti skjásins"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Stækka allan skjáinn"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Stækka hluta skjásins"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Viltu skipta yfir í aðgengishnappinn?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Ef ýtt er þrisvar til að stækka hluta af skjánum getur það valdið töfum á innslætti og öðrum aðgerðum.\n\nViltu skipta yfir í að nota aðgengishnappinn til að stækka?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Skipta yfir í aðgengishnappinn"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Halda áfram að ýta þrisvar til að stækka"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Stillingar stækkunar"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Stækka með því að ýta þrisvar"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Stækka með flýtilykli"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Aflrofi lýkur símtali"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Stór músarbendill"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Fjarlægja hreyfimyndir"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Einóma hljóð"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Sameina rásir þegar hljóð er spilað"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Hljóðjöfnun"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Vinstri"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Hægri"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Einóma hljóð"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Sameina rásir þegar hljóð er spilað"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Hljóðjöfnun"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Vinstri"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Hægri"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Sjálfgefið"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 sekúndur"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 sekúndur"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Titringur fyrir tilkynningar"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Titringur hringingar"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Snertisvörun"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Nota <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Opna <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Nota litaleiðréttingu"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Birta skjátexta"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Aðeins fyrir stutt forrit"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Nota <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Opna <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Nota litaleiðréttingu"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Birta skjátexta"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Aðeins fyrir stutt forrit"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Stærð og stíll skjátexta"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> textastærð"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Fleiri valkostir"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Græn litblinda"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Rauð litblinda"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Blágul litblinda"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Grátónar"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Rauðgræn"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Rauðgræn"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Blágul"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Takmörkun á notkun í bakgrunni"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Leyfa forriti að keyra í bakgrunni"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Forrit má ekki keyra í bakgrunni"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Ekki er hægt að takmarka notkun í bakgrunni"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Ekki er hægt að takmarka notkun í bakgrunni"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Viltu takmarka bakgrunnsvirkni?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Ef þú takmarkar bakgrunnsvirkni forrits gæti það látið illa"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Forrit notar ekki fínstillingu á rafhlöðu og því er ekki hægt að takmarka það.\n\nKveiktu á fínstillingu til að takmarka."</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Stilla virknitíma"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Lengja endingartíma rafhlöðu"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Slökkva þegar tækið er hlaðið"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Slökkt er á rafhlöðusparnaði þegar hleðsla símans er <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Slökkt er á rafhlöðusparnaði þegar hleðsla spjaldtölvunnar er <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Slökkt er á rafhlöðusparnaði þegar hleðsla tækisins er <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Slökkt er á rafhlöðusparnaði þegar hleðsla símans er yfir <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Slökkt er á rafhlöðusparnaði þegar hleðsla spjaldtölvunnar er yfir <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Slökkt er á rafhlöðusparnaði þegar hleðsla tækisins er yfir <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Kveikja"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Endurstilla"</string>
     <string name="tts_play" msgid="2945513377250757221">"Spila"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Sjálfstillandi tengigeta"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Eykur endingu rafhlöðunnar og bætir afköst tækisins með því að stjórna nettengingu sjálfkrafa"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Skilríkjageymsla"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Setja vottorð upp"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Setja upp vottorð úr geymslu"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Notandaskilríki"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Skoða og breyta vistuðum skilríkjum"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Ítarlegt"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Gerð geymslu"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Byggist á vélbúnaði"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Hugbúnaður eingöngu"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Skilríki eru ekki í boði fyrir þennan notanda"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Sett upp fyrir VPN og forrit"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Sett upp fyrir Wi-Fi"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Borgað við posann"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Settu upp greiðsluforrit. Þá þarftu bara að bera bakhlið símans upp að posa með snjallgreiðslumerki."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Ég skil"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Meira..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Meira…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Velja sjálfgefið greiðsluforrit"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Uppfæra sjálfgefið greiðsluforrit"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Greiða í snertifríum posa með <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Nota þetta alltaf fyrir símtöl"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Veldu SIM-kort fyrir gögn"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Veldu SIM fyrir SMS-skilaboð"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Skiptir um SIM-kort fyrir gögn, þetta kann að taka allt að mínútu..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Skiptir um SIM-kort fyrir gögn, þetta kann að taka allt að mínútu…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Hringja með"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Velja SIM-kort"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM-kort <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"venja, áætlun, rafhlöðusparnaður, orkusparnaður, rafhlaða, sjálfvirkt, prósent"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, betri símtöl, 4g-símtöl"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"nýtt tungumál, bæta við tungumáli"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"textastærð"</string>
     <string name="default_sound" msgid="6604374495015245195">"Sjálfgefið hljóð"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Hljóðstyrkur símtala og tilkynninga í <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Hljóðstyrkur, titringur, ónáðið ekki"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Ræsingarhljóð"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Skjátextar í rauntíma"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Setja sjálfkrafa skjátexta við efni"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Ekkert"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> áætlun stillt</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> áætlanir stilltar</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Engin}=1{1 áætlun stillt}one{# áætlun stillt}other{# áætlanir stilltar}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Ónáðið ekki"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Fáðu aðeins tilkynningar frá mikilvægum einstaklingum og forritum"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Takmarka truflanir"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Aðeins forgangur"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Kveikt / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Slökkt / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Slökkt"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Kveikt"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Spyrja í hvert skipti"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Þar til þú slekkur"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> klukkustund</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> klukkustundir</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> mín."</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> áætlun getur farið sjálfkrafa í gang</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> áætlanir geta farið sjálfkrafa í gang</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 klst.}one{# klukkustund}other{# klukkustundir}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 mínúta}one{# mínúta}other{# mínútur}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Slökkt}=1{Slökkt / 1 áætlun getur farið sjálfkrafa í gang}one{Slökkt / # áætlun getur farið sjálfkrafa í gang}other{Slökkt / # áætlanir geta farið sjálfkrafa í gang}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Hvað má trufla „Ónáðið ekki“"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Fólk"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Forrit"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Stilla tilkynningar með lægri forgangi sjálfkrafa á Lágstemmdar"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Breytilegt vægi tilkynninga"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Raða tilkynningum sjálfkrafa eftir vægi"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Breytilegar ábendingar um tilkynningar"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Gefa til kynna breytingar á tilkynningum og sýna valkostinn til að senda kerfinu ábendingar"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Tillögur að aðgerðum og svörum"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Sýna sjálfkrafa tillögur að aðgerðum og svörum"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Sýna nýlegar og frestaðar tilkynningar"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"„Ónáðið ekki“ aðgangur"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Leyfa aðgang að „Ónáðið ekki“"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Engin uppsett forrit hafa óskað eftir „Ónáðið ekki“ aðgangi"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Hleður forrit..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Hleður forrit…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Android kemur í veg fyrir að tilkynningar þessa forrits birtist í þessu tæki, samkvæmt beiðni frá þér"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Android kemur í veg fyrir að þessi tilkynningaflokkur birtist í þessu tæki, samkvæmt beiðni frá þér"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Android kemur í veg fyrir að þessi tilkynningahópur birtist í þessu tæki, samkvæmt beiðni frá þér"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Öll samtöl"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Forgangssamtöl"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Engin"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> samtal</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> samtöl</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Engin"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Engin}=1{1 samtal}one{# samtal}other{# samtöl}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Hver má trufla"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Símtöl"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Símtöl"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Til að tryggja að það heyrist í leyfðum símtölum skaltu athuga hvort tækið sé stillt á að hringja"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Lokað er fyrir móttekin símtöl fyrir „<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>“. Hægt er að breyta stillingum til að leyfa símtöl frá vinum, fjölskyldumeðlimum eða öðrum tengiliðum."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Stjörnumerktir tengiliðir"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one"><xliff:g id="NUM_PEOPLE">%d</xliff:g> í viðbót</item>
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> í viðbót</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Engir"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Engin}=1{{contact_1}}=2{{contact_1} og {contact_2}}=3{{contact_1}, {contact_2} og {contact_3}}one{{contact_1}, {contact_2} og # í viðbót}other{{contact_1}, {contact_2} og # í viðbót}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Skilaboð"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"skilaboð"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Skilaboð"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Lokað er fyrir móttekin skilaboð fyrir „<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>“. Hægt er að breyta stillingum til að leyfa símtöl frá vinum, fjölskyldumeðlimum eða öðrum tengiliðum."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Þú færð öll skilaboð"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Þú færð öll símtöl"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Engir"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> tengiliður</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> tengiliðir</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Engin}=1{1 tengiliður}one{# tengiliður}other{# tengiliðir}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Hver sem er"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Tengiliðir"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Stjörnumerktir tengiliðir"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Allar tilkynningar"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Sumar tilkynningar"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Valið fólk getur áfram náð í þig jafnvel þótt þú leyfir ekki forritum að trufla"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one"><xliff:g id="APP_NAMES">%s</xliff:g> má trufla</item>
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> mega trufla</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> í viðbót"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Engin forrit mega trufla}=1{{app_1} má trufla}=2{{app_1} og {app_2} mega trufla}=3{{app_1}, {app_2}, og {app_3} mega trufla}one{{app_1}, {app_2}, og # til viðbótar mega trufla}other{{app_1}, {app_2}, og # til viðbótar mega trufla}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Forrit"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Allar tilkynningar"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Sumar tilkynningar"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Tilkynningar sem mega trufla"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Leyfa allar tilkynningar"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> mega trufla</item>
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> mega trufla</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Ekkert má trufla"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> í viðbót"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Ekkert má trufla}=1{{sound_category_1} má trufla}=2{{sound_category_1} og {sound_category_2} mega trufla}=3{{sound_category_1}, {sound_category_2} og {sound_category_3} mega trufla}one{{sound_category_1}, {sound_category_2}, og # til viðbótar mega trufla}other{{sound_category_1}, {sound_category_2}, og # til viðbótar mega trufla}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Ekkert má trufla"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Enginn má trufla"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Sumt fólk má trufla"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Allt fólk má trufla"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB stjórnað af"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Tengdu tæki"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Þessu tæki"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Skiptir..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Skiptir…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Ekki tókst að skipta"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Hleður þetta tæki"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Hlaða tengt tæki"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Skoða upplýsingar"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Gagnasparnaður"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Engin takmörkun á gögnum"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Slökkt er á bakgrunnsgögnum"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Slökkt er á bakgrunnsgögnum"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Kveikt"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Slökkt"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Nota gagnasparnað"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Ekki leyfa að svör eða annar texti sé sleginn inn í tilkynningar þegar tækið er læst"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Sjálfgefin ritvilluleit"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Veldu ritvilluleit"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Nota ritvilluleit"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Nota ritvilluleit"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Ekki valið"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(ekkert)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Geymslustjórnun fjarlægir afritaðar myndir og myndskeið úr tækinu þínu til að losa um geymslupláss."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Fjarlægja myndir og myndskeið"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Geymslustjórnun"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Nota geymslustjórnun"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Nota geymslustjórnun"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Sjálfvirkt"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Handbók"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Losa geymslupláss núna"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Ýta tvisvar til að skoða"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Ýta tvisvar til að athuga spjaldtölvu"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Ýta tvisvar til að athuga tæki"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Strjúktu til að sjá tilk."</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Strjúktu niður á neðri hluta skjásins til að birta tilkynningarnar þínar"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Einhent stilling"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Nota einhenta stillingu"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Lokað þegar skipt er um forrit"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Tímamörk"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 sekúndur"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 sekúndur"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 sekúndur"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"seiling"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Til að sjá hvað klukkan er og sjá tilkynningar og aðrar upplýsingar skaltu ýta tvisvar á skjáinn."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Taka upp til að skoða"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Taka upp til að athuga spjaldtölvu"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Ýttu til að athuga spjaldtölvu"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Ýttu til að athuga tæki"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Til að sjá hvað klukkan er og sjá tilkynningar og aðrar upplýsingar skaltu ýta á skjáinn."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Neyðarhnappur"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Ræstu neyðaraðgerð með því að ýta snöggt á aflrofann fimm sinnum."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Viðvörunarhljóð"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Sýna viðvörun áður en aðgerðir eru hafnar"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Neyðartengiliðir"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Fingrafar til að opna tilkynningar"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Lesa fingrafar"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Strjúktu niður á fingrafaraskynjaranum aftan á símanum til að skoða tilkynningarnar."</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Kveikja fyrir öll forrit"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Velja myndvinnslurekil"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Sjálfgefið"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Leikjarekill"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Leikjarekill"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Rekill þróunaraðila"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Myndvinnslurekill kerfis"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Ekkert símkerfi fannst. Reyndu aftur."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(bannað)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Ekkert SIM-kort"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Ekkert SIM-kort"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Ekkert"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"SIM-kort er nauðsynlegt til að tengjast"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"<xliff:g id="WIRELESS_CARRIER">%s</xliff:g> SIM-kort er nauðsynlegt til að tengjast"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Valin símkerfisstilling: WCDMA fyrsta val"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Valin símkerfisstilling: GSM eingöngu"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Valin símkerfisstilling: WCDMA eingöngu"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Farsímagögn"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Aðgangur að gögnum um farsímakerfi"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Síminn skiptir sjálfkrafa yfir í þetta símafyrirtæki þegar samband næst"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Ekkert SIM-kort til staðar"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Símtalastilling"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS-kjörstilling"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Spyrja í hvert skipti"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Leyfa yfirlögn yfir stillingar"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Leyfa forrit sem geta birst yfir öðrum forritum að leggjast yfir stillingaskjái"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Margmiðlunarefni"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Fela spilara þegar efnislotunni lýkur"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Spilarinn gerir þér kleift að halda lotu áfram á stækkaða flýtistillingasvæðinu."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Efnisspilari í flýtistillingum"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Sýna efnisspilara í langan tíma til að halda spilun auðveldlega áfram"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Fela spilara"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Sýna spilara"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Engir spilarar tiltækir"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Leyfð forrit"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"margmiðlunarefni"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Kveikt verður á Bluetooth"</string>
 </resources>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index 5a9f87f..64150e8 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Medio"</item>
     <item msgid="6740026006576843477">"Lungo"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Breve"</item>
+    <item msgid="7397961711906421599">"Medio"</item>
+    <item msgid="4079132024502041928">"Lungo"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Predefinito"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Globale"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Solo TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Globale"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index a49cb61..645cbcc 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Mostra info profilo in schermata di blocco"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Account"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Geolocalizzazione"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Usa geolocalizzazione"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Usa posizione"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Off"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">On - <xliff:g id="COUNT_1">%1$d</xliff:g> app hanno accesso alla posizione</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Usa il tuo volto per l\'autenticazione"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Inizia"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Se la funzionalità Sblocco con il volto (accessibilità) non è attiva, alcuni passaggi della configurazione potrebbero non funzionare correttamente con TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Indietro"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Continua configurazione"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Usa configurazione accessibilità"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="one">Deve contenere meno di <xliff:g id="NUMBER_0">%d</xliff:g> cifra</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"L\'amministratore del dispositivo non consente l\'utilizzo di un PIN recente"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"I PIN comuni sono stati bloccati dall\'amministratore IT. Prova a usare un altro PIN."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Non può contenere un carattere non valido"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Deve contenere almeno una lettera"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Deve contenere almeno una cifra"</string>
@@ -653,7 +655,6 @@
       <item quantity="one">Deve contenere almeno 1 carattere non numerico</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"L\'amministratore del dispositivo non consente l\'utilizzo di una password recente."</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Le password comuni sono state bloccate dall\'amministratore IT. Prova a usare un\'altra password."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Non sono consentite sequenze di cifre in ordine ascendente o discendente oppure ripetute"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Conferma"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Annulla"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Attiva Wi‑Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Utilizza Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Utilizza Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Impostazioni Wi‑Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Configura e gestisci punti di accesso wireless"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Inquadra il codice QR nel riquadro sottostante per connetterti alla rete \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Connettiti alla rete Wi‑Fi eseguendo la scansione di un codice QR"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Condividi Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Esegui la scansione di questo codice QR per connetterti alla rete \"<xliff:g id="SSID">%1$s</xliff:g>\" e condividere la password"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Scansiona questo codice QR con un altro dispositivo per collegarti alla rete \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Esegui la scansione di questo codice QR per connetterti alla rete \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Riprova. Se il problema persiste, contatta il produttore del dispositivo"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Si è verificato un problema"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Password Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Password hotspot: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Connessione automatica"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Consenti la connessione automatica del telefono nei pressi di questa rete"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Consenti la connessione automatica del tablet nei pressi di questa rete"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Consenti la connessione a questa rete quando è disponibile"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Aggiungi dispositivo"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Usa un codice QR per aggiungere un dispositivo a questa rete"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"Il formato del codice QR non è valido"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Utilizza certificati di sistema"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Non fornire"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Non convalidare"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Nessun certificato specificato. La connessione non sarà privata."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Il nome della rete è troppo lungo."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Specifica un dominio."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Certificato obbligatorio."</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Connetti"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi attivato"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Connessione alla rete <xliff:g id="NETWORK_NAME">%1$s</xliff:g> stabilita"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Connessione a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Connessione…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Impossibile connettersi alla rete"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Rete fuori portata"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"L\'app sta condividendo contenuti. Per condividere la connessione Internet, disattiva e riattiva l\'hotspot"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Nessuna password impostata"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Nome hotspot"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Attivazione di <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Attivazione di <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Gli altri dispositivi possono collegarsi a <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Password hotspot"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Banda AP"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Display fluido"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Aumenta automaticamente la frequenza di aggiornamento da 60 a 90 Hz per alcuni contenuti. Aumenta l\'utilizzo della batteria."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Display fluido"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Forza frequenza di aggiornamento a 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Massima frequenza di aggiornamento per migliore reattività al tocco e qualità dell\'animazione. Aumenta il consumo della batteria."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Schermo vigile"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"On/Lo schermo non si spegne se lo stai guardando"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Versione di Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Aggiornamento della sicurezza Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Modello"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Modello: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Modello e hardware"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Versione hardware"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ID attrezzatura"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Le impostazioni di rete sono state reimpostate"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Impossibile resettare le SIM"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Le SIM scaricate non possono essere resettate a causa di un errore.\n\nRiavvia il dispositivo e riprova."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Cancella tutti i dati (ripristino dati fabbrica)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Cancella tutti i dati"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Tutti i dati saranno cancellati dalla "<b>"memoria interna"</b>" del tablet, inclusi:\n\n"<li>"Il tuo Account Google"</li>\n<li>"I dati e le impostazioni del sistema e delle app"</li>\n<li>"Le app scaricate"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Tutti i dati saranno cancellati dalla "<b>"memoria interna"</b>" del telefono, inclusi:\n\n"<li>"Il tuo Account Google"</li>\n<li>"Le impostazioni e i dati di sistema e delle app"</li>\n<li>"Le app scaricate"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Al momento hai eseguito l\'accesso ai seguenti account:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Sono presenti altri utenti su questo dispositivo.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Musica"</li>\n<li>"Foto"</li>\n<li>"Altri dati utente"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Il tuo piano di servizio dati mobile non verrà annullato."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Per cancellare musica, foto e altri dati dell\'utente, è necessario cancellare i dati dell\'"<b>"archivio USB"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Per cancellare musica, foto e altri dati dell\'utente, è necessario cancellare i dati della "<b>"scheda SD"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Cancella tutti i dati (ripristino dei dati di fabbrica)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Cancella tutti i dati"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Verranno cancellati tutti i dati dalla "<b>"memoria interna"</b>" del tablet, inclusi:\n\n"<li>"Il tuo Account Google"</li>\n<li>"Le impostazioni e i dati di sistema e delle app"</li>\n<li>"Le app scaricate"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Verranno cancellati tutti i dati dalla "<b>"memoria interna"</b>" del telefono, inclusi:\n\n"<li>"Il tuo Account Google"</li>\n<li>"Le impostazioni e i dati di sistema e delle app"</li>\n<li>"Le app scaricate"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Hai eseguito l\'accesso ai seguenti account:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Sono presenti altri utenti su questo dispositivo.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Musica"</li>\n<li>"Foto"</li>\n<li>"Altri dati utente"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Il tuo piano di servizio dati mobile non verrà annullato."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Per cancellare musica, foto e altri dati utente, è necessario cancellare i dati dell\'"<b>"archivio USB"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Per cancellare musica, foto e altri dati utente, è necessario cancellare i dati della "<b>"scheda SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Cancella archivio USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Cancella scheda SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Cancella tutti i dati nell\'archivio USB interno, come musica o foto"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Cancella tutti i dati sulla scheda SD, come musica o foto"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Cancella tutti i dati"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Cancella tutti i dati"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Tutte le tue informazioni personali e le app scaricate saranno eliminate. Questa azione non può essere annullata."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Tutte le tue informazioni personali, tra cui le app e le SIM scaricate, saranno eliminate. Questa azione non può essere annullata."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Cancella tutto"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Nessun ripristino eseguito perché il servizio System Clear non è disponibile."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Cancellare tutti i dati?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Il ripristino dati di fabbrica non è consentito per questo utente"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Cancellazione in corso"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Attendere prego…"</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Cancella tutti i dati"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Cancella tutti i dati"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Tutte le tue informazioni personali e le app scaricate saranno eliminate. Questa azione non può essere annullata."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Tutte le tue informazioni personali, tra cui le app e le SIM scaricate, saranno eliminate. Questa azione non può essere annullata."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Vuoi cancellare tutti i dati?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Il ripristino dei dati di fabbrica non è disponibile per questo utente"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Cancellazione…"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Attendi…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Impostazioni chiamate"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Imposta segreteria, deviazione chiamate, avviso di chiamata, ID chiamante"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Tethering USB"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Tethering impossibile con più di <xliff:g id="MAXCONNECTION">%1$d</xliff:g> dispositivi."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Sarà annullato il tethering per <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Tethering Ethernet"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Condividi la connessione a Internet del telefono tramite Ethernet USB"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Condividi la connessione a Internet del telefono tramite Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Utilizza hotspot e tethering per consentire ad altri dispositivi di accedere a Internet tramite la tua connessione dati mobili. Le app possono, inoltre, creare un hotspot per condividere contenuti con i dispositivi vicini."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Utilizza hotspot e tethering per consentire ad altri dispositivi di accedere a Internet usando la tua connessione Wi-Fi o dati mobili. Le app possono inoltre creare un hotspot per condividere contenuti con i dispositivi vicini."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Guida"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Preferenze sottotitoli"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Ingrandimento"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Area di ingrandimento"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Attivazione ingrandimento"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Scegli le aree di ingrandimento che vuoi usare quando ingrandisci lo schermo"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Schermo intero"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Parte dello schermo"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Schermo intero e parte dello schermo"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Ingrandisci l\'intero schermo"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Ingrandisci parte dello schermo"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Vuoi passare al pulsante Accessibilità?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"L\'uso del triplo tocco per ingrandire parte dello schermo causa un ritardo della digitazione e di altre azioni.\n\nVuoi passare all\'uso del pulsante Accessibilità per ingrandire?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Passa a pulsante Accessibilità"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Continua a usare triplo tocco per ingrandire"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Impostazioni ingrandimento"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Ingrandisci con triplo tocco"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Ingrandisci con scorciatoia"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Chiudi chiamata con tasto accensione"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Puntatore del mouse grande"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Rimuovi le animazioni"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Audio in formato mono"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Unisci i canali durante la riproduzione dell\'audio"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Bilanciamento audio"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Sinistra"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Destra"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Audio in formato mono"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Unisci i canali durante la riproduzione dell\'audio"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Bilanciamento audio"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Sinistra"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Destra"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Predefinito"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 secondi"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 secondi"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Vibrazione notifiche"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Vibrazione allo squillo"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Feedback tattile"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Usa <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Apri <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Usa correzione del colore"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Mostra sottotitoli"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Solo per app supportate"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Usa <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Apri <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Usa correzione del colore"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Mostra sottotitoli"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Solo per app supportate"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Stile e dimensioni sottotitoli"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Dimensioni testo <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Altre opzioni"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomalia"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomalia"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomalia"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Scala di grigi"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Rosso-verde"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Rosso-verde"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Blu-giallo"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Limitazione in background"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Consenti l\'esecuzione in background dell\'app"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Esecuzione in background dell\'app non consentita"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"L\'utilizzo in background non può essere limitato"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"L\'utilizzo in background non può essere limitato"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Limitare l\'attività in background?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Se limiti l\'attività in background per un\'app, tale app potrebbe funzionare in modo anomalo"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Per limitare l\'app,\n\ndevi prima attivare l\'ottimizzazione della batteria."</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Imposta una pianificazione"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Prolunga la durata della batteria"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Disattiva quando in carica"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Risparmio energetico si disattiva quando il livello di carica del telefono è <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Risparmio energetico si attiva quando il tablet è a un livello di carica pari a <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Risparmio energetico si attiva quando il dispositivo è a un livello di carica pari a <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Il risparmio energetico viene disattivato quando la carica del telefono è superiore al <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Il risparmio energetico viene disattivato quando la carica del tablet è superiore al <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Il risparmio energetico viene disattivato quando la carica del dispositivo è superiore al <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Attiva"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Reimposta"</string>
     <string name="tts_play" msgid="2945513377250757221">"Riproduci"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Connettività adattiva"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Prolunga la durata della batteria e migliora le prestazioni del dispositivo gestendo automaticamente le connessioni di rete"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Archivio credenziali"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Installa un certificato"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Installa certificati da archivio"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Credenziali utente"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Visualizza e modifica credenziali archiviate"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Avanzate"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Tipo di archivio"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Basato sull\'hardware"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Solo software"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Le credenziali non sono disponibili per questo utente"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Installata per VPN e app"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Installata per Wi-Fi"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Pagamento al terminale"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Configura un\'app per il pagamento e appoggia il retro del telefono su qualsiasi terminale con il simbolo del pagamento contactless."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"OK"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Altro..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Altro…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Imposta app predefinita per i pagamenti"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Aggiorna l\'app predefinita per i pagamenti"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Se è disponibile un terminale contactless, paga con l\'app <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Usa sempre questa per chiamare"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Seleziona una SIM per i dati"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Seleziona una SIM per gli SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Passaggio a un\'altra SIM dati in corso. L\'operazione potrebbe richiedere un minuto."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Passaggio a un\'altra SIM dati. L\'operazione potrebbe richiedere un minuto…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Chiama con"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Seleziona una scheda SIM"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"routine, programmazione, risparmio energetico, risparmiare batteria, batteria, automatico, percento"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, chiamate avanzate, chiamate 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"aggiungere lingua, aggiungere una lingua"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"dimensioni testo"</string>
     <string name="default_sound" msgid="6604374495015245195">"Suono predefinito"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Volume suoneria e notifiche: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Volume, vibrazione, Non disturbare"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Attiva suoni"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Sottotitoli in tempo reale"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Sottotitoli automatici"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Nessuna"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> programmazioni impostate</item>
-      <item quantity="one">1 programmazione impostata</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Nessuna}=1{1 programmazione impostata}other{# programmazioni impostate}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Non disturbare"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Ricevi soltanto le notifiche di app e persone importanti"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limitare le interruzioni"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Solo con priorità"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"On/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Off/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Off"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"On"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Chiedi ogni volta"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Fino alla disattivazione"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> ore</item>
-      <item quantity="one">1 ora</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minuti"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other">Possono essere attivate automaticamente <xliff:g id="ON_COUNT">%d</xliff:g> pianificazioni</item>
-      <item quantity="one">Può essere attivata automaticamente 1 pianificazione</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 ora}other{# ore}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minuto}other{# minuti}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Off}=1{Off/Può essere attivata automaticamente 1 programmazione}other{Off/Possono essere attivate automaticamente # programmazioni}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Possono interrompere la modalità Non disturbare"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Persone"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"App"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Imposta automaticamente le notifiche con priorità inferiore su Senza avvisi"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Posizionamento adattivo delle notifiche"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Posiziona automaticamente le notifiche in base alla pertinenza"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Feedback relativo alle notifiche adattive"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Indica le modifiche apportate alle notifiche e mostra la possibilità di fornire feedback al sistema"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Azioni e risposte consigliate"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Mostra automaticamente azioni e risposte consigliate"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Mostra notifiche recenti e posticipate"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Accesso Non disturbare"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Consenti \"Non disturbare\""</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Nessuna delle app installate ha richiesto l\'accesso Non disturbare"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Caricamento app..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Caricamento delle app…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Come richiesto, Android sta bloccando la visualizzazione delle notifiche dell\'app su questo dispositivo"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Come richiesto, Android sta bloccando la visualizzazione di questa categoria di notifiche su questo dispositivo"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Come richiesto, Android sta bloccando la visualizzazione di questo gruppo di notifiche su questo dispositivo"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Tutte le conversazioni"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Conversazioni prioritarie"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Nessuna"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> conversazioni</item>
-      <item quantity="one">1 conversazione</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Nessuna"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Nessuna}=1{1 conversazione}other{# conversazioni}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Chi può interrompere"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Chiamate"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Chiamate"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Per assicurarti che la suoneria delle chiamate consentite sia attiva, controlla che il dispositivo sia impostato per squillare"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Per \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" le chiamate in arrivo sono bloccate. Puoi regolare le impostazioni per permettere ai tuoi amici, alla tua famiglia e ad altri contatti di raggiungerti."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Contatti speciali"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other">altri <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="one">1 altro</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Nessuno"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Nessuno}=1{{contact_1}}=2{{contact_1} e {contact_2}}=3{{contact_1}, {contact_2} e {contact_3}}other{{contact_1}, {contact_2} e altri # contatti}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Messaggi"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"messaggi"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Messaggi"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Per \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" i messaggi in arrivo sono bloccati. Puoi modificare le impostazioni per permettere ai tuoi amici, alla tua famiglia e ad altri contatti di raggiungerti."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Puoi ricevere tutti i messaggi"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Puoi ricevere tutte le chiamate"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Nessuno"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> contatti</item>
-      <item quantity="one">1 contatto</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Nessuno}=1{1 contatto}other{# contatti}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Chiunque"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Contatti"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Contatti speciali"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Tutte le notifiche"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Alcune notifiche"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Le persone selezionate possono ancora contattarti, anche se non consenti l\'interruzione da parte delle app"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> possono interrompere</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> può interrompere</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"altre <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Nessuna app può interrompere}=1{{app_1} può interrompere}=2{{app_1} e {app_2} possono interrompere}=3{{app_1}, {app_2} e {app_3} possono interrompere}other{{app_1}, {app_2} e altre # app possono interrompere}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"App"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Tutte le notifiche"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Alcune notifiche"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Notifiche che possono interrompere"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Consenti tutte le notifiche"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> possono interrompere</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> può interrompere</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Niente può interrompere"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"altri <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Niente può interrompere}=1{{sound_category_1} può interrompere}=2{{sound_category_1} e {sound_category_2} possono interrompere}=3{{sound_category_1}, {sound_category_2} e {sound_category_3} possono interrompere}other{{sound_category_1}, {sound_category_2} e altri # suoni possono interrompere}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Niente può interrompere"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Nessuno può interrompere"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Alcune persone possono interrompere"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Tutte le persone possono interrompere"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB controllata da"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Dispositivo connesso"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Questo dispositivo"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Commutazione…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Cambio…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Impossibile eseguire la commutazione"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Ricarica del dispositivo"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Ricarica del dispositivo collegato"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Visualizza dettagli"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Risparmio dati"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Dati senza limitazioni"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"I dati in background sono disattivati"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"I dati in background sono disattivati"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"On"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Off"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Usa Risparmio dati"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Impedisci di digitare risposte o altro testo nelle notifiche quando il dispositivo è bloccato"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Controllo ortografico predefinito"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Scegli controllo ortografico"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Usa il controllo ortografico"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Usa il controllo ortografico"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Non selezionato"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(nessuno)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Per liberare spazio, la gestione memoria rimuove foto e video dal dispositivo dopo averne eseguito il backup."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Rimuovi foto e video"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Gestione memoria"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Utilizza Gestione archiviazione"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Usa Gestione archiviazione"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automatiche"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Manuali"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Libera spazio ora"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Tocca due volte per controllare il telefono"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Tocca due volte il tablet per controllare le notifiche"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Tocca due volte il dispositivo per controllare le notifiche"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Scorri per le notifiche"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Scorri verso il basso sul bordo inferiore dello schermo per vedere le notifiche"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Modalità one-hand"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Usa modalità one-hand"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Esci al cambio di app"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Timeout"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 secondi"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 secondi"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 secondi"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"accessibilità one-hand"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Per controllare l\'ora, le notifiche e altre informazioni, tocca due volte lo schermo."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Solleva per controllare il telefono"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Solleva il tablet per controllare le notifiche"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Tocca per selezionare le notifiche"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Tocca per selezionare il dispositivo"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Per controllare l\'ora, le notifiche e altre informazioni, tocca lo schermo."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Pulsante di emergenza"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Avvia le azioni SOS di emergenza premendo rapidamente per 5 volte il tasto di accensione."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Suono di avviso"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Avvisa prima di iniziare le azioni"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Contatti di emergenza"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Usa l\'impronta per le notifiche"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Usa l\'impronta"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Per controllare le notifiche, scorri verso il basso sul sensore di impronte sul retro del telefono."</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Attiva per tutte le app"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Seleziona il driver di grafica"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Predefinito"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Driver di gioco"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Driver di gioco"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Driver sviluppatore"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Driver di grafica di sistema"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Impossibile trovare reti. Riprova."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(vietato)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Nessuna scheda SIM"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Nessuna SIM rilevata"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Nessuna"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"È necessaria una SIM per connettersi"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"È necessaria una SIM <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> per connettersi"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Modalità di rete preferita: WCDMA (preferita)"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Modalità di rete preferita: solo GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Modalità di rete preferita: solo WCDMA"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Dati mobili"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Accedi ai dati tramite la rete mobile"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Il telefono passerà automaticamente a questo operatore quando si trova in portata"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Nessuna scheda SIM disponibile"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Preferenza per le chiamate"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Preferenza per gli SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Chiedi ogni volta"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Consenti gli overlay schermo sulle Impostazioni"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Consenti alle app visualizzabili sopra altre app di sovrapporre le schermate Impostazioni"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Contenuti multimediali"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Nascondi lettore al termine della sessione multimediale"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Il lettore multimediale ti consente di riprendere una sessione dal riquadro espanso Impostazioni rapide."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Media player nelle Impostazioni rapide"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Mostra il media player per un periodo prolungato in modo da poter riprendere facilmente la riproduzione"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Nascondi lettore multimediale"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Mostra lettore multimediale"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Nessun lettore multimediale disponibile"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"App consentite"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"contenuti multimediali"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Verrà attivato il Bluetooth"</string>
 </resources>
diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml
index f71da6d..bb6a5c1 100644
--- a/res/values-iw/arrays.xml
+++ b/res/values-iw/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"בינוני"</item>
     <item msgid="6740026006576843477">"ארוך"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"קצר"</item>
+    <item msgid="7397961711906421599">"בינוני"</item>
+    <item msgid="4079132024502041928">"ארוך"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"ברירת מחדל"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"כללי"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"‏TDSCDMA בלבד"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"‏NR‏/LTE"</item>
     <item msgid="5237423971422723128">"‏NR‏/LTE‏/CDMA‏/EvDo"</item>
     <item msgid="6856991565745877075">"‏NR‏/LTE‏/GSM‏/WCDMA"</item>
-    <item msgid="473436147270962091">"‏NR‏/LTE‏/CDMA‏/EvDo‏/GSM‏/WCDMA"</item>
+    <item msgid="8908263949185004366">"גלובלי"</item>
     <item msgid="6692179237956480280">"‏NR‏/LTE‏/WCDMA"</item>
     <item msgid="8160757136163231885">"‏NR‏/LTE‏/TDSCDMA"</item>
     <item msgid="2207530656708814396">"‏NR‏/LTE‏/TDSCDMA‏/GSM"</item>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index d07061e..187fbb2 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -300,7 +300,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"הצג פרטי פרופיל במסך הנעילה"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"חשבונות"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"מיקום"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"שימוש במיקום"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"שימוש במיקום"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"כבוי"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="two">פועלת - ל-<xliff:g id="COUNT_1">%1$d</xliff:g> אפליקציות יש גישה למיקום</item>
@@ -335,6 +335,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"שימוש באימות פנים"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"התחלה"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"‏אם הגדרות נגישות של שחרור נעילה על ידי זיהוי פנים מושבתות, ייתכן שחלק משלבי ההגדרה לא יפעלו באופן תקין עם TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"חזרה"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"להמשך הגדרה"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"שימוש בהגדרת הנגישות"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -635,7 +638,6 @@
       <item quantity="one">צריכה להכיל פחות מספרה אחת (<xliff:g id="NUMBER_0">%d</xliff:g>)</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"מנהל המכשיר לא מאפשר להשתמש בקוד גישה שנעשה בו שימוש לאחרונה"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"‏קודי גישה נפוצים חסומים בידי מנהל ה-IT. יש לנסות קוד גישה אחר."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"לא ניתן לכלול תו לא חוקי"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"חייבת להכיל אות אחת לפחות"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"צריכה להכיל ספרה אחת לפחות"</string>
@@ -683,7 +685,6 @@
       <item quantity="one">חייבת להכיל לפחות תו אחד שאינו מספר</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"מנהל המכשיר לא מאפשר להשתמש בסיסמה שנעשה בה שימוש לאחרונה"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"‏סיסמאות נפוצות חסומות בידי מנהל ה-IT. יש לנסות סיסמה אחרת."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"אין להגדיר רצף ספרות עולה, יורד או חוזר"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"אישור"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"ביטול"</string>
@@ -829,7 +830,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"‏הפעל את ה-Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"‏שימוש ב-Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"‏שימוש ב-Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"‏הגדרות Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"הגדרה וניהול של נקודות גישה אלחוטיות"</string>
@@ -937,7 +938,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"‏יש להציב במרכז את קוד ה-QR שבהמשך כדי להתחבר אל “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"‏ניתן להצטרף לרשת Wi‑Fi על ידי סריקה של קוד QR"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"‏שיתוף Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"‏כדי להתחבר אל “<xliff:g id="SSID">%1$s</xliff:g>” ולשתף את הסיסמה צריך לסרוק את קוד ה-QR הזה"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"‏יש לסרוק קוד QR זה בעזרת מכשיר אחר כדי להצטרף אל “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"‏כדי להתחבר אל \"<xliff:g id="SSID">%1$s</xliff:g>\" צריך לסרוק את קוד ה-QR הזה"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"יש לנסות שוב. אם הבעיה ממשיכה להופיע, יש לפנות ליצרן המכשיר"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"משהו השתבש"</string>
@@ -963,8 +964,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"‏סיסמת ה-Wi‑Fi היא: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"סיסמה של נקודה לשיתוף אינטרנט: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"חיבור אוטומטי"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"הטלפון יוכל להתחבר באופן אוטומטי בסביבת הרשת הזו"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"הטאבלט יוכל להתחבר באופן אוטומטי בסביבת הרשת הזו"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"יש להפעיל את החיבור לרשת זו כשנמצאים בטווח"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"הוספת מכשיר"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"‏אפשר להשתמש בקוד QR כדי להוסיף מכשיר לרשת זו"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"‏קוד QR אינו בפורמט חוקי"</string>
@@ -976,7 +976,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"השתמש באישורי מערכת"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"ללא אישור"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"ללא אימות"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"לא הוגדר אישור. החיבור שלך לא יהיה פרטי."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"שם הרשת ארוך מדי."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"חובה לציין דומיין."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"נדרש אישור."</string>
@@ -1003,6 +1002,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"התחברות"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"‏Wi-Fi הופעל"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"יש חיבור אל <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"מתבצעת התחברות אל <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"מתחבר…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"נכשל הניסיון להתחבר לרשת"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"הרשת לא בטווח"</string>
@@ -1080,7 +1080,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"מתבצע שיתוף תכנים באחת האפליקציות. כדי לשתף חיבור לאינטרנט, יש להשבית את הנקודה לשיתוף אינטרנט ולהפעיל אותה מחדש"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"לא הוגדרה סיסמה"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"שם הנקודה לשיתוף אינטרנט"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"המערכת מפעילה את <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"מתבצעת הפעלה של <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"אפשר לחבר מכשירים נוספים לנקודה <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"הסיסמה לנקודה לשיתוף אינטרנט"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"‏תדר AP"</string>
@@ -1230,7 +1230,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"תצוגה חלקה"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"‏קצב הרענון עולה באופן אוטומטי מ-60 ל-Hz‏90 לחלק מהתוכן. פעולה זו מגבירה את השימוש בסוללה."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"תצוגה חלקה"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"אילוץ קצב רענון של 90 הרץ"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"קצב הרענון הגבוה ביותר לתגובה משופרת למגע ולאיכות אנימציה טובה יותר. פעולה זו מגבירה את השימוש בסוללה."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"המסך נשאר דלוק"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"התכונה פועלת / המסך לא נכבה כשמביטים בו"</string>
@@ -1371,7 +1371,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"‏גרסת Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"‏עדכון אבטחה ל-Android"</string>
     <string name="model_info" msgid="8997566254717810904">"דגם"</string>
-    <string name="model_summary" msgid="2246651782442466213">"‏מודל: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"דגם וחומרה"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"גרסת חומרה"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"זיהוי ציוד"</string>
@@ -1646,31 +1645,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"הגדרות הרשת אופסו"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"‏לא ניתן למחוק כרטיסי SIM"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"‏עקב שגיאה, לא ניתן למחוק כרטיסי SIM שהורדת.\n\nצריך להפעיל מחדש את המכשיר ולנסות שוב."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"מחיקת כל הנתונים (איפוס להגדרות היצרן)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"מחיקת כל הנתונים (איפוס)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"‏פעולה זו תמחק את כל הנתונים מ"<b>"האחסון הפנימי"</b>" של הטאבלט, כולל:\n\n"<li>"חשבון Google שלך"</li>\n<li>"הנתונים וההגדרות של המערכת והאפליקציות שלך"</li>\n<li>"האפליקציות שהורדת"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"‏פעולה זו תמחק את כל הנתונים מ"<b>"האחסון הפנימי"</b>" של הטלפון, כולל:\n\n"<li>"חשבון Google שלך"</li>\n<li>"הנתונים וההגדרות של המערכת והאפליקציות"</li>\n<li>"אפליקציות שהורדת"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"החשבונות הבאים שלך פעילים כעת:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"קיימים משתמשים אחרים במכשיר זה.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"מוסיקה"</li>\n<li>"תמונות"</li>\n<li>"נתוני משתמש אחרים"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727">"‏"<li>"כרטיסי eSIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"מחיקת הנתונים לא תבטל את תוכנית השירות הסלולרי שלך."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">"‏\n\nכדי למחוק פריטי מוזיקה, תמונות ונתוני משתמש אחרים, יש למחוק את "<b>"אחסון ה-USB"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">"‏\n\nכדי למחוק פריטי מוזיקה, תמונות ונתוני משתמש אחרים, יש למחוק את "<b>"כרטיס ה-SD"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"מחיקת כל הנתונים (איפוס להגדרות המקוריות)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"מחיקת כל הנתונים (איפוס להגדרות המקוריות)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"‏פעולה זו תמחק את כל הנתונים מ"<b>"האחסון הפנימי"</b>" של הטאבלט, כולל:\n\n"<li>"חשבון Google שלך"</li>\n<li>"הנתונים וההגדרות של המערכת והאפליקציות"</li>\n<li>"האפליקציות שהורדת"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"‏פעולה זו תמחק את כל הנתונים מ"<b>"האחסון הפנימי"</b>" של הטלפון, כולל:\n\n"<li>"חשבון Google שלך"</li>\n<li>"הנתונים וההגדרות של המערכת והאפליקציות"</li>\n<li>"אפליקציות שהורדת"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"החשבונות הבאים שלך פעילים כעת:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"קיימים משתמשים אחרים במכשיר זה.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"מוזיקה"</li>\n<li>"תמונות"</li>\n<li>"נתוני משתמש אחרים"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729">"‏"<li>"כרטיסי eSIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"מחיקת הנתונים לא תבטל את תוכנית השירות הסלולרי שלך."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">"‏\n\nכדי למחוק פריטי מוזיקה, תמונות ונתוני משתמש אחרים, יש למחוק את "<b>"אחסון ה-USB"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">"‏\n\nכדי למחוק פריטי מוזיקה, תמונות ונתוני משתמש אחרים, יש למחוק את "<b>"כרטיס ה-SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"‏מחק אחסון USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"‏מחק כרטיס SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"‏מחיקת כל הנתונים באחסון ה-USB הפנימי, כגון פריטי מוזיקה או תמונות"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"‏מחיקת כל הנתונים שבכרטיס ה-SD, כגון מוזיקה או תמונות"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"מחיקת כל הנתונים"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"מחיקת כל הנתונים"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"כל המידע האישי שלך והאפליקציות שהורדת יימחקו. לא ניתן לבטל את הפעולה הזו."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"‏כל המידע האישי שלך יימחק, כולל אפליקציות וכרטיסי SIM שהורדת. לא ניתן לבטל את הפעולה הזו."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"מחיקת הכל"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"לא בוצע איפוס מכיוון שהשירות \'ניקוי מערכת\' אינו זמין."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"האם למחוק את כל הנתונים?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"איפוס להגדרות היצרן אינו זמין עבור המשתמש הזה"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"מוחק"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"אנא המתן..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"מחיקת כל הנתונים"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"מחיקת כל הנתונים"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"כל המידע האישי שלך והאפליקציות שהורדת יימחקו. לא ניתן לבטל את הפעולה הזו."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"‏כל המידע האישי שלך יימחק, כולל אפליקציות וכרטיסי SIM שהורדת. לא ניתן לבטל את הפעולה הזו."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"האם למחוק את כל הנתונים?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"איפוס להגדרות המקוריות אינו זמין עבור המשתמש הזה"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"מתבצעת מחיקה"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"יש להמתין…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"הגדרות שיחה"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"הגדרת דואר קולי, העברת שיחות, שיחה ממתינה, זיהוי מתקשר"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"‏שיתוף אינטרנט דרך USB"</string>
@@ -1718,7 +1715,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"לא ניתן לשתף אינטרנט בין למעלה מ-<xliff:g id="MAXCONNECTION">%1$d</xliff:g> מכשירים."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"קשירת <xliff:g id="DEVICE_NAME">%1$s</xliff:g> תבוטל."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"‏שיתוף אינטרנט עם Ethernet"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"‏שיתוף החיבור לאינטרנט של הטלפון דרך USB Ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"‏שיתוף החיבור לאינטרנט של הטלפון דרך Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"אפשר להשתמש בנקודה לשיתוף אינטרנט ובשיתוף אינטרנט בין ניידים כדי לאפשר למכשירים אחרים להתחבר לאינטרנט דרך חבילת הגלישה שלך. ניתן גם להשתמש באפליקציות כדי ליצור נקודה לשיתוף אינטרנט ולשתף תכנים בין מכשירים שנמצאים בקרבת מקום."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"‏ניתן להשתמש בנקודה לשיתוף אינטרנט ובשיתוף אינטרנט בין מכשירים כדי לאפשר למכשירים אחרים להתחבר לאינטרנט דרך ה-Wi-Fi או דרך חבילת הגלישה שלך. ניתן גם להשתמש באפליקציות כדי ליצור נקודה לשיתוף אינטרנט ולשתף תכנים בין מכשירים שנמצאים בקרבת מקום."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"עזרה"</string>
@@ -2165,13 +2162,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"כתוביות"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"הגדלה"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"אזור ההגדלה"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"הפעלת ההגדלה"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"יש לבחור את אזורי ההגדלה שישמשו אותך בזמן הגדלת המסך"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"מסך מלא"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"חלק מהמסך"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"מסך מלא וחלק מהמסך"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"הגדלת כל המסך"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"הגדלת חלק מהמסך"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"לעבור ללחצן הנגישות?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"השימוש בהקשה שלוש פעמים להגדלת חלק מהמסך יגרום להשהייה של ההקלדה ופעולות אחרות.\n\nרוצה לעבור לשימוש בלחצן הנגישות להגדלה?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"מעבר ללחצן הנגישות"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"אמשיך להקיש שלוש פעמים להגדלה"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"הגדרות ההגדלה"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"הגדלה על-ידי הקשה שלוש פעמים"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"הגדלה בעזרת קיצור דרך"</string>
@@ -2225,11 +2225,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"לחצן ההפעלה מסיים שיחה"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"מצביע עכבר גדול"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"הסרת אנימציות"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"אודיו במונו"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"שילוב ערוצים כאשר מפעילים אודיו"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"איזון אודיו"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"שמאל"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"ימין"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"אודיו במונו"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"שילוב ערוצים כאשר מפעילים אודיו"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"איזון אודיו"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"שמאל"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"ימין"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"ברירת מחדל"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 שניות"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 שניות"</string>
@@ -2259,11 +2259,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"רטט ההתראה"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"רטט הצלצול"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"משוב מגע"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"שימוש באפליקציה <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"פתיחת <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"שימוש בתיקון צבע"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"הצגת הכתוביות"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"רק לאפליקציה נתמכת"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"שימוש באפליקציה <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"פתיחה של <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"שימוש בתיקון צבע"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"הצגת הכתוביות"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"רק לאפליקציה נתמכת"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"גודל וסגנון הכתוביות"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"גודל טקסט: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"אפשרויות נוספות"</string>
@@ -2295,6 +2295,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"דוטרנומליה"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"פרוטנומליה"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"טריטנומליה"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"גווני אפור"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"אדום-ירוק"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"אדום-ירוק"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"כחול-צהוב"</string>
@@ -2436,7 +2437,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"הגבלת פעילות ברקע"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"התר לאפליקציה לפעול ברקע"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"האפליקציה לא מורשית לפעול ברקע"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"לא ניתן להגביל שימוש ברקע"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"לא ניתן להגביל שימוש ברקע"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"להגביל את הפעילות ברקע?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"הגבלת הפעילות של אפליקציה ברקע עלולה לשבש את פעולתה"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"מכיוון שהאפליקציה לא מוגדרת לאופטימיזציה של הסוללה, לא ניתן להגבילה.\n\nכדי להגביל אותה, תחילה יש להפעיל אופטימיזציה של הסוללה."</string>
@@ -2667,9 +2668,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"הגדרת לוח זמנים"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"הארכת חיי הסוללה"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"כיבוי כשהסוללה טעונה"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"\'חיסכון בסוללה\' כבה כשהטלפון מגיע ל-<xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"\'חיסכון בסוללה\' כבה כשהטאבלט מגיע ל-<xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"\'חיסכון בסוללה\' כבה כשהמכשיר מגיע ל-<xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"\'חיסכון בסוללה\' כבה כשטעינת הטלפון גבוהה מ-<xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"\'חיסכון בסוללה\' כבה כשטעינת הטאבלט גבוהה מ-<xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"\'חיסכון בסוללה\' כבה כשטעינת המכשיר גבוהה מ-<xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"הפעלה"</string>
@@ -2734,6 +2735,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"איפוס המכשיר"</string>
     <string name="tts_play" msgid="2945513377250757221">"הפעלה"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"קישוריות ניתנת להתאמה"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"ההעדפה הזו מאריכה את חיי הסוללה ומשפרת את ביצועי המכשיר על ידי ניהול אוטומטי של החיבורים שלך לרשת"</string>
     <string name="credentials_title" msgid="7535942196886123656">"אחסון אישורים"</string>
     <string name="credentials_install" msgid="3933218407598415827">"התקנת אישור"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"התקנת אישורים מאמצעי אחסון"</string>
@@ -2745,9 +2748,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"פרטי משתמש"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"הצגה ועריכה של פרטי כניסה מאוחסנים"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"אפשרויות מתקדמות"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"סוג אחסון"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"מגובה באמצעות חומרה"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"תוכנה בלבד"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"פרטי כניסה אינם זמינים עבור המשתמש הזה"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"‏מותקן עבור VPN ואפליקציות"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"‏מותקן עבור Wi-Fi"</string>
@@ -3146,7 +3146,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"תשלום במסוף"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"הגדר אפליקציית תשלום. לאחר מכן עליך רק להצמיד את גב הטלפון למסוף שעליו מופיע סמל התשלום ללא מגע."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"הבנתי"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"עוד..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"עוד…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"הגדרה של אפליקציית התשלומים שתשמש כברירת המחדל"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"עדכון של אפליקציית התשלומים שתשמש כברירת המחדל"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"במסוף ללא מגע, יש לשלם באמצעות <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3230,7 +3230,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"השתמש תמיד עבור שיחות"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"‏בחר SIM לנתונים"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"‏יש לבחור SIM ל-SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"‏מחליף את כרטיס ה-SIM המשמש לתקשורת נתונים. הפעולה עשויה לערוך עד דקה..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"‏מתבצעת החלפה של כרטיס ה-SIM המשמש לתקשורת נתונים. הפעולה עשויה להימשך עד דקה…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"התקשר באמצעות"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"‏בחירת כרטיס SIM"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"‏SIM ‏<xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3375,6 +3375,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"תרחיש, לוח זמנים, מצב חיסכון בסוללה, חיסכון בחשמל, סוללה, אוטומטי, אחוז"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"‏volte, שיחות טלפון מתקדמות; שיחות 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"הוספת שפה, להוסיף שפה"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"גודל טקסט"</string>
     <string name="default_sound" msgid="6604374495015245195">"צליל ברירת מחדל"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"עוצמת הקול של צלצול והתראות ברמה של <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"עוצמת קול, רטט ומצב \'נא לא להפריע\'"</string>
@@ -3414,13 +3415,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"הפעלת צלילים"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"כתוביות בזמן אמת"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"הוספת כתוביות אוטומטית למדיה"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"ללא"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="two">הוגדרו <xliff:g id="ON_COUNT">%d</xliff:g> לוחות זמנים</item>
-      <item quantity="many">הוגדרו <xliff:g id="ON_COUNT">%d</xliff:g> לוחות זמנים</item>
-      <item quantity="other">הוגדרו <xliff:g id="ON_COUNT">%d</xliff:g> לוחות זמנים</item>
-      <item quantity="one">הוגדר לוח זמנים אחד</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{אין}=1{הוגדר לוח זמנים אחד}two{הוגדרו # לוחות זמנים}many{הוגדרו # לוחות זמנים}other{הוגדרו # לוחות זמנים}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"נא לא להפריע"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"שליחת התראה רק מאפליקציות ומאנשים חשובים"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"הגבלת הפרעות"</string>
@@ -3488,24 +3483,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"עדיפות בלבד"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"פועל / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"כבוי / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"כבוי"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"פועל"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"יש לשאול בכל פעם"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"עד הכיבוי"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="two">שעתיים (<xliff:g id="NUM_HOURS">%d</xliff:g>)</item>
-      <item quantity="many"><xliff:g id="NUM_HOURS">%d</xliff:g> שעות</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> שעות</item>
-      <item quantity="one">שעה</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> דקות"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="two">ניתן להפעיל <xliff:g id="ON_COUNT">%d</xliff:g> לוחות זמנים באופן אוטומטי</item>
-      <item quantity="many">ניתן להפעיל <xliff:g id="ON_COUNT">%d</xliff:g> לוחות זמנים באופן אוטומטי</item>
-      <item quantity="other">ניתן להפעיל <xliff:g id="ON_COUNT">%d</xliff:g> לוחות זמנים באופן אוטומטי</item>
-      <item quantity="one">ניתן להפעיל לוח זמנים אחד באופן אוטומטי</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{שעה}two{שעתיים}many{# שעות}other{# שעות}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{דקה אחת}two{# דקות}many{# דקות}other{# דקות}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{כבוי}=1{כבוי/ניתן להפעיל לוח זמנים אחד באופן אוטומטי}two{כבוי/ניתן להפעיל # לוחות זמנים באופן אוטומטי}many{כבוי/ניתן להפעיל # לוחות זמנים באופן אוטומטי}other{כבוי/ניתן להפעיל # לוחות זמנים באופן אוטומטי}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"מה יכול להפריע לתכונה \'נא לא להפריע\'"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"אנשים"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"אפליקציות"</string>
@@ -3551,6 +3534,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"הגדרה אוטומטית של התראות בעדיפות נמוכה כ\'רמה מתונה\'"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"דירוג מותאם של התראות"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"דירוג אוטומטי של התראות לפי רלוונטיות"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"משוב להתראות מותאמות"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"ציון התאמות שבוצעו בהתראות והצגת האפשרות לספק למערכת משוב"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"הצעות לפעולות ותשובות"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"הצגה אוטומטית של פעולות ותגובות מומלצות"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"הצגת התראות אחרונות והתראות שהועברו למצב נודניק"</string>
@@ -3757,7 +3742,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"גישה אל \'נא לא להפריע\'"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"הפעלת ההרשאה \'נא לא להפריע\'"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"אין אפליקציות מותקנות שביקשו גישה אל \'נא לא להפריע\'"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"טוען אפליקציות..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"מתבצעת טעינה של אפליקציות…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"‏לבקשתך, מערכת Android לא מאפשרת להציג במכשיר הזה התראות מהאפליקציה הזו"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"‏לבקשתך, מערכת Android לא מאפשרת להציג במכשיר הזה התראות ששייכות לקטגוריה הזו"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"‏לבקשתך, מערכת Android לא מאפשרת להציג במכשיר הזה התראות מקבוצה זו"</string>
@@ -3855,13 +3840,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"כל השיחות"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"שיחות בעדיפות גבוהה"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"ללא"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="two"><xliff:g id="CONVERSATIONS">%d</xliff:g> שיחות</item>
-      <item quantity="many"><xliff:g id="CONVERSATIONS">%d</xliff:g> שיחות</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> שיחות</item>
-      <item quantity="one">שיחה אחת</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"ללא"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{אין}=1{שיחה אחת}two{# שיחות}many{# שיחות}other{# שיחות}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"מי יכול להפריע"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"שיחות"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"שיחות"</string>
@@ -3870,13 +3849,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"כדי לוודא ששיחות מורשות יישמעו, יש לבדוק אם המכשיר מוגדר לצלצול"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"למשך ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’, שיחות נכנסות ייחסמו. ניתן לשנות את ההגדרות כדי לאפשר לחברים, לבני משפחה או לאנשי קשר אחרים ליצור איתך קשר."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"אנשי קשר שמסומנים בכוכב"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="two"><xliff:g id="NUM_PEOPLE">%d</xliff:g> נוספים</item>
-      <item quantity="many"><xliff:g id="NUM_PEOPLE">%d</xliff:g> נוספים</item>
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> נוספים</item>
-      <item quantity="one">1 נוסף</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"אף איש קשר שסומן בכוכב"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{אין}=1{{contact_1}}=2{{contact_1} וגם {contact_2}}=3{{contact_1}, {contact_2} וגם {contact_3}}many{{contact_1}, {contact_2} ו-# אנשים נוספים}other{{contact_1}, {contact_2} ו-# אנשים נוספים}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"התראות"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"הודעות"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"הודעות"</string>
@@ -3885,13 +3858,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"למשך ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’, הודעות נכנסות ייחסמו. ניתן לשנות את ההגדרות כדי לאפשר לחברים, לבני משפחה או לאנשי קשר אחרים ליצור איתך קשר."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"כל ההודעות יכולות להגיע אליך"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"כל השיחות יכולות להגיע אליך"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"אף איש קשר"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="two"><xliff:g id="NUM_CONTACTS">%d</xliff:g> אנשי קשר</item>
-      <item quantity="many"><xliff:g id="NUM_CONTACTS">%d</xliff:g> אנשי קשר</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> אנשי קשר</item>
-      <item quantity="one">איש קשר אחד</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{אין}=1{איש קשר אחד}two{# אנשי קשר}many{# אנשי קשר}other{# אנשי קשר}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"כולם"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"אנשי קשר"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"אנשי קשר שמסומנים בכוכב"</string>
@@ -3929,26 +3896,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"כל ההתראות"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"חלק מההתראות"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"האנשים הנבחרים יוכלו ליצור איתך קשר, גם אם לא אישרת לאפליקציות להפריע"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="two"><xliff:g id="APP_NAMES">%s</xliff:g> יכולות להפריע</item>
-      <item quantity="many"><xliff:g id="APP_NAMES">%s</xliff:g> יכולות להפריע</item>
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> יכולות להפריע</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> יכולה להפריע</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"עוד <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{אף אפליקציה לא יכולה להפריע}=1{האפליקציה {app_1} יכולה להפריע}=2{האפליקציות {app_1} וגם {app_2} יכולות להפריע}=3{האפליקציות {app_1}, {app_2} וגם {app_3} יכולות להפריע}many{האפליקציות {app_1}, {app_2} ועוד # יכולות להפריע}other{האפליקציות {app_1}, {app_2} ועוד # יכולות להפריע}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"אפליקציות"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"כל ההתראות"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"חלק מההתראות"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"התראות שיכולות להפריע"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"אישור לכל ההתראות"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="two">הקטגוריות <xliff:g id="SOUND_CATEGORIES">%s</xliff:g> יכולות להפריע</item>
-      <item quantity="many">הקטגוריות <xliff:g id="SOUND_CATEGORIES">%s</xliff:g> יכולות להפריע</item>
-      <item quantity="other">הקטגוריות <xliff:g id="SOUND_CATEGORIES">%s</xliff:g> יכולות להפריע</item>
-      <item quantity="one">הקטגוריה <xliff:g id="SOUND_CATEGORY">%s</xliff:g> יכולה להפריע</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"שום דבר לא יכול להפריע"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"עוד <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{שום דבר לא יכול להפריע}=1{הקטגוריה {sound_category_1} יכולה להפריע}=2{הקטגוריות {sound_category_1} וגם {sound_category_2} יכולות להפריע}=3{הקטגוריות {sound_category_1}, {sound_category_2} וגם {sound_category_3} יכולות להפריע}many{האפליקציות {sound_category_1}, {sound_category_2} ועוד # יכולות להפריע}other{האפליקציות {sound_category_1}, {sound_category_2} ועוד # יכולות להפריע}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"שום דבר לא יכול להפריע"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"אף אחד לא יכול להפריע"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"אנשים מסוימים יכולים להפריע"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"כל אחד יכול להפריע"</string>
@@ -4212,7 +4167,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"‏USB נשלט על ידי"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"מכשיר מחובר"</string>
     <string name="usb_control_device" msgid="527916783743021577">"מכשיר זה"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"מתבצע מעבר..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"מתבצע מעבר…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"לא ניתן היה לעבור"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"הטענת המכשיר"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"טעינת המכשיר המחובר"</string>
@@ -4473,7 +4428,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"לפרטים"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"‏חוסך הנתונים (Data Saver)"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"גישה בלתי מוגבלת לנתונים"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"נתוני הרקע כבויים"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"נתוני הרקע כבויים"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"פועל"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"כבוי"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"‏שימוש בחוסך הנתונים (Data Saver)"</string>
@@ -4496,7 +4451,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"כשהמכשיר נעול לא תתאפשר הקלדת תגובות או טקסט אחר בהתראות"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"ברירת מחדל לבודק איות"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"בחירת בודק איות"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"שימוש בבדיקת איות"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"שימוש בבדיקת איות"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"לא נבחר"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(ללא)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4594,7 +4549,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"כדי לעזור בפינוי שטח אחסון, מנהל האחסון מסיר מהמכשיר שלך תמונות וסרטונים מגובים."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"הסרת תמונות וסרטונים"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"מנהל אחסון"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"שימוש במנהל אחסון"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"שימוש במנהל האחסון"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"באופן אוטומטי"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"ידני"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"פינוי שטח אחסון עכשיו"</string>
@@ -4632,6 +4587,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"הקשה כפולה לבדיקת הטלפון"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"הקשה כפולה לבדיקת הטאבלט"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"הקשה כפולה לבדיקת המכשיר"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"החלקה לקריאת הודעות"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"כדי להציג את ההתראות, יש להחליק למטה בקצה התחתון של המסך"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"מצב שימוש ביד אחת"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"שימוש במצב שימוש ביד אחת"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"יציאה מהמצב בזמן החלפת אפליקציות"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"זמן קצוב לתפוגה"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 שניות"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 שניות"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 שניות"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"גישה ביד אחת"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"כדי להתעדכן מה השעה, לבדוק התראות ולהציג מידע נוסף, צריך להקיש פעמיים על המסך."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"הרמה לבדיקת הטלפון"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"הרמה לבדיקת הטאבלט"</string>
@@ -4644,6 +4609,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"הקשה לבדיקת הטאבלט"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"הקשה לבדיקת המכשיר"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"כדי להתעדכן מה השעה, לבדוק התראות ולהציג מידע נוסף, צריך להקיש על המסך."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"לחצן מצוקה"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"כדי להפעיל את הפעולות למקרה חירום, יש ללחוץ על לחצן ההפעלה 5 פעמים במהירות."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"צליל אזהרה"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"תתקבל התראה לפני שהפעולות יתחילו"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"אנשי קשר במקרה חירום"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"החלקת טביעת אצבע לקריאת התראות"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"החלקה של טביעת אצבע"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"כדי לבדוק התראות יש להחליק כלפי מטה בחיישן טביעות האצבע שבחלק האחורי של הטלפון."</string>
@@ -4812,7 +4782,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"הפעלה לכל האפליקציות"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"בחירת מנהל ההתקן לגרפיקה"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"ברירת מחדל"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"מנהל ההתקן של המשחק"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"מנהל ההתקן של המשחק"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"מנהל ההתקן למפתחים"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"מנהל ההתקן לגרפיקה של המערכת"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4881,6 +4851,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"לא נמצאו רשתות. אפשר לנסות שוב."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(אסור)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"‏אין כרטיס SIM"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"‏אין כרטיס SIM"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"‏אין מידע על רשת ה-Wi-Fi"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"‏נדרש כרטיס SIM כדי להתחבר לרשת ה-Wi-Fi"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"‏נדרש כרטיס SIM של <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> כדי להתחבר לרשת ה-Wi-Fi"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"‏מצב רשת מועדפת: WCDMA מועדף"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"‏מצב רשת מועדפת: GSM בלבד"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"‏מצב רשת מועדפת: WCDMA בלבד"</string>
@@ -4934,6 +4909,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"חבילת גלישה"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"שימוש בחבילת הגלישה דרך הרשת הסלולרית"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"הטלפון יעבור באופן אוטומטי לספק הזה כשיהיה בטווח"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"‏אין כרטיס SIM זמין"</string>
     <string name="calls_preference" msgid="2166481296066890129">"העדפת שיחות"</string>
     <string name="sms_preference" msgid="7742964962568219351">"‏העדפת SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"הצגת שאלה בכל פעם"</string>
@@ -5122,10 +5098,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"אפשרות של שכבות-על במסכי \'הגדרות\'"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"אפליקציות שיכולות להופיע מעל אפליקציות אחרות יוכלו ליצור שכבות-על במסכי ההגדרות"</string>
     <string name="media_controls_title" msgid="403271085636252597">"מדיה"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"הנגן יוסתר כשסשן המדיה יסתיים"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"הנגן מאפשר לך להמשיך סשן מחלונית מורחבת של הגדרות מהירות."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"‏Media Player בהגדרות המהירות"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"‏הצגת Media Player לפרק זמן ממושך כדי להמשיך את ההפעלה בקלות"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"הסתרת הנגן"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"הצגת הנגן"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"אין נגנים זמינים"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"אפליקציות מורשות"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"מדיה"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"‏ה-Bluetooth יופעל"</string>
 </resources>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index a73bef3..ebdc090 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"中"</item>
     <item msgid="6740026006576843477">"長め"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"短め"</item>
+    <item msgid="7397961711906421599">"中"</item>
+    <item msgid="4079132024502041928">"長め"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"デフォルト"</item>
     <item msgid="4234707448428002595">"Sans Serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA / EV-DO / GSM / WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA+LTE / EV-DO"</item>
     <item msgid="2247906254631766720">"GSM / WCDMA / LTE"</item>
-    <item msgid="1091258946200124345">"グローバル"</item>
+    <item msgid="4147872615520331421">"LTE / CDMA / EvDo / GSM / WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA のみ"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR / LTE"</item>
     <item msgid="5237423971422723128">"NR / LTE / CDMA / EV-DO"</item>
     <item msgid="6856991565745877075">"NR / LTE / GSM / WCDMA"</item>
-    <item msgid="473436147270962091">"NR / LTE / CDMA / EV-DO / GSM / WCDMA"</item>
+    <item msgid="8908263949185004366">"グローバル"</item>
     <item msgid="6692179237956480280">"NR / LTE / WCDMA"</item>
     <item msgid="8160757136163231885">"NR / LTE / TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR / LTE / TDSCDMA / GSM"</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 2612965..44d066a 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"ロック画面にプロファイル情報を表示"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"アカウント"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"位置情報"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"位置情報の使用"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"位置情報の使用"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"OFF"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">ON - <xliff:g id="COUNT_1">%1$d</xliff:g> 個のアプリに位置情報へのアクセスを許可</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"顔で認証"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"開始"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"ユーザー補助の顔認証が OFF に設定されている場合、一部の設定手順は TalkBack を使用して適切に行えないことがあります。"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"戻る"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"設定を続行"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"ユーザー補助の設定を使用"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="one"><xliff:g id="NUMBER_0">%d</xliff:g> 桁未満にしてください</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"デバイス管理により、最近使用した PIN は使用できません"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"一般的な PIN は IT 管理者によってブロックされています。別の PIN をお試しください。"</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"無効な文字があります"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"英字が 1 文字以上必要です"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"数字が 1 つ以上必要です"</string>
@@ -653,7 +655,6 @@
       <item quantity="one">数字以外の文字を 1 個以上使用してください</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"デバイス管理により、最近使用したパスワードは使用できません"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"一般的なパスワードは IT 管理者によってブロックされています。別のパスワードをお試しください。"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"一連の数字を昇順や降順にしたり、繰り返したりすることはできません"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"確認"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"キャンセル"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Wi-FiをONにする"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Wi-Fi の使用"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Wi-Fi の使用"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wi-Fiの設定"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"ワイヤレスアクセスポイントを設定する"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"「<xliff:g id="SSID">%1$s</xliff:g>」に接続するには、下記の中心に QR コードを合わせてください"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Wi‑Fi に接続するには、QR コードをスキャンしてください"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Wi‑Fi の共有"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"この QR コードをスキャンすると、パスワードが共有されて「<xliff:g id="SSID">%1$s</xliff:g>」に接続できます"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"「<xliff:g id="SSID">%1$s</xliff:g>」に参加するには、別のデバイスでこの QR コードをスキャンしてください"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"「<xliff:g id="SSID">%1$s</xliff:g>」に接続するには、この QR コードをスキャンしてください"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"もう一度お試しください。問題が解決しない場合は、デバイスのメーカーにお問い合わせください"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"エラーが発生しました"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi‑Fi パスワード: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"アクセス ポイントのパスワード: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"自動接続"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"このネットワークに近付いたら自動で接続する"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"このネットワークの近くで自動接続することをタブレットに許可する"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"圏内に入ると自動的にこのネットワークに接続するようになります"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"デバイスを追加"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"QR コードを使用して、このネットワークにデバイスを追加できます"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR コードの形式が無効です"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"システム証明書を使用"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"指定しない"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"検証しない"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"証明書が指定されていません。この接続ではプライバシーが保護されません。"</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"ネットワーク名が長すぎます。"</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"ドメインを指定する必要があります。"</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"証明書が必要です。"</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"接続"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi‑Fi を有効にしました"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> に接続しました"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> に接続中"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"接続しています…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"ネットワークに接続できませんでした"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"ネットワーク圏外です"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"アプリがコンテンツを共有しています。インターネット接続を共有するには、アクセス ポイントを OFF にしてから再度 ON にします"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"パスワードが設定されていません"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"アクセス ポイント名"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> を ON にしています..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> を ON にしています…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"他のデバイスが <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> に接続できます"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"アクセス ポイントのパスワード"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP 周波数帯"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"スムーズ ディスプレイ"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"コンテンツに応じて、リフレッシュ レートを自動的に 60 Hz から 90 Hz に変更します。電池使用量が増えます。"</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"スムーズ ディスプレイ"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"90 Hz リフレッシュ レートの適用"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"最高のリフレッシュ レートを適用します。タップの反応とアニメーションの品質が向上します。電池使用量が増えます。"</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"スクリーン アテンション"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"ON / 見ている間は画面が OFF になりません"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android バージョン"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android セキュリティ アップデート"</string>
     <string name="model_info" msgid="8997566254717810904">"モデル"</string>
-    <string name="model_summary" msgid="2246651782442466213">"モデル: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"モデルとハードウェア"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"ハードウェア バージョン"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"装置ID"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"ネットワーク設定をリセットしました"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"SIM を消去できません"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"エラーのためダウンロード型 SIM を消去できません。\n\nデバイスを再起動してもう一度お試しください。"</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"すべてのデータを消去（出荷時リセット）"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"全データを消去（出荷時リセット）"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"この操作を行うと、以下のデータを含め、タブレットの"<b>"内部ストレージ"</b>"の全データが消去されます。\n\n"<li>"Google アカウント"</li>\n<li>"システムやアプリのデータと設定"</li>\n<li>"ダウンロードしたアプリ"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"この操作を行うと、以下のデータを含め、スマートフォンの"<b>"内部ストレージ"</b>"の全データが消去されます。\n\n"<li>"Google アカウント"</li>\n<li>"システムやアプリのデータと設定"</li>\n<li>"ダウンロードしたアプリ"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"以下のアカウントにログインしています:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"このデバイスには他にもユーザーがいます。\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"音楽"</li>\n<li>"画像"</li>\n<li>"他のユーザーデータ"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"この操作を行っても、ご利用のモバイル サービス プランはキャンセルされません。"</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"音楽、画像、その他のユーザーデータを消去する場合は"<b>"USBストレージデータ"</b>"を消去する必要があります。"</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"音楽、画像、その他のユーザーデータを消去するには、"<b>"SDカード"</b>"を消去する必要があります。"</string>
+    <string name="main_clear_title" msgid="277664302144837723">"全データを消去（出荷時リセット）"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"全データを消去（出荷時リセット）"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"この操作を行うと、以下のデータを含め、タブレットの"<b>"内部ストレージ"</b>"の全データが消去されます。\n\n"<li>"Google アカウント"</li>\n<li>"システムやアプリのデータと設定"</li>\n<li>"ダウンロードしたアプリ"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"この操作を行うと、以下のデータを含め、スマートフォンの"<b>"内部ストレージ"</b>"の全データが消去されます。\n\n"<li>"Google アカウント"</li>\n<li>"システムやアプリのデータと設定"</li>\n<li>"ダウンロードしたアプリ"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"以下のアカウントにログインしています:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"このデバイスには他にもユーザーがいます。\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"音楽"</li>\n<li>"画像"</li>\n<li>"他のユーザーデータ"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"この操作を行っても、ご利用のモバイル サービス プランはキャンセルされません。"</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"音楽、画像、その他のユーザーデータを消去する場合は "<b>"USB ストレージ データ"</b>"を消去する必要があります。"</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"音楽、画像、その他のユーザーデータを消去するには、"<b>"SD カード"</b>"を消去する必要があります。"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USBストレージ内データの消去"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SDカード内データを消去"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"内部USBストレージ内の全データ（音楽、画像など）を消去します"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"SDカード内の全データ（音楽、画像など）を消去します"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"すべてのデータを消去"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"すべてのデータを消去"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"個人情報とダウンロードしたアプリがすべて削除されます。この操作を取り消すことはできません。"</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"ダウンロードしたアプリや SIM を含め、個人情報がすべて削除されます。この操作を取り消すことはできません。"</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"すべて消去"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"System Clearサービスが利用できないため、リセットされませんでした。"</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"すべてのデータを消去しますか？"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"このユーザーは出荷時設定へのリセットを許可されていません"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"消去中"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"お待ちください..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"すべてのデータを消去"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"すべてのデータを消去"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"個人情報とダウンロードしたアプリがすべて削除されます。この操作を取り消すことはできません。"</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"ダウンロードしたアプリや SIM を含め、個人情報がすべて削除されます。この操作を取り消すことはできません。"</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"すべてのデータを消去しますか？"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"このユーザーは出荷時設定へのリセットを許可されていません"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"消去しています"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"お待ちください…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"通話設定"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"ボイスメール、着信転送、発信者番号など"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB テザリング"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"テザリングできるデバイスは<xliff:g id="MAXCONNECTION">%1$d</xliff:g>個までです。"</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>のテザリングを解除します。"</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"イーサネット テザリング"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"スマートフォンのインターネット接続を USB イーサネット経由で共有"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"スマートフォンのインターネット接続をイーサネット経由で共有"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"アクセス ポイントとテザリングを使用して、モバイルデータ通信により他のデバイスにインターネット接続を提供します。アプリを使ってアクセス ポイントを作成し、コンテンツを近くのデバイスと共有することもできます。"</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"アクセス ポイントとテザリングを使用して、Wi-Fi やモバイルデータ通信により他のデバイスにインターネット接続を提供します。アプリを使ってアクセス ポイントを作成し、コンテンツを近くのデバイスと共有することもできます。"</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"ヘルプ"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"字幕の設定"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"拡大"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"拡大領域"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"拡大の有効化"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"画面を拡大する際の拡大領域を選択します"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"全画面"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"画面の一部"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"全画面と画面の一部"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"画面全体を拡大します"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"画面の一部を拡大します"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"ユーザー補助機能ボタンに切り替えますか？"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"トリプルタップで画面の一部を拡大すると、入力などの操作が遅くなります。\n\nユーザー補助機能ボタンを使用した拡大に切り替えますか？"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"ユーザー補助機能ボタンに切り替え"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"トリプルタップによる拡大を維持"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"画面の拡大設定"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"トリプルタップで拡大"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"ショートカットで拡大"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"電源ボタンで通話を終了"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"マウスポインタを拡大"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"アニメーションを無効化"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"モノラル音声"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"音声再生時のチャンネルを統合する"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"オーディオ バランス"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"左"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"右"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"モノラル音声"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"音声再生時のチャンネルを統合する"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"オーディオ バランス"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"左"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"右"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"デフォルト"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10秒"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30秒"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"通知時のバイブレーション"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"着信時のバイブレーション"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"触覚フィードバック"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> を使用"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>を開く"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"色補正の使用"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"字幕を表示"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"サポートされているアプリのみ"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"「<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>」の使用"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> を開く"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"色補正の使用"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"字幕の表示"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"サポートされているアプリのみ"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"字幕のサイズとスタイル"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"文字サイズ: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"その他のオプション"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"第二色弱"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"第一色弱"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"第三色弱"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"グレースケール"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"赤 / 緑"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"赤 / 緑"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"青 / 黄"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"バックグラウンドでの使用の制限"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"バックグラウンドでのアプリの実行を許可"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"バックグラウンドでのアプリの実行は許可されません"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"バックグラウンドでの使用を制限できません"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"バックグラウンドでの使用を制限できません"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"バックグラウンド アクティビティの制限"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"アプリのバックグラウンド アクティビティを制限すると、アプリが正常に機能しないことがあります"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"このアプリは、電池の最適化が設定されていないため、制限することはできません。\n\nこのアプリを制限するには、電池の最適化を ON にしてください。"</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"スケジュールの設定"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"電池を長持ちさせる"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"充電時にオフにする"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"スマートフォンの電池が <xliff:g id="PERCENT">%1$s</xliff:g> まで充電されると、バッテリー セーバーが OFF になります"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"タブレットの電池残量が <xliff:g id="PERCENT">%1$s</xliff:g> になると、バッテリー セーバーは無効になります"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"デバイスの電池残量が <xliff:g id="PERCENT">%1$s</xliff:g> になると、バッテリー セーバーは無効になります"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"スマートフォンの電池が <xliff:g id="PERCENT">%1$s</xliff:g> 以上充電されると、バッテリー セーバーが OFF になります"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"タブレットの電池が <xliff:g id="PERCENT">%1$s</xliff:g> 以上充電されると、バッテリー セーバーが OFF になります"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"デバイスの電池が <xliff:g id="PERCENT">%1$s</xliff:g> 以上充電されると、バッテリー セーバーが OFF になります"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"ON にする"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"リセット"</string>
     <string name="tts_play" msgid="2945513377250757221">"再生"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"アダプティブ接続"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"ネットワーク接続を自動的に管理することで、電池が長持ちし、デバイスのパフォーマンスが改善します"</string>
     <string name="credentials_title" msgid="7535942196886123656">"認証情報ストレージ"</string>
     <string name="credentials_install" msgid="3933218407598415827">"証明書のインストール"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"ストレージから証明書をインストールする"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"ユーザー認証情報"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"保存されている認証情報の表示と変更"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"詳細設定"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"ストレージのタイプ"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"ハードウェア式"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"ソフトウェアのみ"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"認証情報はこのユーザーには表示されません"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN とアプリ用にインストール済み"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi 用にインストール済み"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"デバイス機器でのお支払い"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"決済アプリを設定してから、スマートフォンの背面を非接触型決済マークのあるデバイスにかざしてください。"</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"OK"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"その他..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"その他…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"デフォルトのお支払いアプリの設定"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"デフォルトのお支払いアプリの更新"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"非接触型決済端末でのお支払いに <xliff:g id="APP">%1$s</xliff:g> を使用"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"このSIMを常に通話に使用する"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"データに使用するSIMを選択してください"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"SMS 用の SIM を選択します"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"データSIMに切り替えています。最大で1分ほどかかる場合があります..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"データ SIM に切り替えています。最大で 1 分ほどかかる場合があります…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"通話に使用するSIMを選択してください"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"SIMカードを選択"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIMカード番号: <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"ルーティン, スケジュール, バッテリー セーバー, パワーセーバー, 電池, 自動, パーセント, 繰り返し, 定型, 消費電力, 節約, パワー, バッテリー"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"VoLTE、拡張モードでの通話、4G 回線による通話"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"言語を追加, 追加 言語"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"文字サイズ"</string>
     <string name="default_sound" msgid="6604374495015245195">"デフォルトの通知音"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"着信音と通知の音量: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"音量、バイブレーション、サイレント モード"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"電源オンの音"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"自動字幕起こし"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"メディアの自動字幕起こし"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"なし"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> 個のスケジュールを設定</item>
-      <item quantity="one">1 個のスケジュールを設定</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{なし}=1{1 件のスケジュールを設定}other{# 件のスケジュールを設定}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"サイレント モード"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"大切な人やアプリからの通知のみ受け取ります"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"割り込みを制限する"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"優先的な通知のみ"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>。<xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"ON / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"OFF / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"OFF"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"ON"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"毎回確認"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"OFF にするまで"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g>時間</item>
-      <item quantity="one">1時間</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g>分"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> 件のスケジュールを自動的に ON にできます</item>
-      <item quantity="one">1 件のスケジュールを自動的に ON にできます</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1時間}other{#時間}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1分}other{#分}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{OFF}=1{OFF / 1 件のスケジュールを自動的に ON にできます}other{OFF / # 件のスケジュールを自動的に ON にできます}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"サイレント モードに割り込み可能なもの"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"人物"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"アプリ"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"優先度の低い通知を自動的に通知音なしに設定します"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"通知のランキングの自動調整"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"関連性を基準に通知のランキングを自動的に調整する"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"通知の自動調整に関するフィードバック"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"通知に加えた調整と、システムにフィードバックを提供するオプションが表示されます"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"操作や返信の候補"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"操作や返信の候補が自動的に表示されます"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"最近の通知とスヌーズに設定した通知を表示します"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"サイレント モードへのアクセス"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"サイレント モードを許可"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"サイレント モードへのアクセスをリクエストしたインストール済みアプリはありません"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"アプリを読み込んでいます..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"アプリを読み込んでいます…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"選択された設定に基づき、このアプリの通知はこのデバイスに表示されません"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"選択された設定に基づき、このカテゴリの通知はこのデバイスには表示されません"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"リクエストに従い、このグループの通知はこのデバイスには表示されません"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"すべての会話"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"優先度の高い会話"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"なし"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> 件の会話</item>
-      <item quantity="one">1 件の会話</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"なし"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{なし}=1{1 件の会話}other{# 件の会話}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"割り込み可能なユーザー"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"通話"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"通話"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"許可した通話で必ず音が鳴るようにするには、デバイスの設定が着信音になっていることをご確認ください"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"「<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>」の間、着信がブロックされます。設定を調整することで、友だち、家族などの連絡先からの着信のブロックを解除できます。"</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"スター付きの連絡先"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other">他 <xliff:g id="NUM_PEOPLE">%d</xliff:g> 人</item>
-      <item quantity="one">他 1 人</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"なし"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{なし}=1{{contact_1}}=2{{contact_1} さんと {contact_2} さん}=3{{contact_1} さん、{contact_2} さん、{contact_3} さん}other{{contact_1} さん、{contact_2} さん、他 # 人}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"メッセージ"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"メッセージ"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"メッセージ"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"「<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>」の間、受信メッセージはブロックされます。設定を調整することで、友だち、家族などの連絡先からの受信メッセージのブロックを解除できます。"</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"すべてのメッセージが届く"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"すべての通話が届く"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"なし"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> 件の連絡先</item>
-      <item quantity="one">1 件の連絡先</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{なし}=1{1 件の連絡先}other{# 件の連絡先}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"全員"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"連絡先"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"スター付きの連絡先"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"すべての通知"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"一部の通知"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"アプリの割り込みを許可していない場合でも、選択したユーザーからの連絡は引き続き届きます"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> が割り込み可能</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> が割り込み可能</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"他 <xliff:g id="NUMBER">%d</xliff:g> 個"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{アプリは割り込み不可}=1{{app_1} が割り込み可能}=2{{app_1} と {app_2} が割り込み可能}=3{{app_1}、{app_2}、{app_3} が割り込み可能}other{{app_1}、{app_2}、他 # 個が割り込み可能}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"アプリ"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"すべての通知"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"一部の通知"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"割り込み可能な通知"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"すべての通知を許可"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> が割り込み可能</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> が割り込み可能</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"すべて割り込み不可"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"他 <xliff:g id="NUMBER">%d</xliff:g> 個"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{すべて割り込み不可}=1{{sound_category_1} が割り込み可能}=2{{sound_category_1} と {sound_category_2} が割り込み可能}=3{{sound_category_1}、{sound_category_2}、{sound_category_3} が割り込み可能}other{{sound_category_1}、{sound_category_2}、他 # 件が割り込み可能}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"すべて割り込み不可"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"すべてのユーザーが割り込み不可"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"一部のユーザーが割り込み可能"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"すべてのユーザーが割り込み可能"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB の管理"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"接続済みのデバイス"</string>
     <string name="usb_control_device" msgid="527916783743021577">"このデバイス"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"切り替えています..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"切り替えています…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"切り替えができませんでした"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"このデバイスを充電する"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"接続デバイスの充電"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"詳細を表示"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"データセーバー"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"モバイルデータの無制限利用"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"バックグラウンド データは無効になっています"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"バックグラウンド データが OFF です"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"ON"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"OFF"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"データセーバーを使用"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"デバイスがロックされている場合に、通知で返信などのテキストを入力できないようにする"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"デフォルトのスペル チェッカー"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"スペル チェッカーの選択"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"スペルチェックの使用"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"スペルチェックの使用"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"選択していません"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"（なし）"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"ストレージの空き容量を増やすため、ストレージ マネージャはバックアップした写真や動画をお使いのデバイスから削除します。"</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"写真と動画を削除"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"ストレージ マネージャ"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"ストレージ マネージャの使用"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"ストレージ管理ツールの使用"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"自動"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"手動"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"今すぐ空き容量を増やす"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"画面をダブルタップして通知を確認"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"タブレットの画面をダブルタップして通知をチェック"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"デバイスの画面をダブルタップして通知をチェック"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"スワイプで通知確認"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"画面の下端で下にスワイプすると通知が表示されます"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"片手モード"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"片手モードの使用"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"アプリの切り替え時に終了"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"タイムアウト"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4秒"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8秒"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12秒"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"片手モード"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"画面をダブルタップして、時刻、通知などの情報を確認できます。"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"スマートフォンを持ち上げて通知を確認"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"タブレットを持ち上げて通知をチェック"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"タブレットをタップしてチェックする"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"デバイスをタップしてチェックする"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"時刻、通知などの情報を確認するには、画面をタップします。"</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"パニックボタン"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"電源ボタンを 5 回すばやく押すと、SOS 緊急アクションが実行されます。"</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"警告音"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"アクション実行前のアラート"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"緊急連絡先"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"指紋センサーをスワイプして通知を表示"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"指紋センサーのスワイプ"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"スマートフォンの背面にある指紋認証センサーを下にスワイプして、通知を確認できます。"</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"すべてのアプリで有効"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"グラフィックス ドライバの選択"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"デフォルト"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"ゲームドライバ"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"ゲームドライバ"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Developer Driver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"システムのグラフィックス ドライバ"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"ネットワークが見つかりませんでした。もう一度お試しください。"</string>
     <string name="forbidden_network" msgid="7404863971282262991">"（禁止）"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"SIM カードなし"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"SIM なし"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"なし"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"SIM を接続する必要があります"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"<xliff:g id="WIRELESS_CARRIER">%s</xliff:g> の SIM を接続する必要があります"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"優先ネットワーク モード: WCDMA 優先"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"優先ネットワーク モード: GSM のみ"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"優先ネットワーク モード: WCDMA のみ"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"モバイルデータ"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"モバイル ネットワーク経由でデータにアクセス"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"スマートフォンは圏内に入るとこの携帯通信会社に自動的に切り替わります"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"利用できる SIM カードがありません"</string>
     <string name="calls_preference" msgid="2166481296066890129">"通話の設定"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS の設定"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"毎回確認"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"設定での画面オーバーレイを許可する"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"他のアプリの上に重ねて表示して設定画面をオーバーレイすることをアプリに許可します"</string>
     <string name="media_controls_title" msgid="403271085636252597">"メディア"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"メディア セッションの終了にプレーヤーを非表示にする"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"プレーヤーを使用すると、クイック設定の展開パネルからセッションを再開できます。"</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"クイック設定のメディア プレーヤー"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"メディア プレーヤーを長時間表示し、再生を簡単に再開できるようにします"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"プレーヤーを非表示"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"プレーヤーを表示"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"プレーヤーなし"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"許可されているアプリ"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"メディア"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth が ON になります"</string>
 </resources>
diff --git a/res/values-ka/arrays.xml b/res/values-ka/arrays.xml
index 077403f..a6c3410 100644
--- a/res/values-ka/arrays.xml
+++ b/res/values-ka/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"საშუალო"</item>
     <item msgid="6740026006576843477">"ვრცელი"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"ხანმოკლე"</item>
+    <item msgid="7397961711906421599">"საშუალო"</item>
+    <item msgid="4079132024502041928">"ხანგრძლივი"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"ნაგულისხმევი"</item>
     <item msgid="4234707448428002595">"Sans Serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"გლობალური"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"მხოლოდ TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"გლობალური"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 74334f3..e9dc9a2 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"პროფილის ინფორმაციის დაბლოკილ ეკრანზე ჩვენება"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"ანგარიშები"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"მდებარეობა"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"მდებარეობის გამოყენება"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"მდებარეობის გამოყენება"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"გამორთული"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">ჩართულია - მდებარეობაზე წვდომა აქვს <xliff:g id="COUNT_1">%1$d</xliff:g> აპს</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"გამოიყენეთ თქვენი სახე ავტორიზაციისთვის"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"დაწყება"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"თუ მარტივი წვდომის მეშვეობით სახით განბლოკვა გამორთულია, დაყენების ზოგიერთი ეტაპმა შესაძლოა TalkBack-თან გამართულად არ იმუშაოს."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"უკან"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"დაყენების გაგრძელება"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"ადაპტირებული დაყენება"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="one">უნდა შეიცავდეს <xliff:g id="NUMBER_0">%d</xliff:g> ციფრზე ნაკლებს</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"ბოლოდროინდელი PIN-კოდის ხელახლა გამოყენება მოწყობილობის ადმინისტრატორის მიერ ნებადართული არ არის"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"ხშირად გამოყენებული PIN-კოდები თქვენი IT ადმინისტრატორის მიერ დაბლოკილია. ცადეთ სხვა PIN-კოდი."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"არ უნდა შეიცავდეს არასწორ სიმბოლოს"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"უნდა შეიცავდეს მინიმუმ ერთ ასოს"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"უნდა შეიცავდეს მინიმუმ ერთ ციფრს"</string>
@@ -653,7 +655,6 @@
       <item quantity="one">უნდა შეიცავდეს, სულ მცირე, 1 არარიცხვით სიმბოლოს</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"ბოლოდროინდელი პაროლის ხელახლა გამოყენება მოწყობილობის ადმინისტრატორის მიერ ნებადართული არ არის"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"ხშირად გამოყენებული პაროლები თქვენი IT ადმინისტრატორის მიერ დაბლოკილია. ცადეთ სხვა პაროლი."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"ციფრების ზრდადი, კლებადი ან გამეორებადი მიმდევრობის გამოყენება ნებადართული არ არის"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"დადასტურება"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"გაუქმება"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Wi‑Fi-ს ჩართვა"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Wi-Fi-ს გამოყენება"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Wi-Fi-ს გამოყენება"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wi‑Fi პარამეტრები"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"უსადენო წვდომის წერტილების დაყენება და მართვა"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"„<xliff:g id="SSID">%1$s</xliff:g>“-თან დასაკავშირებლად, ქვემოთ მოაქციეთ QR კოდი ცენტრში"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Wi‑Fi ქსელთან დასაკავშირებლად დაასკანირეთ QR კოდი"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Wi‑Fi კავშირის გაზიარება"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"„<xliff:g id="SSID">%1$s</xliff:g>“-თან დასაკავშირებლად დაასკანერეთ ეს QR კოდი და გააზიარეთ პაროლი"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"„<xliff:g id="SSID">%1$s</xliff:g>“-თან დასაკავშირებლად დაასკანირეთ ეს QR კოდი სხვა მოწყობილობით"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"„<xliff:g id="SSID">%1$s</xliff:g>“-თან დასაკავშირებლად დაასკანერეთ ეს QR კოდი"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"ცადეთ ხელახლა. თუ პრობლემა არ მოგვარდება, დაუკავშირდით მოწყობილობის მწარმოებელს."</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"წარმოიქმნა შეფერხება"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi-Fi ქსელის პაროლი: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"უსადენო ქსელის პაროლი: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"ავტოდაკავშირება"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"ტელეფონს შეეძლოს ავტომატურად დაკავშირება ამ ქსელთან ახლოს ყოფნისას"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"ტაბლეტს შეეძლოს ავტომატურად დაკავშირება ამ ქსელთან ახლოს ყოფნისას"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"დაუშვით ამ ქსელთან დაკავშირება, როდესაც დიაპაზონში მოხვდება"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"მოწყობილობის დამატება"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"ამ ქსელზე მოწყობილობის დასამატებლად გამოიყენეთ QR კოდი"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR კოდის ფორმატი არასწორია"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"სისტემის სერტიფიკატების გამოყენება"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"არ მსურს მიწოდება"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"არ მსურს დადასტურება"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"სერტიფიკატი მითითებული არ არის. კავშირი არ იქნება კონფიდენციალური."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"ქსელის სახელი მეტისმეტად გრძელია."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"მიუთითეთ დომენი."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"საჭიროა სერტიფიკატი."</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"დაკავშირება"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi ჩართულია"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"დაკავშირებულია <xliff:g id="NETWORK_NAME">%1$s</xliff:g>-თან"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"მიმდინარეობს <xliff:g id="NETWORK_NAME">%1$s</xliff:g>-თან დაკავშირება"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"დაკავშირება…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"ქსელთან დაკავშირება ვერ ხერხდება"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"ქსელი არეალში არ არის"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"აპი კონტენტს აზიარებს. ინტერნეტ-კავშირის გასაზიარებლად, ჯერ გამორთეთ, შემდეგ კი ხელახლა ჩართეთ უსადენო ქსელი"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"პაროლი არაა დაყენებული"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"უსადენო ქსელის სახელი"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"მიმდინარეობს <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>-ის ჩართვა…"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"ირთვება <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"სხვა მოწყობილობებს შეუძლია <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>-თან დაკავშირება"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"უსადენო ქსელის პაროლი"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP Band"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"ავტომატურად ზრდის განახლების სიხშირეს 60-დან და 90 ჰც-მდე გარკვეული კონტენტისთვის. გაზრდის ბატარეის მოხმარებას."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"იძულებითი 90 ჰც განახლების სიხშირე"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"განახლების უმაღლესი სიხშირე შეხებაზე გაუმჯობესებული რეაგირებისთვის და უფრო ერთგვაროვანი ანიმაციისთვის. გაზრდის ბატარეის მოხმარებას."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"ეკრანისკენ მიმართული ყურადღება"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"ჩართულია / ეკრანი არ გამოირთვება, თუ მას უყურებთ"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android-ის ვერსია"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android-ის უსაფრთხოების განახლება"</string>
     <string name="model_info" msgid="8997566254717810904">"მოდელი"</string>
-    <string name="model_summary" msgid="2246651782442466213">"მოდელი: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"მოდელი და აპარატურა"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"აპარატურის ვერსია"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"მოწყობილობის ID"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"ქსელის პარამეტრები ჩამოიყარა"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"SIM ბარათების ამოშლა ვერ ხერხდება"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"ჩამოტვირთული SIM ბარათები ვერ იშლება შეცდომის გამო.\n\nგადატვირთეთ მოწყობილობა და ხელახლა ცადეთ."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"ყველა მონაცემის ამოშლა (ქარხნული პარამეტრების დაბრუნება)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"ყველა მონაცემის ამოშლა (ქარხნული პარამეტრების დაბრუნება)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"ეს ქმედება ამოშლის ყველა მონაცემს თქვენი ტაბლეტის "<b>"შიდა მეხსიერებიდან"</b>", მათ შორის:\n\n"<li>"თქვენს Google ანგარიშს"</li>\n<li>"სისტემის/აპების მონაცემებსა და პარამეტრებს"</li>\n<li>"ჩამოტვირთულ აპებს"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"ეს ქმედება ამოშლის ყველა მონაცემს თქვენი ტელეფონის "<b>"შიდა მეხსიერებიდან"</b>", მათ შორის:\n\n"<li>"თქვენს Google ანგარიშს"</li>\n<li>"სისტემის/აპების მონაცემებსა და პარამეტრებს"</li>\n<li>"ჩამოტვირთულ აპებს"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"ამჟამად შესული ხართ შემდეგ ანგარიშებში:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n" ამ მოწყობილობაზე წარმოდგენილია სხვა მომხმარებლები. \n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"მუსიკას"</li>\n<li>"ფოტოებს"</li>\n<li>"მომხმარებლის სხვა მონაცემებს"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM-ებს"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"ეს არ გააუქმებს თქვენს მობილურ სერვისთა პაკეტს."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"მუსიკის, ფოტოების და მომხმარებლის სხვა მონაცემების წასაშლელად საჭიროა "<b>"USB მეხსიერების"</b>" წაშლა."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"მუსიკის, სურათებისა და მომხმარებლის სხვა მონაცემების წასაშლელად უნდა წაიშალოს "<b>"SD ბარათი"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"ყველა მონაცემის ამოშლა (ქარხნული პარამეტრების დაბრუნება)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"ყველა მონაცემის ამოშლა (ქარხნული პარამეტრების დაბრუნება)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"ეს ქმედება ამოშლის ყველა მონაცემს თქვენი ტაბლეტის "<b>"შიდა მეხსიერებიდან"</b>", მათ შორის:\n\n"<li>"თქვენს Google ანგარიშს"</li>\n<li>"სისტემის/აპების მონაცემებსა და პარამეტრებს"</li>\n<li>"ჩამოტვირთულ აპებს"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"ეს ქმედება ამოშლის ყველა მონაცემს თქვენი ტელეფონის "<b>"შიდა მეხსიერებიდან"</b>", მათ შორის:\n\n"<li>"თქვენს Google ანგარიშს"</li>\n<li>"სისტემის/აპების მონაცემებსა და პარამეტრებს"</li>\n<li>"ჩამოტვირთულ აპებს"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"ამჟამად შესული ხართ შემდეგ ანგარიშებში:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n" ამ მოწყობილობაზე წარმოდგენილია სხვა მომხმარებლები. \n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"მუსიკა"</li>\n<li>"ფოტოები"</li>\n<li>"მომხმარებლის სხვა მონაცემები"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM-ები"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"ეს არ გააუქმებს თქვენს მობილურ სერვისთა პაკეტს."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"მუსიკის, ფოტოების და მომხმარებლის სხვა მონაცემების წასაშლელად საჭიროა "<b>"USB მეხსიერების"</b>" წაშლა."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"მუსიკის, სურათებისა და მომხმარებლის სხვა მონაცემების წასაშლელად უნდა წაიშალოს "<b>"SD ბარათი"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USB მეხსიერების წაშლა"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SD ბარათის წაშლა"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"შიდა USB მეხსიერებიდან ყველა მონაცემების წაშლა, როგორიცაა მუსიკა ან ფოტოები"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"წაიშალოს SD ბარათის ყველა მონაცემი, როგორიცაა მუსიკა და ფოტოები"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"ყველა მონაცემის ამოშლა"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"ყველა მონაცემის ამოშლა"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"მთლიანად წაიშლება თქვენი პერსონალური ინფორმაცია და ჩამოტვირთული აპები. ამ მოქმედებას ვერ გააუქმებთ."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"მთლიანად წაიშლება თქვენი პერსონალური ინფორმაცია, მათ შორის, ჩამოტვირთული აპები და SIM ბარათები. ამ მოქმედებას ვერ გააუქმებთ."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"ყველაფრის წაშლა"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"არ ჩამოყრილა, რადგან System Clear სამსახური მიუწვდომელია."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"გსურთ, ყველა მონაცემის ამოშლა?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"ქარხნულ პარამეტრებზე დაბრუნება ამ მომხმარებლისათვის მიუწვდომელია"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"ამოშლა"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"გთხოვთ, დაელოდოთ..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"ყველა მონაცემის ამოშლა"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"ყველა მონაცემის ამოშლა"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"მთლიანად წაიშლება თქვენი პერსონალური ინფორმაცია და ჩამოტვირთული აპები. ამ მოქმედებას ვერ გააუქმებთ."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"მთლიანად წაიშლება თქვენი პერსონალური ინფორმაცია, მათ შორის, ჩამოტვირთული აპები და SIM ბარათები. ამ მოქმედებას ვერ გააუქმებთ."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"გსურთ ყველა მონაცემის ამოშლა?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"ქარხნულ პარამეტრებზე დაბრუნება ამ მომხმარებლისათვის მიუწვდომელია"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"მიმდინარეობს ამოშლა"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"გთხოვთ, მოითმინოთ…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"დარეკვის პარამეტრები"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"ხმოვანი ფოსტის, ზარის გადამისამართების, ზარის დალოდების, დამრეკავის ID-ის დაყენება"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB ტეტერინგი"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"შეუძლებელია <xliff:g id="MAXCONNECTION">%1$d</xliff:g>-ზე მეტ მოწყობილობაზე მოედმის მიერთება."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-თან კავშირი გაწყდება."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ethernet-ტეტერინგი"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"ტელეფონის ინტერნეტ-კავშირის USB Ethernet-ის მეშვეობით გაზიარება"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"ტელეფონის ინტერნეტ-კავშირის Ethernet-ის მეშვეობით გაზიარება"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"უსადენო ქსელი და ტეტერინგი მობილური ინტერნეტის სხვა მოწყობილობებთან გაზიარების საშუალებას მოგცემთ. აპებს ასევე შეუძლიათ უსადენო ქსელის შექმნა, რათა გაუზიარონ კონტენტი ახლომდებარე მოწყობილობებს."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"უსადენო ქსელი და ტეტერინგი საშუალებას მოგცემთ, გაუზიაროთ მობილური ინტერნეტი ან Wi‑Fi კავშირი სხვა მოწყობილობებს. უსადენო ქსელის შექმნა შეუძლია აპებსაც, კონტენტის გასაზიარებლად ახლომახლო მოწყობილობებთან."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"დახმარება"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"სუბტიტრების პარამეტრები"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"გადიდება"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"გადიდების უბანი"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"გადიდების ჩართვა"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"აირჩიეთ უბანი (უბნები), რომელთა გამოყენებაც ეკრანის გადიდებისას გსურთ"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"სრული ეკრანი"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"ეკრანის ნაწილი"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"სრული ეკრანი და ეკრანის ნაწილი"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"მთლიანი ეკრანის გადიდება"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"ეკრანის ნაწილის გადიდება"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"გსურთ, გადაერთოთ მარტივი წვდომის ღილაკზე?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"ეკრანის რომელიმე ნაწილის გასადიდებლად სამმაგი შეხების გამოყენებით დაგვიანდება აკრეფა და სხვა მოქმედებები.\n\nგსურთ, გადაერთოთ მარტივი წვდომის ღილაკის გამოყენებაზე გასადიდებლად?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"მოხდეს მარტივი წვდომის ღილაკზე გადართვა"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"შენარჩუნდეს სამმაგი შეხება გასადიდებლად"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"გადიდების პარამეტრები"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"გადიდება სამმაგი შეხებით"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"გადიდება მალსახმობით"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"ზარი შეწყდება ჩართვის ღილაკზე დაჭერით"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"მაუსის დიდი კურსორი"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"ანიმაციის გათიშვა"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"მონო აუდიო"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"აუდიოს დაკვრისას არხების კომბინირება"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"აუდიოს ბალანსი"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"მარცხენა"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"მარჯვენა"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"მონო აუდიო"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"აუდიოს დაკვრისას არხების კომბინირება"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"აუდიოს ბალანსი"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"მარცხენა"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"მარჯვენა"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"ნაგულისხმევი"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 წამი"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 წამი"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"შეტყობინების ვიბრაცია"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"ზარის ვიბრაცია"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"რეაქცია შეხებაზე"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>-ის გამოყენება"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"გახსენით <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"ფერის კორექციის გამოყენება"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"წარწერების ჩვენება"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"მხოლოდ მხარდაჭერილი აპებისთვის"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>-ის გამოყენება"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"გახსენით <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"ფერთა კორექციის გამოყენება"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"წარწერების ჩვენება"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"მხოლოდ მხარდაჭერილი აპებისთვის"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"წარწერის ზომა და სტილი"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"ტექსტის ზომა <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"სხვა ვარიანტები"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"დეიტერანომალია"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"პროტანომალია"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"ტრიტანომალია"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"ნაცრისფერი ტონები"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"წითელი-მწვანე"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"წითელი-მწვანე"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"ლურჯი-ყვითელი"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"ფონურ რეჟიმში შეზღუდვა"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"აპისთვის ფონურ რეჟიმში მუშაობის დაშვება"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"აპს ფონურ რეჟიმში მუშაობის უფლება არ აქვს"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"ფონურ რეჟიმში მოხმარების შეზღუდვა ვერ მოხერხდება"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"ფონურ რეჟიმში მოხმარება ვერ შეიზღუდება"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"გსურთ ფონური აქტივობის შეზღუდვა?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"აპისთვის ფონური აქტივობის შეზღუდვის შემთხვევაში, მან შეიძლება არასათანადოდ იმუშაოს"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"რადგან ეს აპი ბატარეის ოპტიმიზებისთვის დაყენებული არაა, მას ვერ შეზღუდავთ.\n\nჩართეთ ბატარეის ოპტიმიზაცია აპის შესაზღუდავად."</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"განრიგის დაწესება"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"ზრდის ბატარეის მუშაობის ხანგრძლივობას"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"გამოირთოს, როდესაც დაიტენება"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"ბატარეის დამზოგი გამოირთვება, როდესაც თქვენი ტელეფონი <xliff:g id="PERCENT">%1$s</xliff:g>-ს მიაღწევს"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"ბატარეის დამზოგი გამოირთვება, როდესაც თქვენი ტაბლეტი <xliff:g id="PERCENT">%1$s</xliff:g>-ს მიაღწევს"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"ბატარეის დამზოგი გამოირთვება, როდესაც თქვენი მოწყობილობა <xliff:g id="PERCENT">%1$s</xliff:g>-ს მიაღწევს"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"ბატარეის დამზოგი გამოირთვება, როდესაც თქვენი ტელეფონი <xliff:g id="PERCENT">%1$s</xliff:g>-ზე მეტად დაიტენება"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"ბატარეის დამზოგი გამოირთვება, როდესაც თქვენი ტაბლეტი <xliff:g id="PERCENT">%1$s</xliff:g>-ზე მეტად დაიტენება"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"ბატარეის დამზოგი გამოირთვება, როდესაც თქვენი მოწყობილობა <xliff:g id="PERCENT">%1$s</xliff:g>-ზე მეტად დაიტენება"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"ჩართვა"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"გადაყენება"</string>
     <string name="tts_play" msgid="2945513377250757221">"დაკვრა"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"ადაპტაციური კავშირი"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"ახანგრძლივებს ბატარეის მუშაობას და აუმჯობესებს მოწყობილობის შესრულებას ქსელთან კავშირის ავტომატურად მართვით."</string>
     <string name="credentials_title" msgid="7535942196886123656">"ავტორიზაციის მონაცემთა საცავი"</string>
     <string name="credentials_install" msgid="3933218407598415827">"სერტიფიკატის ინსტალაცია"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"სერტიფიკატების საცავიდან დაყენება"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"მომხმ. ავტორიზაციის მონაცემები"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"შენახული ავტორიზაციის მონაცემების ნახვა და შეცვლა"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"გაფართოებული"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"საცავის ტიპი"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"აპარატურული"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"მხოლოდ პროგრამული"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"ამ მომხმარებლისთვის ავტორიზაციის მონაცემები ხელმისაწვდომი არ არის"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"დაინსტალირებულია VPN-ისა და აპებისთვის"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"დაინსტალირებულია Wi-Fi-სთვის"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"ტერმინალთან გადახდა"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"დააყენეთ გადახდის აპი. შემდეგ უბრალოდ მიუახლოეთ თქვენი ტელეფონის უკანა მხარე ნებისმიერ ტერმინალს, რომელსაც უკონტაქტო სიმბოლო აქვს."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"გასაგებია"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"მეტი..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"სხვა…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"გადახდის ნაგულისხმევი აპის დაყენება"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"გადახდის ნაგულისხმევი აპის განახლება"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"უკონტაქტო ტერმინალში გადახდისთვის: <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"ზარებისთვის მუდამ ამის გამოყენება"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"მობილური ინტერნეტისთვის SIM-ის არჩევა"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"აირჩიეთ SIM ბარათი SMS-ისთვის"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"მონაცემების SIM-ზე გადართვა, ამას შესაძლოა ერთ წუთამდე დასჭირდეს..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"მიმდინარეობს მონაცემების SIM-ზე გადართვა, ამას შესაძლოა ერთ წუთამდე დასჭირდეს…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"დარეკვა SIM-ით:"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"აირჩიეთ SIM ბარათი"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"რუტინა, განრიგი, ბატარეის დამზოგი, ენერგიის დამზოგი, ბატარეა, ავტომატური, პროცენტი"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, გაუმჯობესებული დარეკვა, 4g დარეკვა"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"ენის დამატება, დაამატეთ ენა"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"ტექსტის ზომა"</string>
     <string name="default_sound" msgid="6604374495015245195">"ნაგულისხმევი ხმა"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"ზარებისა და შეტყობინებების ხმა <xliff:g id="PERCENTAGE">%1$s</xliff:g>-ზეა"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"ხმა, ვიბრაცია, არ შემაწუხოთ"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"ჩართვის ხმები"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"პირდაპირი სუბტიტრები"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"მედიის ავტომ. სუბტიტრირება"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"არცერთი"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other">დაყენებულია <xliff:g id="ON_COUNT">%d</xliff:g> განრიგი</item>
-      <item quantity="one">დაყენებულია 1 განრიგი</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{არცერთი}=1{დაყენებულია 1 განრიგი}other{დაყენებულია # განრიგი}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"არ შემაწუხოთ"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"შეტყობინებების მიღება მხოლოდ მნიშვნელოვანი ხალხისგან და აპებიდან"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"წყვეტების შეზღუდვა"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"მხოლოდ პრიორიტეტული"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"ჩართულია / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"გამორთულია / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"გამორთული"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"ჩართული"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"ყოველ ჯერზე კითხვა"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"გამორთვამდე"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> საათი</item>
-      <item quantity="one">1 საათი</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> წუთი"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> განრიგი შეიძლება ავტომატურად ჩაირთოს</item>
-      <item quantity="one">1 განრიგი შეიძლება ავტომატურად ჩაირთოს</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 საათი}other{# საათი}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 წუთი}other{# წუთი}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{გამორთულია}=1{გამორთულია / 1 განრიგი შეიძლება ავტომატურად ჩაირთოს}other{გამორთულია / # განრიგი შეიძლება ავტომატურად ჩაირთოს}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"რამ შეიძლება შეწყვიტოს „არ შემაწუხოთ“"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"ხალხი"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"აპები"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"დაბალი პრიორიტეტის შეტყობინებები ავტომატურად დაყენდეს, როგორც მსუბუქი"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"ადაპტირებადი შეტყობინებების კლასიფიკაცია"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"შეტყობინებების ავტომატური კლასიფიკაცია შესაბამისობის მიხედვით"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"შეტყობინებათა ადაპტირებადი გამოხმაურება"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"შეტყობინებათა დარეგულირების ცვლილებათა ასახვა და სისტემისთვის გამოხმაურების მიწოდების ვარიანტის ჩვენება"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"შემოთავაზებული მოქმედებები და პასუხები"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"შემოთავაზებული მოქმედებების და პასუხების ავტომატურად ჩვენება"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"ბოლო და ჩაჩუმებული შეტყობინებების ჩვენება"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"„არ შემაწუხოთ“ წვდომა"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"„არ შემაწუხოთ“ რეჟიმის დაშვება"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"დაუინსტალირებელმა აპებმა მოითხოვა „არ შემაწუხოთ“ წვდომა"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"აპები იტვირთება..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"მიმდინარეობს აპების ჩატვირთვა…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"თქვენი მოთხოვნის მიხედვით, Android ბლოკავს ამ აპის შეტყობინებების მოწყობილობაზე გამოჩენას"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"თქვენი მოთხოვნის მიხედვით, Android ბლოკავს შეტყობინებების ამ კატეგორიის მოწყობილობაზე გამოჩენას"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"თქვენი მოთხოვნის მიხედვით, Android ბლოკავს შეტყობინებების ამ ჯგუფის გამოჩენას მოწყობილობაზე"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"ყველა საუბარი"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"პრიორიტეტული საუბრები"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"არცერთი"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> საუბარი</item>
-      <item quantity="one">1 საუბარი</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"არცერთი"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{არცერთი}=1{1 მიმოწერა}other{# მიმოწერა}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"ვის შეუძლია შეწყვეტა"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"ზარები"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"ზარები"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"იმაში დასარწმუნებლად, რომ დაშვებული ზარები გამოსცემს ხმას, გადაამოწმეთ რომ მოწყობილობა დაყენებულია დარეკვის რეჟიმზე"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"„<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>“-ის ფარგლებში შემომავალი ზარები დაბლოკილია. სურვილისამებრ, შეგიძლიათ შეცვალოთ პარამეტრები და მისცეთ თქვენთან დაკავშირების საშუალება მეგობრებს, ოჯახის წევრებს და სხვა კონტაქტებს."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"ვარსკვლავით მონიშნული კონტაქტები"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> სხვა</item>
-      <item quantity="one">1 სხვა</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"არცერთი"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{არცერთი}=1{{contact_1}}=2{{contact_1} და {contact_2}}=3{{contact_1}, {contact_2} და {contact_3}}other{{contact_1}, {contact_2} და # სხვა}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"შეტყობინებები"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"შეტყობინებები"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"შეტყობინებები"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"„<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>“-ის ფარგლებში შემომავალი შეტყობინებები დაბლოკილია. სურვილისამებრ, შეგიძლიათ შეცვალოთ პარამეტრები და მისცეთ თქვენთან დაკავშირების საშუალება მეგობრებს, ოჯახის წევრებს და სხვა კონტაქტებს."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"თქვენამდე მოაღწევს ყველა შეტყობინება"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"თქვენთან გამოსვლას შეძლებს ყველა ზარი"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"არცერთი"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> კონტაქტი</item>
-      <item quantity="one">1 კონტაქტი</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{არცერთი}=1{1 კონტაქტი}other{# კონტაქტი}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"ნებისმიერი"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"კონტაქტები"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"ვარსკვლავით მონიშნული კონტაქტები"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"ყველა შეტყობინება"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"ზოგიერთი შეტყობინება"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"თუნდაც აპებს შეწყვეტის უფლება არ ჰქონდეთ, არჩეულ ადამიანებს მაინც შეუძლიათ თქვენთან დაკავშირება"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g>-ს შეუძლია შეწყვეტა</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g>-ს შეუძლია შეწყვეტა</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> სხვას"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{შეწყვეტა არცერთ აპს არ შეუძლია}=1{{app_1}-ს შეუძლია შეწყვეტა}=2{{app_1}-სა და {app_2}-ს შეუძლია შეწყვეტა}=3{{app_1}-ს, {app_2}-სა და {app_3}-ს შეუძლია შეწყვეტა}other{{app_1}-ს, {app_2}-სა და # სხვას შეუძლია შეწყვეტა}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"აპები"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"ყველა შეტყობინება"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"ზოგიერთი შეტყობინება"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"შეტყობინებები, რომლებსაც შეწყვეტა შეუძლია"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"ყველა შეტყობინების დაშვება"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g>-ს შეუძლია შეწყვეტა</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g>-ს შეუძლია შეწყვეტა</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"შეწყვეტა არაფერს შეუძლია"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> სხვას"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{შეწყვეტა არაფერს შეუძლია}=1{{sound_category_1}-ს შეუძლია შეწყვეტა}=2{{sound_category_1}-სა და {sound_category_2}-ს შეუძლია შეწყვეტა}=3{{sound_category_1}-ს, {sound_category_2}-სა და{sound_category_3}-ს შეუძლია შეწყვეტა}other{{sound_category_1}-ს, {sound_category_2}-სა და # სხვას შეუძლია შეწყვეტა}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"შეწყვეტა არაფერს შეუძლია"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"შეწყვეტა არავის შეუძლია"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"შეწყვეტა შეუძლია ზოგიერთ ადამიანს"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"შეწყვეტა შეუძლია ყველას"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB იმართება"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"დაკავშირებული მოწყობილობა"</string>
     <string name="usb_control_device" msgid="527916783743021577">"ეს მოწყობილობა"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"მიმდინარეობს გადართვა…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"მიმდინარეობს გადართვა…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"გადართვა ვერ მოხერხდა"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"ამ მოწყობილობის დატენვა"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"დაკავშირებული მოწყობილობის დატენვა"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"დეტალების ნახვა"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"მონაცემთა დამზოგველი"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"მონაცემებზე შეუზღუდავი წვდომით"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"ფონური მონაცემები გამორთულია"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"ფონური მონაცემები გამორთულია"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"ჩართული"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"გამორთული"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"გამოიყენეთ მონაცემთა დამზოგი"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"შეტყობინებებში პასუხების ან სხვა ტექსტის აკრეფის აკრძალვა, როცა მოწყობილობა ჩაკეტილია"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"ნაგულ. მართლწერის შემმოწმებელი"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"მართლწერის შემმოწმებლის არჩევა"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"მართლწერის შემმოწმებლის გამოყენება"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"მართლწერის შემმოწმებლის გამოყენება"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"არ არის არჩეული"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(არაფერი)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"მეხსიერების გამოთავისუფლების ხელშეწყობის მიზნით, მეხსიერების მენეჯერი თქვენი მოწყობილობიდან იმ ფოტოებსა და ვიდეოებს ამოშლის, რომელთა სარეზერვო ასლებიც უკვე შექმნილია."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"ფოტოებისა და ვიდეოების ამოშლა"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"მეხსიერების მენეჯერი"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"მეხსიერების მენეჯერის გამოყენება"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"მეხსიერების მმართველის გამოყენება"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"ავტომატური"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"მექანიკური"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"მეხსიერების გამოთავისუფლება"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"ტელეფონის შესამოწმებლად, შეეხეთ ორმაგად"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"ტაბლეტის შესამოწმებლად, შეეხეთ ორმაგად"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"მოწყობილობის შესამოწმებლად, შეეხეთ ორმაგად"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"გადაფურცვლა შეტყობინებების სანახავად"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"შეტყობინებათა საჩვენებლად ეკრანის ქვედა ნაწილზე გადაფურცლეთ ქვემოთ"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"ცალი ხელის რეჟიმი"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"ცალი ხელის რეჟიმის გამოყენება"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"გასვლა აპების გადართვისას"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"ლოდინის დრო"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 წამი"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 წამი"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 წამი"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"მისაწვდომობა"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"ორმაგად შეეხეთ ეკრანს დროის, შეტყობინებებისა და სხვა ინფორმაციის სანახავად."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"ასწიეთ ტელეფონის შესამოწმებლად"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"ასწიეთ ტაბლეტის შესამოწმებლად"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"შეეხეთ ტაბლეტის შესამოწმებლად"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"შეეხეთ მოწყობილობას შესამოწმებლად"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"დროის, შეტყობინებებისა და სხვა ინფორმაციის სანახავად შეეხეთ ეკრანს."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"პანიკის ღილაკი"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"დაიწყეთ საგანგებო SOS მოქმედებები ჩართვის ღილაკზე სწრაფად 5-ჯერ დაჭერით."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"გამაფრთხილებელი ხმა"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"გაფრთხილება მოქმედებების დაწყებამდე"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"საგანგებო ვითარებისას საკონტაქტო პირები"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"თითის ანაბეჭდით გადაფურცვლა შეტყობინებების შესამოწმებლად"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"ანაბეჭდით გადაფურცვლა"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"თქვენი შეტყობინებების შესამოწმებლად, ჩამოუსვით თითი თითის ანაბეჭდის სენსორს, რომელიც თქვენი ტელეფონის უკანა ნაწილზე მდებარეობს."</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"ჩართვა ყველა აპისთვის"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"აირჩიეთ გრაფიკული დრაივერი"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"ნაგულისხმევი"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"თამაშის დრაივერი"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"თამაშის დრაივერი"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"დეველოპერების დრაივერი"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"სისტემის გრაფიკული დრაივერი"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"ქსელები ვერ მოიძებნა. ცადეთ ხელახლა."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(აკრძალული)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"SIM ბარათი არ არის"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"SIM არ არის"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"არცერთი"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"დასაკავშირებლად სჭირდება SIM"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"დასაკავშირებლად სჭირდება <xliff:g id="WIRELESS_CARRIER">%s</xliff:g>-ის SIM"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"ქსელის სასურველი რეჟიმი: სასურველია WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"ქსელის სასურველი რეჟიმი: მხოლოდ GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"ქსელის სასურველი რეჟიმი: მხოლოდ WCDMA"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"მობილური ინტერნეტი"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"ინტერნეტზე წვდომა მობილური ქსელით"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"ტელეფონი ავტომატურად გადაერთვება ამ ოპერატორზე, როდესაც არეალში მოხვდება"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"ხელმისაწვდომი SIM ბარათი არ არის"</string>
     <string name="calls_preference" msgid="2166481296066890129">"ზარების პარამეტრები"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS-შეტყობინებების პარამეტრები"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"ყოველთვის შეკითხვა"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"პარამეტრებზე ეკრანის გადაფარვის დაშვება"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"პარამეტრების ეკრანების გადაფარვის დაშვება აპებისთვის, რომლებსაც სხვა აპების ზემოდან გამოჩენა შეუძლია"</string>
     <string name="media_controls_title" msgid="403271085636252597">"მედია"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"დამკვრელი დაიმალოს მედიასესიის დასრულებისას"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"დამკვრელი საშუალებას გაძლევთ, განაგრძოთ სესია სწრაფი პარამეტრების გაფართოებული პანელიდან."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"მედია დამკვრელი სწრაფ პარამეტრებში"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"მედია დამკვრელის ხანგრძლივი დროით ჩვენება დაკვრის მარტივად გასაგრძელებლად"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"დამკვრელის დამალვა"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"დამკვრელის ჩვენება"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"დამკვრელები მიუწვდომელია"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"დაშვებული აპები"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"მედია"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"ჩაირთვება Bluetooth"</string>
 </resources>
diff --git a/res/values-kk/arrays.xml b/res/values-kk/arrays.xml
index 4c744df..aaed3e4 100644
--- a/res/values-kk/arrays.xml
+++ b/res/values-kk/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Орташа"</item>
     <item msgid="6740026006576843477">"Ұзақ"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Қысқа"</item>
+    <item msgid="7397961711906421599">"Орташа"</item>
+    <item msgid="4079132024502041928">"Ұзақ"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Әдепкі"</item>
     <item msgid="4234707448428002595">"Готикалық шрифт"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Бүкіл әлем"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Тек TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Жалпы"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index d882b29..bcb475e 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Бекіту экранында профайл ақпаратын көрсету"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Есептік жазбалар"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Орналасу"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Орналасу дерегін пайдалану"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Орынды пайдалану"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Өшірулі"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">Қосулы – <xliff:g id="COUNT_1">%1$d</xliff:g> қолданба орналасу туралы ақпаратты пайдалана алады.</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Бетті тану функциясын пайдаланыңыз"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Бастау"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Егер \"Face Unlock\" функциясының арнайы мүмкіндіктері өшірулі болса, кейбір реттеу қадамдары TalkBack функциясымен бірге дұрыс жұмыс істемеуі мүмкін."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Артқа"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Реттеуді жалғастыру"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Арнайы мүмкіндіктерді пайдалану"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="one"><xliff:g id="NUMBER_0">%d</xliff:g> таңбадан аз болуы керек</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Құрылғы әкімшісі жақында пайдаланылған PIN кодын қолдануға рұқсат бермейді"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"АТ әкімшісі оңай PIN кодтарына тыйым салды. Басқа PIN кодын енгізіп көріңіз."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Жарамсыз таңба болмауы керек"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Кемінде бір әріп болуы керек"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Кемінде бір сан болуы керек"</string>
@@ -653,7 +655,6 @@
       <item quantity="one">Кемінде 1 сандық емес таңба болуы керек.</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Құрылғы әкімшісі жуықтағы құпиясөзді қолдануға рұқсат бермейді"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Оңай құпия сөздерге АТ әкімшісі тыйым салды. Басқа құпия сөз енгізіп көріңіз."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Сандардың артатын, кемитін немесе қайталанатын ретіне рұқсат берілмейді"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Растау"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Бас тарту"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Wi‑Fi қосу"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Wi-Fi пайдалану"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Wi-Fi пайдалану"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wi‑Fi параметрлері"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Сымсыз қол жетімділік нүктесін орнату және басқару"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"“<xliff:g id="SSID">%1$s</xliff:g>” желісіне жалғау үшін төмендегі QR кодын ортасына туралаңыз"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"QR кодын сканерлеп, Wi‑Fi желісіне жалғаныңыз"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Wi‑Fi желісін бөлісу"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"\"<xliff:g id="SSID">%1$s</xliff:g>\" желісіне жалғану үшін QR кодын сканерлеңіз және құпия сөзді бөлісіңіз."</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"\"<xliff:g id="SSID">%1$s</xliff:g>\" желісіне қосылу үшін бұл QR кодын басқа құрылғымен сканерлеңіз."</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"\"<xliff:g id="SSID">%1$s</xliff:g>\" желісіне жалғану үшін осы QR кодын сканерлеңіз."</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Қайталап көріңіз. Ақау жойылмаса, құрылғы өндірушісіне хабарласыңыз."</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Бірдеңе дұрыс болмады."</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi-Fi құпия сөзі: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Хотспот құпия сөзі: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Aвтоматты жалғау"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Осы желіге жақын болғанда, телефонға оған қосылуға рұқсат ету"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Осы желіге жақын болғанда, планшетке оған қосылуға рұқсат ету"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Аралықта болғанда, осы желімен байланысқа рұқсат ету"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Құрылғы қосу"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Желіге құрылғы қосу үшін QR кодын пайдаланыңыз."</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR кодының форматы жарамсыз."</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Жүйелік сертификаттарды пайдалану"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Қамтамасыз етпеу"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Тексермеу"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Сертификат көрсетілмеген. Байланыс жеке болмайды."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Желі атауы тым ұзын."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Доменді көрсету керек."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Сертификат қажет."</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Жалғау"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi қосылды."</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> желісіне жалғанды."</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> желісіне қосылуда"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Жалғануда…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Желіге қосылу орындалмады"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Желі байланыс аясында емес."</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Қолданба мазмұнды бөлісуде. Интернетпен байланысты бөлісу үшін хотспотты өшіріп, қайта қосыңыз"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Құпия сөз жоқ"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Хотспот атауы"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> қосылуда…"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> қосылуда…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Басқа құрылғылар <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> хотспотына қосыла алады"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Хотспот құпия сөзі"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP диапазоны"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Кейбір мазмұндар үшін жаңарту жиілігі 60-тан 90 Гц-ке автоматты түрде артады. Батарея заряды тезірек таусылады."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"90 Гц жаңарту жиілігін қолмен қосу"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Жақсартылған датчик сезгіштігі және анимация сапасына арналған ең жоғарғы жаңарту жиілігі. Батарея заряды тезірек таусылады."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Зейінді экран"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Қосулы кезде экранға қарап тұрсаңыз, ол өшпейді."</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android нұсқасы"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android қауіпсіздік жүйесін жаңарту"</string>
     <string name="model_info" msgid="8997566254717810904">"Үлгісі"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Үлгі: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Үлгі және жабдық"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Жабдық нұсқасы"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Жабдық ЖА"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Желі параметрлері қалпына келтірілген"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"SIM карталары тазартылмайды"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Жүктеп алынған SIM карталарын қатеге байланысты жою мүмкін емес.\n\nҚұрылғыны қайта қосып, әрекетті қайталаңыз."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Барлық деректерді өшіру (зауыттық параметрлерді қайтару)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Барлық деректерді өшіру"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Планшетіңіздің "<b>"ішкі жадынан"</b>" барлық дерек өшеді, оның ішінде:\n\n"<li>"Google есептік жазбаңыз"</li>\n<li>"Жүйе мен қолданба деректері және параметрлері"</li>\n<li>"Жүктеп алынған қолданбалар"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Телефонның "<b>"ішкі жадынан"</b>" барлық дерек өшеді, оның ішінде:\n\n"<li>"Google есептік жазбаңыз"</li>\n<li>"Жүйе мен қолданба деректері және параметрлері"</li>\n<li>"Жүктеп алынған қолданбалар"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Сіз келесі есептік жазбаларға кірдіңіз:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Осы құрылғыда басқа пайдаланушылар бар.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Mузыка"</li>\n<li>"Фотосуреттер"</li>\n<li>"Басқа пайдаланушы деректері"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM карталары"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Мұның нәтижесінде мобильдік қызмет жоспарыңыздан бас тартылмайды."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Музыка, фотосуреттер және басқа деректерді өшіру үшін, "<b>"USB жадын"</b>" өшіру қажет."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Музыка, фотосуреттер және басқа пайдаланушы деректерін тазалау үшін "<b>"SD картасы"</b>" өшірілуі тиіс."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Барлық деректерді өшіру (зауыттық параметрлерді қайтару)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Барлық деректерді өшіру (зауыттық параметрлерді қайтару)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Планшетіңіздің "<b>"ішкі жадынан"</b>" барлық дерек өшеді, соның ішінде:\n\n"<li>"Google есептік жазбаңыз;"</li>\n<li>"жүйе мен қолданба деректері және параметрлері;"</li>\n<li>"жүктеп алынған қолданбалар."</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Телефонның "<b>"ішкі жадынан"</b>" барлық дерек өшеді, соның ішінде:\n\n"<li>"Google есептік жазбаңыз;"</li>\n<li>"жүйе мен қолданба деректері және параметрлері;"</li>\n<li>"жүктеп алынған қолданбалар."</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Сіз келесі есептік жазбаларға кірдіңіз:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Бұл құрылғыны басқа да пайдаланушылар қолдана алады.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Mузыка;"</li>\n<li>"фотосуреттер;"</li>\n<li>"басқа пайдаланушы деректері."</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM карталары"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Мұның нәтижесінде мобильдік қызмет жоспарыңыздан бас тартылмайды."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Музыканы, фотосуреттерді және басқа деректерді өшіру үшін "<b>"USB жады"</b>" тазартылуы қажет."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Музыканы, фотосуреттерді және басқа пайдаланушы деректерін өшіру үшін "<b>"SD картасы"</b>" тазартылуы тиіс."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USB жадын өшіру"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SD картасын өшіру"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Ішкі USB жадындағы музыка немесе фотолар сияқты барлық деректерді өшіру"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"SD картадағы музыка және фотосуреттер сияқты барлық деректерді өшіру"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Барлық деректі өшіру"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Барлық деректі өшіру"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Барлық жеке ақпаратыңыз бен жүктеп алынған қолданбаларыңыз жойылады. Бұл әрекет кері қайтарылмайды."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Барлық жеке ақпаратыңыз, соның ішінде жүктеп алынған қолданбалар мен SIM карталары жойылады. Бұл әрекет кері қайтарылмайды."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Барлығын өшіру"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Қайта реттеулер орындалмады, себебі Жүйе Тазалау қызметі қол жетімсіз."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Барлық дерек өшірілсін бе?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Зауыттық параметрлерді қалпына келтіру бұл пайдаланушы үшін қол жетімді емес"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Өшірілуде"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Күте тұрыңыз…"</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Барлық деректі өшіру"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Барлық деректі өшіру"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Барлық жеке ақпаратыңыз бен жүктеп алынған қолданбаларыңыз жойылады. Бұл әрекет кері қайтарылмайды."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Барлық жеке ақпаратыңыз, соның ішінде жүктеп алынған қолданбалар мен SIM карталары жойылады. Бұл әрекет кері қайтарылмайды."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Барлық дерек өшірілсін бе?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Бұл пайдаланушы зауыттық параметрлерді қайтара алмайды."</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Өшіріліп жатыр"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Күте тұрыңыз…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Қоңырау параметрлері"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Дауыс хабары, қоңырауды басқа нөмірге бағыттау, күту және қоңырау шалушының жеке анықтағышын орнату"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB тетеринг"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> көп құрылғыға тетеринг жалғау мүмкін емес."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> құрылғысы тетеринг арқылы ажыратылады."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ethernet тетерингі"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Телефонның интернет байланысын USB Ethernet арқылы бөлісу"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Телефонның интернет байланысын Ethernet арқылы бөлісу"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Мобильдік деректер байланысы арқылы басқа құрылғыларды интернетке қосу үшін хотспот және тетеринг функцияларын пайдаланыңыз. Сондай-ақ қолданбалар хоспот жасап, маңайдағы құрылғылармен мазмұн бөлісе алады."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Wi‑Fi не мобильдік деректер байланысы арқылы басқа құрылғыларды интернетке қосу үшін хотспот және тетеринг функцияларын пайдаланыңыз. Қолданбалар маңайдағы құрылғылармен мазмұнды бөлісу үшін де хотспот жасай алады."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Көмек"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Субтитр параметрлері"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Ұлғайту"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Ұлғайту аймағы"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Ұлғауды іске қосу"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Экранды ұлғайту кезінде ұлғайтқыңыз келетін аймақтарды таңдаңыз."</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Толық экран"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Экранның бөлігі"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Толық экран және экран бөлігі"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Толық экранды ұлғайту"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Экранның бөлігін ұлғайту"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"\"Арнайы мүмкіндіктер\" түймесіне ауысасыз ба?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Экран бөлігін үш рет түртіп ұлғайту мәтін теру мен басқа әрекеттердің кідіруіне әкеледі.\n\nҰлғайту үшін \"Арнайы мүмкіндіктер\" түймесін пайдалануға ауысқыңыз келе ме?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"\"Арнайы мүмкіндіктер\" түймесіне ауысу"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Экранды үш рет түртіп ұлғайту"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Ұлғайту параметрлері"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Үш рет түртіп үлкейту"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Таңбашамен үлкейту"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Қуат түймесі арқылы қоңырауды үзу"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Үлкен тінтуір меңзері"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Анимацияны өшіру"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Моно аудио"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Аудионы ойнату кезінде арналарды біріктіру"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Аудио балансы"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Сол жақ"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Оң жақ"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Моно аудио"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Аудионы ойнату кезінде арналарды біріктіру"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Аудио балансы"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Сол"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Оң"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Әдепкі"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 секунд"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 секунд"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Хабарландыру дірілі"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Қоңырау дірілі"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Түрту кезіндегі діріл"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> қолданбасын пайдалану"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ашу"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Түсті түзету функциясын пайдалану"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Субтитрді көрсету"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Тек қолдау көрсетілетін қолданба үшін"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> пайдалану"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> қолданбасын ашу"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Түсті түзету функциясын пайдалану"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Жазуларды көрсету"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Тек қолдау көрсетілетін қолданба үшін"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Субтитр өлшемі және стилі"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> мәтін өлшемі"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Басқа опциялар"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Дейтераномалия"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Протаномалия"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Тританомалия"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Сұр түс реңктері"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Қызыл – жасыл"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Қызыл – жасыл"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Көк – сары"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Фондық режимде жұмыс істеуді шектеу"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Қолданбаға фондық режимде іске қосылуға рұқсат беру"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Қолданбаның фондық режимде жұмыс істеуге рұқсаты жоқ"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Фондық режимде пайдалану шектелмеген"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Фондық режимде пайдалану шектелмеген."</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Фондық режимдегі әрекет шектелсін бе?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Қолданбаның фондық режимдегі әрекетін шектесеңіз, күтпеген әрекет көрсетуі мүмкін."</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Бұл қолданба батареяны оңтайландыруға реттелмегендіктен, оны шектей алмайсыз. \n\nБұл үшін батареяны оңтайландыруды қосыңыз."</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Кестені белгілеу"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Батарея жұмысының ұзақтығын арттыру"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Толық зарядталғанда өшіру"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Телефон заряды <xliff:g id="PERCENT">%1$s</xliff:g> болғанда, Battery Saver өшіріледі."</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Планшет заряды <xliff:g id="PERCENT">%1$s</xliff:g> болғанда, Battery Saver өшіріледі."</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Құрылғы заряды <xliff:g id="PERCENT">%1$s</xliff:g> болғанда, Battery Saver өшіріледі."</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Телефон <xliff:g id="PERCENT">%1$s</xliff:g>-дан аса зарядталғанда, Battery Saver өшеді."</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Планшет <xliff:g id="PERCENT">%1$s</xliff:g>-дан аса зарядталғанда, Battery Saver өшеді."</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Құрылғы <xliff:g id="PERCENT">%1$s</xliff:g>-дан аса зарядталғанда, Battery Saver өшеді."</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Қосу"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Бастапқы күйге қайтару"</string>
     <string name="tts_play" msgid="2945513377250757221">"Ойнату"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Бейімделгіш қосылу мүмкіндігі"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Желі байланыстарын автоматты басқару арқылы батарея жұмысының ұзақтығын арттырады және құрылғы жұмысын жақсартады."</string>
     <string name="credentials_title" msgid="7535942196886123656">"Тіркелу деректерінің жады"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Сертификат орнату"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Сертификаттарды жадтан орнату"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Пайдаланушының тіркелу деректері"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Сақталған тіркелу деректерін көру және өзгерту"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Қосымша"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Жад түрі"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Аппараттық"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Компьютерлік бағдарлама ғана"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Осы пайдаланушы үшін тіркелгі деректері қол жетімді емес"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN желілері мен қолданбалар үшін орнатылған"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi үшін орнатылған"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Терминалда төлеу"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Төлем қолданбасын реттеңіз. Содан кейін телефонның артқы жағын контактісіз төлем таңбасы бар терминалға жақындатыңыз."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Түсінікті"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Қосымша…"</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Басқалары…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Негізгі төлем қолданбасы етіп орнату"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Негізгі төлем қолданбасын жаңарту"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Контактісіз төлем терминалында <xliff:g id="APP">%1$s</xliff:g> арқылы төлеу"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Осыны қоңыраулар үшін әрқашан пайдалану"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Деректер үшін SIM картасын таңдау"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"SMS үшін SIM картасын таңдаңыз."</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Деректер SIM картасы ауыстырылуда, бұл бір минутқа дейін алуы мүмкін..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Деректер SIM картасы ауыстырылуда, бұл бір минутқа дейін уақыт алуы мүмкін…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Келесімен қоңырау шалу"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"SIM картасын таңдау"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"әрекеттер тізімі, кесте, battery saver, қуат үнемдеу, батарея, автоматты, пайыз"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"VoLTE, жетілдірілген қоңырау, 4g қоңырауы"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"тілді енгізу, тіл енгізу"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"мәтін өлшемі"</string>
     <string name="default_sound" msgid="6604374495015245195">"Әдепкі дыбыс"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Қоңыраулар мен хабарландырулардың дыбыс деңгейі: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Дыбыс деңгейі, діріл, \"Мазаламау\" режимі"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Дыбыстарды қосу"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Live Caption"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Автоматты субтитр қосу"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Жоқ"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> жоспар орнатылған.</item>
-      <item quantity="one">1 жоспар орнатылған.</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Жоқ}=1{1 жоспар орнатылған}other{# жоспар орнатылған}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Мазаламау"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Хабарландыруды маңызды адамдардан және қолданбалардан ғана алу"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Хабарландыруларды шектеу"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Маңыздылары ғана"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Қосулы / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Өшірулі / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Өшірулі"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Қосулы"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Әрдайым сұрау"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Өшірілгенге дейін"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> сағат</item>
-      <item quantity="one">1 сағат</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> минут"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> кестені автоматты түрде қосуға болады</item>
-      <item quantity="one">1 кестені автоматты түрде қосуға болады</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 сағат}other{# сағат}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 минут}other{# минут}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Өшірулі}=1{Өшірулі/1 кесте автоматты түрде қосылады‎‎‎‎‎‎}other{Өшірулі/# кесте автоматты түрде қосылады‎‎‎‎‎‎}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"\"Мазаламау\" режимін тоқтата алатындар"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Адамдар"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Қолданбалар"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Маңыздылығы төмен хабарландыруларды автоматты түрде дыбыссыз режимге орнату"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Хабарландыруларды автоматты түрде сұрыптау"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Хабарландыруларды қатыстылығына қарай сұрыптау"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Бейімделетін хабарландырулар туралы пікірлер"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Хабарландыруларға жасалған түзетулерді көрсетеді және жүйеге пікір жіберуді ұсынады"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Ұсынылған әрекеттер және жауаптар"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Ұсынылған әрекеттер мен жауаптарды автоматты түрде көрсету"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Соңғы және кейінге қалған хабарландыруларды көрсету"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"\"Мазаламау\" режимін пайдалану"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"\"Мазаламау\" режимін пайдалануға рұқсат ету"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Орнатылған қолданбалардың ешбірі Мазаламау режиміне кіруге рұқсат сұрамады"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Қолданбаларды жүктеу…"</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Қолданбалар жүктелуде…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Сұрауыңыз бойынша Android бұл қолданбаның хабарландыруларын көрсетпейді"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Сұрауыңыз бойынша Android мұндай хабарландыруларды көрсетпейді"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Сұрауыңыз бойынша Android бұл құрылғыда мұндай хабарландырулар тобын бөгейді"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Барлық әңгіме"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Маңызды әңгімелер"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Жоқ"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> әңгіме</item>
-      <item quantity="one">1 әңгіме</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Жоқ"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Жоқ}=1{1 чат}other{# чат}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Тоқтата алатындар"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Қоңыраулар"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Қоңыраулар"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Рұқсат етілген қоңыраулар келгенде, дыбыстық сигнал берілуі үшін, құрылғы дыбысы қосылып тұрғанын тексеріңіз."</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"\"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" үшін кіріс қоңыраулар бөгеледі. Параметрлерді достарыңыз, отбасы мүшелері не басқа контактілер сізге хабарласа алатын етіп реттей аласыз."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Жұлдызшалы контактілер"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other">тағы <xliff:g id="NUM_PEOPLE">%d</xliff:g> контакт</item>
-      <item quantity="one">тағы 1 контакт</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Ешқандай жұлдызшалы контакт жоқ"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Жоқ}=1{{contact_1}}=2{{contact_1} және {contact_2}}=3{{contact_1}, {contact_2} және {contact_3}}other{{contact_1}, {contact_2} және тағы басқа # контакт‎‎}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Хабарлар"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"хабарлар"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Хабарлар"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"\"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" үшін кіріс хабарларға тыйым салынған. Достарыңыз, отбасыңыздың мүшелері не басқа контактілеріңіз сізге хабарласа алуы үшін, параметрлерді реттеуіңізге болады."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Барлық хабар келеді"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Барлық қоңырау келеді"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Ешқандай контакт жоқ"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> контакт</item>
-      <item quantity="one">1 контакт</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Жоқ}=1{1 контакт}other{# контакт}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Кез келген адам"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Контактілер"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Жұлдызшалы контактілер"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Барлық хабарландыру"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Кейбір хабарландырулар"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Таңдалған адамдар қолданбада мазаламау режимі қосулы болса да сізге хабарласа алады."</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> тоқтата алады</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> тоқтата алады</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"Тағы <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Ешқандай қолданба мазаламайды}=1{{app_1} мазалайды}=2{{app_1} және {app_2} мазалайды}=3{{app_1}, {app_2} және {app_3} мазалайды}other{{app_1}, {app_2} және тағы басқа # қолданба мазалайды}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Қолданбалар"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Барлық хабарландыру"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Кейбір хабарландырулар"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Тоқтата алатын хабарландырулар"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Барлық хабарландыруға рұқсат ету"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> тоқтата алады</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> тоқтата алады</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Ештеңе тоқтата алмайды"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"Тағы <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Ештеңе мазаламайды}=1{{sound_category_1} мазалайды}=2{{sound_category_1} және {sound_category_2} мазалайды}=3{{sound_category_1}, {sound_category_2} және {sound_category_3} мазалайды}other{{sound_category_1}, {sound_category_2} және тағы басқа # дыбыс мазалайды}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Ештеңе мазаламайды"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Ешкім тоқтата алмайды"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Кейбір адамдар тоқтата алады"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Барлығы тоқтата алады"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB-ді басқаратын құрылғы"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Жалғанған құрылғы"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Осы құрылғы"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Ауыстырылуда..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Ауыстырылуда…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Ауыстырылмады"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Осы құрылғыны зарядтауда"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Жалғанған құрылғыны зарядтау"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Мәліметтерді көру"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Data Saver"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Шектелмейтін деректер"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Фондық дерек өшірілген"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Фондық дерек өшірілген."</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Қосулы"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Өшірулі"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Data Saver функциясын қолдану"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Құрылғы құлыптаулы кезде, хабарландыруларда жауап немесе басқа мәтін теруге тыйым салу"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Әдепкі емлені тексеру құралы"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Емлені тексеру құралын таңдау"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Емле тексеру құралын пайдалану"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Емле тексеру құралын пайдалану"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Таңдалмаған"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(ешқандай)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Жад кеңістігін босату үшін жад реттегіші құрылғыдағы сақтық көшірмесі жасалған фотосуреттер мен бейнелерді өшіреді."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Фотосуреттер мен бейнелерді жою"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Жад реттегіші"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Жад менеджерін пайдалану"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Жадты басқару құралын пайдалану"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Aвтоматты"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Қолмен"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Орынды қазір босату"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Телефонды тексеру үшін екі рет түрту"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Планшетті тексеру үшін екі рет түртіңіз"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Құрылғыны тексеру үшін екі рет түртіңіз"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Хабарландыруларға қарай сырғыту"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Хабарландыруларды көру үшін экранның төменгі жиегінен төмен сырғытыңыз."</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Бір қолмен енгізу режимі"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Бір қолмен енгізу режимін пайдалану"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Бір қолданбадан екіншісіне ауысқанда, одан шығу"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Тайм-аут"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 секунд"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 секунд"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 секунд"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"бір қолмен басқару"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Уақытты, хабарландыруларды және басқа ақпаратты көру үшін экранды екі рет түртіңіз."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Телефонды тексеру үшін көтеру"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Планшетті тексеру үшін оны көтеріңіз"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Планшетті тексеру үшін түртіңіз"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Құрылғыны тексеру үшін түртіңіз"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Уақытты, хабарландыруларды және басқа ақпаратты көру үшін экранды түртіңіз."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Үрейлендіргіш дабыл түймесі"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Қуат түймесін 5 рет жылдам басу арқылы төтенше жағдай әрекеттерін іске қосыңыз."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Хабарландыру дыбысы"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Әрекеттерді бастар алдындағы хабарландыру"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Төтенше жағдайға арналған контактілер"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Хабарландыруларды көру үшін саусақ ізін пайдалану"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Саусақ ізі сканері"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Хабарландыруларды көру үшін телефонның артындағы саусақ ізін оқу сканерін саусақпен төмен қарай сипап өтіңіз."</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Барлық қолданбалар үшін қосу"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Графикалық драйверді таңдау"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Әдепкі"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Ойын драйвері"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Game Driver"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Developer Driver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Графикалық жүйе драйвері"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Желілер табылмады. Қайталап көріңіз."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(тыйым салынған)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"SIM картасы салынбаған"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"SIM жоқ."</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Жоқ"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Қосылу үшін SIM картасы қажет."</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Қосылу үшін <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> SIM картасы қажет"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Оңтайлы желі режимі: WCDMA таңдалды"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Оңтайлы желі режимі: тек GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Оңтайлы желі режимі: тек WCDMA"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Мобильдік деректер"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Интернетке мобильдік желі арқылы кіру"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Телефон байланыс аясында болған кезде, автоматты түрде осы операторға ауысады."</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"SIM картасы жоқ."</string>
     <string name="calls_preference" msgid="2166481296066890129">"Қоңыраулар параметрлері"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS параметрі"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Әрдайым сұрау"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Параметрлер экранының үстін жабуға рұқсат ету"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Басқа қолданбалардың үстінен шыға алатын қолданбаларға параметрлер экрандарының бетіне қабаттасуға рұқсат ету"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Мультимедиа"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Мультимедиа сеансы аяқталғанда ойнатқышты жасыру"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Ойнатқыш кеңейтілген \"Жылдам параметрлер\" панелінен жалғастыруға мүмкіндік береді."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Жылдам параметрлердегі Media Player"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Оңай ойната бастау үшін Media Player-ді ұзақ уақыт көрсетіңіз"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Ойнатқышты жасыру"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Ойнатқышты көрсету"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Ойнатқыштар жоқ"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Рұқсат етілген қолданбалар"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"мультимeдиа"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth қосылады."</string>
 </resources>
diff --git a/res/values-km/arrays.xml b/res/values-km/arrays.xml
index d074efd..e4f2b19 100644
--- a/res/values-km/arrays.xml
+++ b/res/values-km/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"មធ្យម"</item>
     <item msgid="6740026006576843477">"វែង"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"ខ្លី"</item>
+    <item msgid="7397961711906421599">"មធ្យម"</item>
+    <item msgid="4079132024502041928">"វែង"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"លំនាំដើម"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"សកល"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA ប៉ុណ្ណោះ"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"សកល"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 8e58815..4e99e53 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"បង្ហាញ​ព័ត៌មាន​​ប្រវត្តិរូប​លើ​អេក្រង់ចាក់សោ"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"គណនី"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"ទី​តាំង​"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"ប្រើទីតាំង"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"ប្រើទីតាំង"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"បិទ"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">បើក - កម្មវិធី <xliff:g id="COUNT_1">%1$d</xliff:g> មានសិទ្ធិ​ចូលប្រើ​ទីតាំង</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"ប្រើ​មុខ​របស់អ្នកដើម្បីផ្ទៀងផ្ទាត់"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"ចាប់ផ្ដើម"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"ប្រសិនបើការដោះសោ​តាមទម្រង់មុខ​សម្រាប់​ភាពងាយស្រួលត្រូវបានបិទ ជំហាន​រៀបចំ​មួយចំនួនអាច​នឹង​ដំណើរការ​មិន​ប្រក្រតីជាមួយមុខងារ​តបវិញ។"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"ថយក្រោយ"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"បន្ត​រៀបចំ"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"ប្រើការរៀបចំភាពងាយស្រួល"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="one">ត្រូវ​តែ​តិច​ជាង <xliff:g id="NUMBER_0">%d</xliff:g> ខ្ទង់</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"អ្នក​គ្រប់គ្រង​ឧបករណ៍​មិនអនុញ្ញាត​កូដ PIN ​ទើបប្រើហើយទេ"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"កូដ PIN លក្ខណៈ​សាមញ្ញ​ត្រូវ​បាន​ទប់ស្កាត់​ដោយ​អ្នក​គ្រប់គ្រង​ព័ត៌មាន​វិទ្យា​របស់អ្នក។ សាកល្បង​ប្រើ​កូដ PIN ផ្សេង​ពី​នេះ។"</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"វាមិនអាចប្រើតួអក្សរដែលគ្មានសុពលភាពទេ"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"ត្រូវមានអក្សរយ៉ាងហោចណាស់មួយតួ"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"ត្រូវមានលេខយ៉ាងហោចណាស់មួយតួ"</string>
@@ -653,7 +655,6 @@
       <item quantity="one">ត្រូវតែមាន​តួដែលមិនមែន​ជាលេខ​យ៉ាងហោចណាស់ 1</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"អ្នក​គ្រប់គ្រង​ឧបករណ៍​មិន​អនុញ្ញាត​ឲ្យ​ប្រើ​ពាក្យ​សម្ងាត់​បច្ចុប្បន្ន​ទេ"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"ពាក្យសម្ងាត់​លក្ខណៈ​សាមញ្ញ​ត្រូវ​បាន​ទប់ស្កាត់​ដោយ​អ្នក​គ្រប់គ្រង​ព័ត៌មាន​វិទ្យា​របស់អ្នក។ សាកល្បង​ប្រើ​ពាក្យ​សម្ងាត់​ផ្សេង​ពី​នេះ។"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"មិន​អនុញ្ញាត​ឲ្យ​មានលំដាប់ឡើង ចុះ ឬច្រំដែលទេ"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"បញ្ជាក់"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"បោះ​បង់​"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"បើក​វ៉ាយហ្វាយ"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"ប្រើ Wi‑Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"ប្រើ Wi‑Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"ការកំណត់​វ៉ាយហ្វាយ"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"រៀបចំ &amp; គ្រប់គ្រង​ចំណុច​ចូល​ដំណើរការ​ឥត​ខ្សែ"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"ដាក់កូដ QR ខាងក្រោមឱ្យ​នៅចំកណ្ដាល ដើម្បីភ្ជាប់ទៅ “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"ចូលរួម Wi-Fi ដោយស្កេនកូដ QR"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"ចែករំលែក Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"ស្កេន​កូដ​ QR នេះដើម្បី​ភ្ជាប់​ទៅ “<xliff:g id="SSID">%1$s</xliff:g>” និងចែករំលែក​ពាក្យសម្ងាត់"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"ស្កេន​កូដ​ QR នេះដោយប្រើ​ឧបករណ៍​ផ្សេង ដើម្បី​ចូលរួម “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"ស្កេន QR កូដនេះ ដើម្បីភ្ជាប់ជាមួយ “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"សូមព្យាយាមម្ដងទៀត។ ប្រសិនបើ​បញ្ហា​នៅតែបន្តកើតឡើង សូមទាក់ទង​ក្រុមហ៊ុនផលិត​ឧបករណ៍"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"មានអ្វីមួយ​ខុសប្រក្រតី"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"ពាក្យសម្ងាត់ Wi‑Fi៖ <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"ពាក្យសម្ងាត់​ហតស្ប៉ត៖ <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"ភ្ជាប់ដោយ​ស្វ័យប្រវត្តិ"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"អនុញ្ញាតឱ្យ​ទូរសព្ទភ្ជាប់ដោយស្វ័យប្រវត្តិ នៅពេលនៅជិត​បណ្ដាញនេះ"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"អនុញ្ញាតឱ្យ​ថេប្លេតភ្ជាប់ដោយស្វ័យប្រវត្តិ នៅពេលនៅជិត​បណ្ដាញនេះ"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"អនុញ្ញាត​ឱ្យភ្ជាប់​ជាមួយ​បណ្ដាញនេះ នៅពេល​មានសេវា"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"បញ្ចូល​ឧបករណ៍"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"ប្រើកូដ QR ដើម្បី​បញ្ចូល​ឧបករណ៍​ទៅ​បណ្តាញ​នេះ"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"កូដ QR មិនមែនជា​ទម្រង់​ដែលត្រឹមត្រូវ​ទេ"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"ប្រើវិញ្ញាបនបត្រប្រព័ន្ធ"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"កុំផ្តល់"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"កុំបញ្ជាក់សុពលភាព"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"មិនមានវិញ្ញាបនបត្រដែលបានបញ្ជាក់ទេ។ ការតភ្ជាប់របស់អ្នកនឹងមិនមានលក្ខណៈឯកជនទេ។"</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"ឈ្មោះ​បណ្តាញ​វែងពេក​ហើយ។"</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"ត្រូវតែបញ្ជាក់ដែន"</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"តម្រូវឱ្យ​មាន​វិញ្ញាបនបត្រ។"</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"តភ្ជាប់"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"បានបើក Wi‑Fi"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"បានភ្ជាប់ជាមួយ <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"កំពុងភ្ជាប់ទៅ <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"កំពុងភ្ជាប់…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"បាន​បរាជ័យ​ក្នុង​ការ​តភ្ជាប់​បណ្ដាញ"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"បណ្ដាញ​មិន​មានសេវា​ទេ"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"កម្មវិធីកំពុងចែករំលែកខ្លឹមសារ។ ដើម្បីចែករំលែកការភ្ជាប់អ៊ីនធឺណិត សូមបិទហតស្ប៉ត រួចបើកឡើងវិញ"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"មិនមានការកំណត់ពាក្យសម្ងាត់​ទេ"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"ឈ្មោះ​ហតស្ប៉ត"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"កំពុងបើក <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"កំពុងបើក <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"ឧបករណ៍​ផ្សេងទៀត​អាចភ្ជាប់​ជាមួយ <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"ពាក្យសម្ងាត់​ហតស្ប៉ត"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"កម្រិតបញ្ជូន AP"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"បង្កើន​អត្រា​ផ្ទុកឡើងវិញ​ដោយស្វ័យប្រវត្តិ​ពី 60 ទៅ 90 Hz សម្រាប់​ខ្លឹមសារ​មួយចំនួន។ ប្រើប្រាស់ថ្ម​ច្រើន​ជាងមុន។"</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"ជំរុញឱ្យមានអត្រា​ផ្ទុកឡើងវិញ 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"អត្រា​ផ្ទុកឡើងវិញ​ខ្ពស់បំផុតសម្រាប់​គុណភាពនៃ​រូបមានចលនា និង​ការឆ្លើយតបនៃ​ការចុចប្រសើរជាងមុន។ ប្រើប្រាស់ថ្ម​ច្រើន​ជាងមុន។"</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"ការដឹងថាកំពុងនៅប្រើ"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"បើក / អេក្រង់​នឹងមិន​បិទទេ ប្រសិនបើ​អ្នក​កំពុង​មើល​អេក្រង់"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"កំណែ Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"កំណែ​សុវត្ថិភាពថ្មី​របស់ Android"</string>
     <string name="model_info" msgid="8997566254717810904">"ម៉ូដែល"</string>
-    <string name="model_summary" msgid="2246651782442466213">"ម៉ូដែល៖ %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"ម៉ូដែល និងហាតវែរ"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"កំណែ​ហាតវែរ"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"លេខ​សម្គាល់​បរិក្ខារ"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"បានកំណត់ការកំណត់បណ្តាញឡើងវិញ"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"មិន​អាចលុប​ស៊ីម​បានទេ"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"មិន​អាច​លុប​ស៊ីម​ដែលបានទាញយក​ទេ ដោយសារ​មានបញ្ហា។\n\nសូម​ចាប់ផ្ដើម​​ឧបករណ៍​របស់អ្នក​ឡើងវិញ រួចព្យាយាម​ម្ដងទៀត។"</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"លុបទិន្នន័យទាំងអស់ (កំណត់ដូចថ្មីវិញ)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"លុបទិន្នន័យទាំងអស់ (កំណត់ដូចថ្មីវិញ)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"ការធ្វើបែបនេះ​នឹង​លុប​ទិន្នន័យ​ទាំងអស់ពី "<b>"ទំហំផ្ទុកខាងក្នុង"</b>"នៃថេប្លេត​របស់អ្នក រួមទាំង៖\n\n"<li>"កម្មវិធី​ដែលបានទាញយក"</li>\n<li>"ទិន្នន័យ​កម្មវិធី និង​ប្រព័ន្ធ​ ព្រមទាំងការកំណត់​"</li>\n<li>"គណនី Google របស់អ្នក"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"ការធ្វើបែបនេះ​នឹង​លុប​ទិន្នន័យ​ទាំងអស់​ពី​ "<b>"ទំហំផ្ទុក​ខាង​ក្នុង"</b>"នៃ​ទូរសព្ទ​របស់​អ្នក រួមទាំង៖\n\n"<li>"កម្មវិធី​ដែលបាន​ទាញ​យក"</li>\n<li>"ទិន្នន័យ​កម្មវិធី និង​ប្រព័ន្ធ​ ព្រមទាំងការកំណត់"</li>\n<li>"គណនី Google របស់​អ្នក"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"បច្ចុប្បន្ន​ អ្នក​បាន​ចូល​គណនី​ដូច​ខាង​ក្រោម៖ \n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"មានអ្នកផ្សេងច្រើនទៀតមានវត្តមាននៅលើឧបករណ៍នេះ។\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"តន្ត្រី"</li>\n<li>"រូបថត"</li>\n<li>"ទិន្នន័យ​អ្នក​ប្រើ​ផ្សេង​ទៀត"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"ការធ្វើបែបនេះនឹងមិនបោះបង់គម្រោងសេវាកម្មទូរសព្ទចល័តរបស់អ្នកទេ។"</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"ដើម្បី​សម្អាត​តន្ត្រី រូបថត និង​ទិន្នន័យ​អ្នក​ប្រើ​ផ្សេងៗ តម្រូវ​ឲ្យ​លុប"<b>"ឧបករណ៍​ផ្ទុក​យូអេសប៊ី"</b>" ។"</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"ដើម្បី​សម្អាត​តន្ត្រី, រូបភាព និង​ទិន្នន័យ​អ្នកប្រើ​ផ្សេងទៀត "<b>"ចាំបាច់​ត្រូវ"</b>" លុប​កាត​អេសឌី។"</string>
+    <string name="main_clear_title" msgid="277664302144837723">"លុបទិន្នន័យទាំងអស់ (កំណត់ដូច​ចេញពីរោងចក្រ)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"លុបទិន្នន័យទាំងអស់ (កំណត់ដូច​ចេញពីរោងចក្រ)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"ការធ្វើបែបនេះ​នឹង​លុប​ទិន្នន័យ​ទាំងអស់ពី"<b>"ទំហំផ្ទុកខាងក្នុង"</b>"នៃថេប្លេត​របស់អ្នក រួមទាំង៖\n\n"<li>"គណនី Google របស់អ្នក"</li>\n<li>"ទិន្នន័យ​កម្មវិធី​និង​ប្រព័ន្ធ​ និងការកំណត់​"</li>\n<li>"កម្មវិធី​ដែលបានទាញយក"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"ការធ្វើបែបនេះ​នឹង​លុប​ទិន្នន័យ​ទាំងអស់​ពី"<b>"ទំហំផ្ទុក​ខាង​ក្នុង"</b>"នៃ​ទូរសព្ទ​របស់​អ្នក រួមទាំង៖\n\n"<li>"គណនី Google របស់​អ្នក"</li>\n<li>"ទិន្នន័យ​កម្មវិធី​និង​ប្រព័ន្ធ​ និងការកំណត់"</li>\n<li>"កម្មវិធី​ដែលបាន​ទាញ​យក"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"បច្ចុប្បន្ន អ្នក​បាន​ចូល​គណនី​ដូច​ខាង​ក្រោម៖\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"មានអ្នកប្រើប្រាស់​ផ្សេងទៀតមានវត្តមាន​នៅលើឧបករណ៍នេះ។\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"តន្ត្រី"</li>\n<li>"រូបថត"</li>\n<li>"ទិន្នន័យ​អ្នក​ប្រើ​ប្រាស់ផ្សេង​ទៀត"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"សកម្មភាពនេះ​នឹងមិនលុបចោលគម្រោង​សេវាកម្មឧបករណ៍ចល័ត​របស់អ្នកទេ។"</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"ដើម្បី​សម្អាតតន្ត្រី រូបភាព និង​ទិន្នន័យ​អ្នកប្រើប្រាស់​ផ្សេងទៀត ចាំបាច់ត្រូវលុប"<b>"ឧបករណ៍ផ្ទុក USB"</b>"។"</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"ដើម្បី​សម្អាត​តន្ត្រី រូបភាព និង​ទិន្នន័យ​អ្នកប្រើប្រាស់​ផ្សេងទៀត ចាំបាច់ត្រូវលុប"<b>"កាត SD"</b>"។"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"លុប​ឧបករណ៍​ផ្ទុក​យូអេសប៊ី"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"លុប​កាត​​អេសឌី"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"លុប​ទិន្នន័យ​ទាំងអស់​លើ​ឧបករណ៍​ផ្ទុក​យូអេសប៊ី​ខាង​ក្នុង ដូច​ជា​តន្ត្រី ឬ​​រូបថត"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"លុប​ទិន្នន័យ​ទាំងអស់​លើ​កាត​អេសឌី ដូច​ជា​តន្ត្រី ឬ​រូបថត"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"លុប​ទិន្នន័យ​ទាំង​អស់"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"លុប​ទិន្នន័យ​ទាំង​អស់"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"ព័ត៌មាន​ផ្ទាល់ខ្លួន និងកម្មវិធី​ដែលបានទាញយក​ទាំងអស់​របស់អ្នកនឹងត្រូវបានលុបចេញ។ អ្នកមិន​អាចត្រឡប់​សកម្មភាពនេះ​វិញបានទេ។"</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"ព័ត៌មាន​ផ្ទាល់ខ្លួន​ទាំងអស់​របស់អ្នក រួម​ទាំង​ស៊ីម និងកម្មវិធី​ដែលបាន​ទាញយកនឹងត្រូវបានលុបចេញ។ អ្នកមិន​អាចត្រឡប់​សកម្មភាពនេះ​វិញបានទេ។"</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"លុប​អ្វីៗ​ទាំងអស់"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"គ្មាន​ការ​កំណត់​ឡើងវិញ​ត្រូវ​បាន​អនុវត្ត ព្រោះ​សេវាកម្ម​សម្អាត​ប្រព័ន្ធ​មិន​អាច​ប្រើ​បាន។"</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"លុប​ទិន្នន័យ​ទាំង​អស់​?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"ការ​កំណត់​ដូច​ចេញ​ពី​រោងចក្រ​ឡើង​វិញ​មិន​អាច​ប្រើ​បាន​សម្រាប់​អ្នក​ប្រើ​ម្នាក់​នេះ"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"លុប"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"សូម​រង់ចាំ..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"លុប​ទិន្នន័យ​ទាំង​អស់"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"លុប​ទិន្នន័យ​ទាំង​អស់"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"ព័ត៌មាន​ផ្ទាល់ខ្លួន និងកម្មវិធី​ដែលបានទាញយក​ទាំងអស់​របស់អ្នកនឹងត្រូវបានលុបចេញ។ អ្នកមិន​អាចត្រឡប់​សកម្មភាពនេះ​វិញបានទេ។"</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"ព័ត៌មាន​ផ្ទាល់ខ្លួន​ទាំងអស់​របស់អ្នក រួម​ទាំង​ស៊ីម និងកម្មវិធី​ដែលបាន​ទាញយកនឹងត្រូវបានលុបចេញ។ អ្នកមិន​អាចត្រឡប់​សកម្មភាពនេះ​វិញបានទេ។"</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"លុប​ទិន្នន័យ​ទាំង​អស់ឬ?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"ការកំណត់​ដូចចេញពី​រោងចក្រ​មិនអាចប្រើបាន​សម្រាប់​អ្នកប្រើប្រាស់​នេះទេ"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"កំពុងលុប"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"សូម​រង់ចាំ…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"កំណត់​ការ​ហៅ"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"រៀបចំ​សារ​ជា​សំឡេង បញ្ជូន​ការ​ហៅ​បន្ត រង់ចាំ​ការ​ហៅ លេខ​សម្គាល់​អ្នក​ហៅ"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"ការ​ភ្ជាប់តាម USB"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"មិន​អាច​ភ្ជាប់​ទៅ​ឧបករណ៍​ច្រើន​ជាង <xliff:g id="MAXCONNECTION">%1$d</xliff:g> ។"</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> នឹង​ត្រូវ​បាន​ផ្ដាច់។"</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"ការ​ភ្ជាប់អ៊ីសឺរណិត"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"ចែករំលែកការតភ្ជាប់អ៊ីនធឺណិតរបស់ទូរសព្ទតាមរយៈអ៊ីសឺរណិត USB"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"ចែករំលែកការតភ្ជាប់អ៊ីនធឺណិតរបស់ទូរសព្ទតាមរយៈអ៊ីសឺរណិត"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"ប្រើហតស្ប៉ត និងការភ្ជាប់ ដើម្បីផ្តល់អ៊ីនធឺណិតដល់ឧបករណ៍ផ្សេងទៀតតាមរយៈការភ្ជាប់ទិន្នន័យទូរសព្ទចល័តរបស់អ្នក។ កម្មវិធីក៏អាចបង្កើតហតស្ប៉ត ដើម្បីចែករំលែកខ្លឹមសារជាមួយឧបករណ៍ដែលនៅជិតផងដែរ។"</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"ប្រើ​ហតស្ប៉ត និង​ការភ្ជាប់ ដើម្បី​ផ្តល់​អ៊ីនធឺណិត​ដល់​ឧបករណ៍​ផ្សេងទៀត​តាមរយៈ​ការតភ្ជាប់ Wi-Fi ឬ​ទិន្នន័យ​ទូរសព្ទ​ចល័ត​របស់​អ្នក។ កម្មវិធី​ក៏​អាច​បង្កើត​ហតស្ប៉ត ដើម្បី​ចែករំលែក​ខ្លឹមសារ​ជាមួយ​ឧបករណ៍​ដែល​នៅជិត​បាន​ផងដែរ។"</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"ជំនួយ"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"ចំណូលចិត្ត​អក្សររត់"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"ការពង្រីក"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"ផ្ទៃ​ពង្រីក"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"មុខងារ​បើក​ការពង្រីក"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"ជ្រើសរើស​ផ្ទៃពង្រីក​ដែលអ្នក​ចង់ប្រើ នៅពេល​ពង្រីក​អេក្រង់"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"អេក្រង់ពេញ"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"ផ្នែក​នៃ​អេក្រង់"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"អេក្រង់ពេញ និង​ផ្នែកនៃ​អេក្រង់"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"ពង្រីក​អេក្រង់​ទាំងមូល"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"ពង្រីក​ផ្នែកនៃ​អេក្រង់"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"ប្ដូរទៅប៊ូតុង​ភាពងាយស្រួលឬ?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"ការប្រើការចុចបីដង ដើម្បីពង្រីកផ្នែកនៃអេក្រង់​នឹងបង្កឱ្យការវាយបញ្ចូល និងសកម្មភាពផ្សេងទៀត​ពន្យារពេល។\n\nតើអ្នកចង់ប្ដូរទៅប្រើប៊ូតុង​ភាពងាយស្រួល ដើម្បីពង្រីកដែរទេ?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"ប្ដូរទៅប៊ូតុង​ភាពងាយស្រួល"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"រក្សា​ការចុចបីដង ដើម្បីពង្រីក"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"ការកំណត់​ការពង្រីក"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"ពង្រីកដោយធ្វើការចុចបីដង"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"ពង្រីកដោយប្រើផ្លូវកាត់"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"ប៊ូតុងថាមពល​បញ្ចប់​ការ​ហៅ"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"ព្រួញកណ្តុរធំ"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"លុប​រូបភាព​មាន​ចលនា"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"សំឡេងម៉ូណូ"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"រួមផ្សំប៉ុស្តិ៍ចូលគ្នាពេលកំពុងចាក់សំឡេង"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"តុល្យភាព​សំឡេង"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"ឆ្វេង"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"ស្ដាំ"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"សំឡេងម៉ូណូ"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"រួមផ្សំប៉ុស្តិ៍ចូលគ្នាពេលកំពុងចាក់សំឡេង"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"តុល្យភាព​សំឡេង"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"ឆ្វេង"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"ស្ដាំ"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"លំនាំដើម"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 វិនាទី"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 វិនាទី"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"ការ​ញ័រនៃការជូនដំណឹង"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"ការញ័រ​នៃសំឡេងរោទ៍"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"ប្រតិកម្មតបនឹងការប៉ះ"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"ប្រើ <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"បើក <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"ប្រើ​ការ​កែតម្រូវពណ៌"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"បង្ហាញ​អក្សររត់"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"សម្រាប់​កម្មវិធី​ដែលអាច​ប្រើបាន​តែប៉ុណ្ណោះ"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"ប្រើ <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"បើក <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"ប្រើ​ការ​កែតម្រូវពណ៌"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"បង្ហាញ​អក្សររត់"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"សម្រាប់​កម្មវិធី​ដែលអាច​ប្រើបាន​តែប៉ុណ្ណោះ"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"រចនាប័ទ្ម និង​ទំហំ​អក្សររត់"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"ទំហំ​អក្សរ <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"ជម្រើស​ច្រើនទៀត"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"ការមើល​មិនឃើញ​ពណ៌​បៃតង"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"ការមើល​មិនឃើញ​ពណ៌ក្រហម"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"ការមើល​មិនឃើញ​ពណ៌ខៀវ"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"មាត្រដ្ឋានពណ៌​ប្រផេះ"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"ក្រហម-បៃតង"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"ក្រហម-បៃតង"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"ខៀវ-លឿង"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"ការ​ដាក់កំហិត​នៅ​ផ្ទៃ​ខាងក្រោយ"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"អនុញ្ញាត​ឲ្យ​កម្មវិធី​នេះ​ដំណើរការ​នៅ​ផ្ទៃ​ខាង​ក្រោយ"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"កម្មវិធីមិន​ត្រូវ​បាន​អនុញ្ញាត​ឲ្យ​ដំណើរការ​នៅ​ផ្ទៃខាងក្រោយ​ទេ"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"​មិន​អាច​ដាក់​កំហិត​ការប្រើប្រាស់​នៅ​ផ្ទៃ​ខាងក្រោយ​បានទេ"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"​មិន​អាច​ដាក់​កំហិតលើ​ការប្រើប្រាស់​នៅ​ផ្ទៃ​ខាងក្រោយ​បានទេ"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"ដាក់កម្រិតលើសកម្មភាពផ្ទៃខាងក្រោយ?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"ប្រសិនបើអ្នកដាក់កម្រិតលើសកម្មភាពផ្ទៃខាងក្រោយសម្រាប់កម្មវិធី វាអាចនឹងដំណើរការខុសប្រក្រតី"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"ដោយសារ​កម្មវិធីនេះ​មិនត្រូវ​បានកំណត់ ដើម្បី​បង្កើន​ប្រសិទ្ធភាពថ្ម អ្នកមិន​អាចដាក់​កំហិតវា​បានទេ។\n\nដើម្បី​ដាក់កំហិត​កម្មវិធី សូមបើក​ការបង្កើន​ប្រសិទ្ធភាពថ្ម​ជាមុនសិន។"</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"កំណត់​កាលវិភាគ"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"បង្កើនកម្រិត​ថាមពល​ថ្ម"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"បិទ នៅពេល​សាកថ្មពេញ"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"កម្មវិធី​សន្សំ​ថ្មនឹង​បិទ​ នៅពេលទូរសព្ទរបស់អ្នកមានថ្ម <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"កម្មវិធី​សន្សំ​ថ្មនឹង​បិទ​ នៅពេលថេប្លេត​របស់អ្នកមានថ្ម <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"កម្មវិធី​សន្សំ​ថ្មនឹង​បិទ​ នៅពេលឧបករណ៍របស់អ្នកមានថ្ម <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"មុខងារសន្សំថ្មនឹងបិទ នៅពេល​ទូរសព្ទរបស់អ្នក​សាកថ្មលើសពី <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"មុខងារសន្សំថ្មនឹងបិទ នៅពេល​ថេប្លេតរបស់អ្នក​សាកថ្មលើសពី <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"មុខងារសន្សំថ្មនឹងបិទ នៅពេល​ឧបករណ៍របស់អ្នក​សាកថ្មលើសពី <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"បើក"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"កំណត់​ឡើងវិញ"</string>
     <string name="tts_play" msgid="2945513377250757221">"លេង"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"ការតភ្ជាប់មានភាពបត់បែន"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"បង្កើនកម្រិតថាមពលថ្ម និងកែលម្អសមត្ថភាព​ឧបករណ៍​ដោយគ្រប់គ្រងការតភ្ជាប់បណ្ដាញ​របស់អ្នកដោយស្វ័យប្រវត្តិ"</string>
     <string name="credentials_title" msgid="7535942196886123656">"កន្លែងផ្ទុកព័ត៌មានសម្ងាត់"</string>
     <string name="credentials_install" msgid="3933218407598415827">"ដំឡើង​វិញ្ញាបនបត្រ"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"ដំឡើង​វិញ្ញាបនបត្រ​ពី​ឧបករណ៍​ផ្ទុក"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"ព័ត៌មានសម្គាល់ខ្លួនអ្នកប្រើ"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"មើល និងកែប្រែព័ត៌មានសម្គាល់ខ្លួនដែលបានផ្ទុក"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"កម្រិត​ខ្ពស់"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"ប្រភេទ​ឧបករណ៍​ផ្ទុក"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"កន្លែង​ផ្ទុក​របស់​​ផ្នែក​រឹង"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"កន្លែង​ផ្ទុក​របស់​​កម្មវិធី"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"ព័ត៌មាន​សម្ងាត់​មិន​មាន​សម្រាប់​អ្នកប្រើ​នេះ​ទេ"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"បានដំឡើេងសម្រាប់ VPN និងកម្មវិធី"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"បានដំឡើងសម្រាប់ Wi-Fi"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"បង់ប្រាក់នៅកន្លែងដែលមានឧបករណ៍គិតប្រាក់"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"ដំឡើងកម្មវិធីបង់ប្រាក់ ហើយបន្ទាប់មកដាក់ផ្នែកខាងក្រោយនៃទូរសព្ទរបស់អ្នកទៅលើឧបករណ៍គិតប្រាក់ណាមួយដែលមាននិមិត្តសញ្ញាមិនចាំបាច់ប៉ះម៉ាស៊ីនគិតប្រាក់។"</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"យល់ហើយ"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"ច្រើន​ទៀត..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"ច្រើនទៀត…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"កំណត់​កម្មវិធី​បង់ប្រាក់​លំនាំដើម"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"ធ្វើបច្ចុប្បន្នភាព​កម្មវិធី​បង់ប្រាក់​លំនាំដើម"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"នៅម៉ាស៊ីន​គិតប្រាក់​ដោយ​មិនចាំបាច់ប៉ះ សូមបង់ប្រាក់​តាមរយៈ <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"ប្រើ​វា​សម្រាប់​ការ​ហៅ​ជា​និច្ច"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"ជ្រើស​ស៊ីម​សម្រាប់​ទិន្នន័យ"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"ជ្រើសរើស​ស៊ីម​សម្រាប់​សារ SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"កំពុងប្តូរស៊ីមទិន្នន័យ វាអាចចំណាយពេលមួយនាទី..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"កំពុងប្ដូរស៊ីមទិន្នន័យ សកម្មភាពនេះ​អាចចំណាយពេល​មួយនាទី…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"ហៅ​ជាមួយ"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"ជ្រើស​ស៊ី​ម​កាត"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"ស៊ី​ម <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"ទម្លាប់ កាលវិភាគ កម្មវិធីសន្សំថ្ម កម្មវិធីសន្សំថាមពល ថ្ម ស្វ័យប្រវត្តិ ភាគរយ"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, ការហៅទូរសព្ទ​កម្រិតខ្ពស់, ការហៅទូរសព្ទតាមរយៈប្រព័ន្ធ 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"បញ្ចូលភាសា បញ្ចូលភាសាមួយ"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"ទំហំ​អក្សរ"</string>
     <string name="default_sound" msgid="6604374495015245195">"សំឡេង​លំនាំ​ដើម"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"កម្រិតសំឡេង​រោទ៍ និង​ការជូន​ដំណឹង​ត្រឹម <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"កម្រិត​សំឡេង ការញ័រ កុំរំខាន"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"បើកសំឡេង"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"អក្សររត់ក្នុងពេលជាក់ស្ដែង"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"ដាក់អក្សររត់លើមេឌៀដោយស្វ័យប្រវត្តិ"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"គ្មាន"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other">បានកំណត់​កាលវិភាគ <xliff:g id="ON_COUNT">%d</xliff:g></item>
-      <item quantity="one">បានកំណត់​កាលវិភាគ 1</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{គ្មាន}=1{បានកំណត់​កាលវិភាគ 1}other{បានកំណត់​កាលវិភាគ #}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"កុំ​រំខាន"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"ទទួលការជូនដំណឹង​ពីកម្មវិធី និងមនុស្សសំខាន់ៗ​តែប៉ុណ្ណោះ"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"កាត់បន្ថយ​ការរំខាន"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"អាទិភាពប៉ុណ្ណោះ"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"បើក / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"បិទ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"បិទ"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"បើក"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"សួរគ្រប់ពេល"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"រហូតទាល់តែ​អ្នកបិទ"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> ម៉ោង</item>
-      <item quantity="one">1 ម៉ោង</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> នាទី"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other">កាលវិភាគ <xliff:g id="ON_COUNT">%d</xliff:g> អាច​បើកដោយស្វ័យប្រវត្តិ</item>
-      <item quantity="one">កាលវិភាគ 1 អាច​បើកដោយស្វ័យប្រវត្តិ</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 ម៉ោង}other{# ម៉ោង}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 នាទី}other{# នាទី}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{បិទ}=1{បិទ / កាលវិភាគ 1 អាច​បើកដោយស្វ័យប្រវត្តិ}other{បិទ / កាលវិភាគ # អាចបើក​ដោយស្វ័យប្រវត្តិ}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"អ្វីដែល​អាច​ផ្អាក​មុខងារ​កុំរំខាន"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"មនុស្ស"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"កម្មវិធី"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"កំណត់​ការជូនដំណឹង​អាទិភាពទាប​ទៅជាការជូនដំណឹង​ស្ងាត់ៗ​ដោយស្វ័យប្រវត្តិ"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"ការ​ចាត់ថ្នាក់​ការជូន​ដំណឹង​ដែល​មាន​ភាព​បត់បែន"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"ចាត់ថ្នាក់​ការជូន​ដំណឹង​តាម​ភាព​ពាក់ព័ន្ធ​ដោយ​ស្វ័យ​ប្រវត្តិ"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"មតិកែលម្អ​អំពីការជូនដំណឹង​ដែលមានភាពបត់បែន"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"បង្ហាញ​ការកែតម្រូវដែលបានធ្វើឡើង​ចំពោះការជូនដំណឹង និងបង្ហាញ​ជម្រើស​ក្នុងការ​ផ្ដល់មតិកែលម្អ​ទៅប្រព័ន្ធ"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"ការឆ្លើយតប និង​សកម្មភាព​ដែលបានណែនាំ"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"បង្ហាញការឆ្លើយតប និង​សកម្មភាព​ដែលបានណែនាំដោយស្វ័យប្រវត្តិ"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"បង្ហាញ​ការជូនដំណឹង​ថ្មីៗ និង​ការជូនដំណឹង​ដែលបាន​ផ្អាក"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"ចូលដំណើរការមុខងារកុំរំខាន"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"អនុញ្ញាតមុខងារកុំរំខាន"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"គ្មានកម្មវិធីបានដំឡើងណាមួយបានស្នើការចូលដំណើរការមុខងារកុំរំខានទេ"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"កំពុង​ផ្ទុក​កម្មវិធី..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"កំពុងផ្ទុកកម្មវិធី…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"តាមសំណើ​របស់អ្នក Android កំពុង​ទប់ស្កាត់​ការជូនដំណឹង​របស់កម្មវិធី​នេះ​មិន​ឱ្យ​បង្ហាញ​នៅលើ​ឧបករណ៍​នេះទេ"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"តាមសំណើ​របស់អ្នក ប្រព័ន្ធ​ប្រតិបត្តិការ Android កំពុង​ទប់ស្កាត់​ប្រភេទនៃការជូនដំណឹង​​នេះ​មិន​ឱ្យ​បង្ហាញ​នៅលើ​ឧបករណ៍​នេះទេ"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"តាមសំណើ​របស់អ្នក ប្រព័ន្ធ​ប្រតិបត្តិការ Android កំពុង​ទប់ស្កាត់​ក្រុមនៃ​ការជូនដំណឹង​នេះ​មិន​ឱ្យ​បង្ហាញ​នៅលើ​ឧបករណ៍​នេះទេ"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"ការសន្ទនា​ទាំងអស់"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"ការសន្ទនា​អាទិភាព"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"គ្មាន"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other">ការ​សន្ទនា <xliff:g id="CONVERSATIONS">%d</xliff:g></item>
-      <item quantity="one">ការ​សន្ទនា 1</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"គ្មាន"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{គ្មាន}=1{ការ​សន្ទនា 1}other{ការសន្ទនា #}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"អ្នកដែល​អាច​ផ្អាកបាន"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"ការហៅ​ទូរសព្ទ"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"ហៅ"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"ដើម្បី​ប្រាកដថា ការហៅទូរសព្ទ​ដែលមាន​ការអនុញ្ញាត​អាចរោទ៍សំឡេងបាន សូមពិនិត្យមើល​ថាឧបករណ៍​ត្រូវបានកំណត់ឱ្យរោទ៍"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"បាន​ទប់ស្កាត់​ការហៅចូល​សម្រាប់ ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ ។ អ្នកអាចកែតម្រូវការកំណត់ ដើម្បីអនុញ្ញាតឱ្យមិត្តភ័ក្តិ គ្រួសារ ឬទំនាក់ទំនងផ្សេងទៀតរបស់អ្នកអាចទាក់ទងអ្នកបាន។"</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"ទំនាក់​ទំនង​​​​​មាន​ផ្កាយ"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> នាក់ទៀត</item>
-      <item quantity="one">1 នាក់ទៀត</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"គ្មាន"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{គ្មាន}=1{{contact_1}}=2{{contact_1} និង {contact_2}}=3{{contact_1}, {contact_2} និង {contact_3}}other{{contact_1}, {contact_2} និង # នាក់ទៀត}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"សារ"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"សារ​"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"សារ"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"បានទប់ស្កាត់​សារចូល​សម្រាប់ ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’។ អ្នកអាចកែតម្រូវការកំណត់ ដើម្បីអនុញ្ញាតឱ្យមិត្តភ័ក្តិ គ្រួសារ ឬទំនាក់ទំនងផ្សេងទៀតរបស់អ្នកអាចទាក់ទងអ្នកបាន។"</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"សារទាំងអស់​អាចទាក់ទង​អ្នកបាន"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"ការហៅទាំងអស់​អាចទាក់ទង​អ្នកបាន"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"គ្មាន"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other">ទំនាក់ទំនង <xliff:g id="NUM_CONTACTS">%d</xliff:g></item>
-      <item quantity="one">ទំនាក់ទំនង 1</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{គ្មាន}=1{ទំនាក់ទំនង 1}other{ទំនាក់ទំនង #}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"គ្រប់គ្នា"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"ទំនាក់ទំនង"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"ទំនាក់ទំនង​មាន​ផ្កាយ"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"ការ​ជូន​ដំណឹង​ទាំងអស់"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"ការជូនដំណឹង​មួយចំនួន"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"មនុស្សដែល​បានជ្រើសរើសនៅតែ​អាចទាក់ទងអ្នក​បានដដែល ទោះបីជាអ្នក​មិនអនុញ្ញាតឱ្យ​កម្មវិធីបង្អាក់ក៏ដោយ"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> អាច​ផ្អាកបាន</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> អាច​ផ្អាកបាន</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> ទៀត"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{គ្មាន​កម្មវិធី​ដែលអាចផ្អាក​បានទេ}=1{{app_1} អាច​ផ្អាកបាន}=2{{app_1} និង {app_2} អាចផ្អាកបាន}=3{{app_1}, {app_2} និង {app_3} អាចផ្អាកបាន}other{{app_1}, {app_2} និង # ទៀតអាចផ្អាកបាន}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"កម្មវិធី"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"ការ​ជូន​ដំណឹង​ទាំងអស់"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"ការជូនដំណឹង​មួយចំនួន"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"ការជូនដំណឹង​ដែលអាចបង្អាក់"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"អនុញ្ញាត​ការជូនដំណឹង​ទាំងអស់"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> អាច​ផ្អាកបាន</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> អាច​ផ្អាកបាន</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"គ្មានអ្វីមួយ​អាចផ្អាក​បានទេ"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> ទៀត"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{គ្មានអ្វីមួយ​អាចផ្អាក​បានទេ}=1{{sound_category_1} អាច​ផ្អាកបាន}=2{{sound_category_1} និង {sound_category_2} អាចផ្អាកបាន}=3{{sound_category_1}, {sound_category_2} និង {sound_category_3} អាចផ្អាកបាន}other{{sound_category_1}, {sound_category_2} និង # ទៀតអាចផ្អាកបាន}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"គ្មានអ្វីមួយ​អាចផ្អាក​បានទេ"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"គ្មាន​នរណា​អាចផ្អាក​បានទេ"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"មនុស្ស​មួយចំនួន​អាចផ្អាក​បាន"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"នរណា​ក៏អាច​ផ្អាក​បានដែរ"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB ត្រូវបានគ្រប់គ្រងដោយ"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"​ឧបករណ៍ដែលបាន​ភ្ជាប់"</string>
     <string name="usb_control_device" msgid="527916783743021577">"ឧបករណ៍នេះ"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"កំពុង​ប្ដូរ..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"កំពុងប្ដូរ…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"មិន​អាច​ប្ដូរ​បានទេ"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"កំពុងសាកថ្ម​ឧបករណ៍​នេះ"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"សាកថ្ម​ឧបករណ៍​ដែលបាន​ភ្ជាប់"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"មើល​ព័ត៌មាន​លម្អិត"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"កម្មវិធីសន្សំសំចៃទិន្នន័យ"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"ទិន្នន័យ​ដែល​គ្មាន​ការដាក់​កំហិត"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"ទិន្នន័យផ្ទៃខាងក្រោយបានបិទ"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"ទិន្នន័យផ្ទៃខាងក្រោយបានបិទ"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"បើក"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"បិទ"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"ប្រើ​កម្មវិធី​សន្សំ​សំចៃ​ទិន្នន័យ"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"ពេលឧបករណ៍ជាប់សោ ទប់ស្កាត់ការវាយអក្សរឆ្លើយតប ឬអត្ថបទផ្សេងទៀតនៅក្នុងការជូនដំណឹង"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"កម្មវិធីពិនិត្យអក្ខរាវិរុទ្ធលំនាំដើម"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"ជ្រើសរើសកម្មវិធីពិនិត្យអក្ខរាវិរុទ្ធ"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"ប្រើកម្មវិធីពិនិត្យអក្ខរាវិរុទ្ធ"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"ប្រើ​មុខងារ​ពិនិត្យ​អក្ខរាវិរុទ្ធ"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"មិនបានជ្រើស"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(គ្មាន)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">"៖ "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"ដើម្បីបង្កើនទំហំផ្ទុក កម្មវិធីគ្រប់គ្រងទំហំផ្ទុកយករូបថត និងវីដេអូដែលបានបម្រុងទុកចេញពីឧបករណ៍របស់អ្នក។"</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"យករូបថត និងវីដេអូចេញ"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"កម្មវិធីគ្រប់គ្រងទំហំផ្ទុក"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"ប្រើ​កម្មវិធីគ្រប់គ្រង​ទំហំផ្ទុក"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"ប្រើ​កម្មវិធីគ្រប់គ្រង​ទំហំផ្ទុក"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"ស្វ័យប្រវត្តិ"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"ឯកសារណែនាំ"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"បង្កើនទំហំផ្ទុកឥឡូវនេះ"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"ចុចពីរដងដើម្បីពិនិត្យទូរសព្ទ"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"ប៉ះពីរដងដើម្បីពិនិត្យថេប្លេត"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"ប៉ះពីរដងដើម្បីពិនិត្យឧបករណ៍"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"អូសដើម្បីមើលការជូនដំណឹង"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"អូសចុះក្រោម​នៅលើគែមខាងក្រោមនៃអេក្រង់ ដើម្បីបង្ហាញ​ការជូនដំណឹងរបស់អ្នក"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"មុខងារប្រើដៃម្ខាង"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"ប្រើមុខងារប្រើដៃម្ខាង"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"ចាកចេញនៅពេលប្ដូរកម្មវិធី"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"អស់ម៉ោង"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 វិនាទី"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 វិនាទី"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 វិនាទី"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"លទ្ធភាពចុចដល់"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"ដើម្បី​ពិនិត្យមើល​ម៉ោង ការជូន​ដំណឹង និងព័ត៌មាន​ផ្សេងទៀត សូម​ចុចអេក្រង់​របស់អ្នក​ពីរដង។"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"លើកដើម្បីពិនិត្យទូរសព្ទ"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"លើកដើម្បីពិនិត្យថេប្លេត"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"ចុចដើម្បី​ពិនិត្យមើលថេប្លេត"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"ចុចដើម្បី​ពិនិត្យមើល​ឧបករណ៍"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"ដើម្បី​ពិនិត្យមើល​ម៉ោង ការជូន​ដំណឹង និងព័ត៌មាន​ផ្សេងទៀត សូម​ចុចអេក្រង់​របស់អ្នក។"</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"ប៊ូតុង​បំភ័យ"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"ចាប់ផ្ដើម​សកម្មភាព​ហៅទូរសព្ទទៅ​សេវាសង្គ្រោះបន្ទាន់ ដោយចុច​ប៊ូតុងថាមពលឱ្យរហ័ស 5 ដង។"</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"សំឡេងព្រមាន"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"ការជូនដំណឹង មុនពេល​ចាប់ផ្ដើមសកម្មភាព"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"ទំនាក់ទំនងពេលមានអាសន្ន"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"អូសលើ​ឧបករណ៍ចាប់ស្នាមម្រាមដៃ​សម្រាប់​ការជូនដំណឹង"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"អូសស្នាមម្រាមដៃ"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"ដើម្បីពិនិត្យមើលការជូនដំណឹងរបស់អ្នក សូមអូសចុះក្រោមនៅលើឧបករណ៍ចាប់ស្នាមម្រាមដៃ ដែលស្ថិតនៅផ្នែកខាងក្រោយទូរសព្ទរបស់អ្នក។"</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"បើកសម្រាប់​កម្មវិធីទាំងអស់"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"ជ្រើសរើសដ្រាយវើ​ក្រាហ្វិក"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"លំនាំដើម"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"ដ្រាយវើ​ហ្គេម"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"ដ្រាយវើ​ហ្គេម"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"ដ្រាយវើរបស់​អ្នកអភិវឌ្ឍន៍"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"ដ្រាយវើ​ក្រាហ្វិកប្រព័ន្ធ"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"រក​បណ្ដាញ​មិនឃើញទេ។ សូមព្យាយាម​ម្ដង​ទៀត។"</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(ហាម)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"គ្មាន​ស៊ីម​កាត​ទេ"</string>
+    <string name="sim_card" msgid="6381158752066377709">"ស៊ីម"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"មិនមានស៊ីមទេ"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"គ្មាន"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"តម្រូវឱ្យមាន​ស៊ីម ដើម្បីភ្ជាប់"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"តម្រូវឱ្យមានស៊ីម <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> ដើម្បីភ្ជាប់"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"មុខងារ​​​បណ្ដាញដែលប្រើជាអាទិភាព​៖ ប្រើ WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"មុខងារ​​​បណ្ដាញដែលប្រើជាអាទិភាព​៖ GSM ប៉ុណ្ណោះ"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"មុខងារ​​​បណ្ដាញដែលប្រើជាអាទិភាព​៖ WCDMA ប៉ុណ្ណោះ"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"ទិន្នន័យ​ទូរសព្ទចល័ត"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"ចូល​ប្រើ​ទិន្នន័យ​ដោយ​ប្រើ​បណ្ដាញ​​ទូរសព្ទ​ចល័ត"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"ទូរសព្ទនឹង​ប្ដូរ​ទៅប្រើប្រាស់ក្រុមហ៊ុន​សេវាទូរសព្ទនេះ​ដោយស្វ័យប្រវត្តិ នៅពេល​មានសេវា"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"គ្មាន​ស៊ីមកាត​ទេ"</string>
     <string name="calls_preference" msgid="2166481296066890129">"ចំណូលចិត្ត​នៃ​ការហៅ​ទូរសព្ទ"</string>
     <string name="sms_preference" msgid="7742964962568219351">"ចំណូល​ចិត្តសារ SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"សួរគ្រប់ពេល"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"អនុញ្ញាត​ការត្រួតគ្នាលើ​អេក្រង់នៅលើ​ការកំណត់"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"អនុញ្ញាតឱ្យ​កម្មវិធីដែលអាច​បង្ហាញនៅលើកម្មវិធី​ផ្សេងទៀត​ដាក់អេក្រង់ការកំណត់​ត្រួតគ្នា"</string>
     <string name="media_controls_title" msgid="403271085636252597">"មេឌៀ"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"លាក់​កម្មវិធីចាក់ នៅពេលវគ្គ​មេឌៀបានបញ្ចប់"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"កម្មវិធីចាក់​អនុញ្ញាតឱ្យអ្នក​បន្តវគ្គពីផ្ទាំង​ការកំណត់រហ័ស​ដែលបានពង្រីក។"</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"កម្មវិធីចាក់មេឌៀនៅក្នុងការកំណត់រហ័ស"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"បង្ហាញកម្មវិធីចាក់មេឌៀរយៈពេលយូរ ដើម្បីងាយស្រួលបន្តការចាក់"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"លាក់​កម្មវិធីចាក់"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"បង្ហាញ​កម្មវិធីចាក់"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"មិនមាន​កម្មវិធីចាក់ទេ"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"កម្មវិធី​ដែល​បាន​អនុញ្ញាត"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"មេឌៀ"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"ប៊្លូធូសនឹងបើក"</string>
 </resources>
diff --git a/res/values-kn/arrays.xml b/res/values-kn/arrays.xml
index e858ca6..d6a5696 100644
--- a/res/values-kn/arrays.xml
+++ b/res/values-kn/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"ಮಧ್ಯಮ"</item>
     <item msgid="6740026006576843477">"ದೊಡ್ಡದು"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"ಚಿಕ್ಕದು"</item>
+    <item msgid="7397961711906421599">"ಮಧ್ಯಮ"</item>
+    <item msgid="4079132024502041928">"ದೀರ್ಘ"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"ಡಿಫಾಲ್ಟ್"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"ಜಾಗತಿಕ"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA ಮಾತ್ರ"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"ಜಾಗತಿಕ"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 40a5461..7309134 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"ಲಾಕ್‌ ಪರದೆಯಲ್ಲಿ ಪ್ರೊಫೈಲ್‌ ಮಾಹಿತಿಯನ್ನು ತೋರಿಸು"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"ಖಾತೆಗಳು"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"ಸ್ಥಳ"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"ಸ್ಥಳ ಬಳಸಿ"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"ಸ್ಥಳ ಬಳಸಿ"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"ಆಫ್ ಮಾಡಿ"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">ಆನ್ ಆಗಿದೆ - <xliff:g id="COUNT_1">%1$d</xliff:g> ಆ್ಯಪ್‌ಗಳು ಸ್ಥಳಕ್ಕೆ ಪ್ರವೇಶವನ್ನು ಹೊಂದಿದೆ</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"ದೃಢೀಕರಣಕ್ಕಾಗಿ ನಿಮ್ಮ ಮುಖವನ್ನು ಬಳಸಿ"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"ಪ್ರಾರಂಭಿಸಿ"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"ಫೇಸ್ ಅನ್‌ಲಾಕ್ ಪ್ರವೇಶಿಸುವಿಕೆಯನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿದ್ದರೆ, ಕೆಲವು ಸೆಟಪ್ ಹಂತಗಳು TalkBack ಜೊತೆಗೆ ಕಾರ್ಯನಿರ್ವಹಿಸದೆ ಇರಬಹುದು."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"ಹಿಂದಿರುಗಿ"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"ಸೆಟಪ್ ಮುಂದುವರಿಸಿ"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"ಪ್ರವೇಶಿಸುವಿಕೆ ಸೆಟಪ್‌ ಬಳಸಿ"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="other"> <xliff:g id="NUMBER_1">%d</xliff:g> ಗಿಂತ ಕಡಿಮೆ ಅಂಕಿಗಳನ್ನು ಹೊಂದಿರಬೇಕು</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"ಇತ್ತೀಚಿನ ಪಿನ್ ಬಳಸಲು ಸಾಧನದ ನಿರ್ವಾಹಕರು ಅನುಮತಿಸುವುದಿಲ್ಲ"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"ಸರಳವಾದ ಪಿನ್‌ಗಳನ್ನು ನಿಮ್ಮ IT ನಿರ್ವಾಹಕರಿಂದ ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ. ಬೇರೆಯ ಪಿನ್ ಪ್ರಯತ್ನಿಸಿ."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"ಇದು ಅಮಾನ್ಯ ಅಕ್ಷರವನ್ನು ಒಳಗೊಂಡಿರಬಾರದು"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"ಕನಿಷ್ಠ ಒಂದು ಅಕ್ಷರವನ್ನು ಹೊಂದಿರಬೇಕು"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"ಕನಿಷ್ಠ ಒಂದು ಅಂಕಿಯನ್ನು ಹೊಂದಿರಬೇಕು"</string>
@@ -653,7 +655,6 @@
       <item quantity="other">ಕನಿಷ್ಠ <xliff:g id="COUNT">%d</xliff:g> ಸಂಖ್ಯೆಯಲ್ಲದ ಅಕ್ಷರಗಳನ್ನು ಹೊಂದಿರಬೇಕು</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"ಇತ್ತೀಚಿನ ಪಾಸ್‌ವರ್ಡ್ ಬಳಸಲು ಸಾಧನದ ನಿರ್ವಾಹಕರು ಅನುಮತಿಸುವುದಿಲ್ಲ"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"ಸರಳವಾದ ಪಾಸ್‌ವರ್ಡ್‌ಗಳನ್ನು ನಿಮ್ಮ IT ನಿರ್ವಾಹಕರಿಂದ ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ. ಬೇರೆಯ ಪಾಸ್‌ವರ್ಡ್‌ ಪ್ರಯತ್ನಿಸಿ."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"ಅಂಕಿಗಳ ಆರೋಹಣ, ಅವರೋಹಣ ಅಥವಾ ಪುನರಾವರ್ತಿತ ಅನುಕ್ರಮವನ್ನು ನಿಷೇಧಿಸಲಾಗಿದೆ"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"ದೃಢೀಕರಿಸಿ"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"ರದ್ದುಮಾಡಿ"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Wi‑Fi ಆನ್‌ ಮಾಡಿ"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"ವೈ-ಫೈ ಬಳಸಿ"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"ವೈ-ಫೈ ಬಳಸಿ"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wi‑Fi ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"ವಯರ್‌ಲೆಸ್‌ ಪ್ರವೇಶಿಸುವಿಕೆ ಅಂಶಗಳನ್ನು ಹೊಂದಿಸಿ &amp; ನಿರ್ವಹಿಸಿ"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"“<xliff:g id="SSID">%1$s</xliff:g>” ಗೆ ಸಂಪರ್ಕಿಸಲು QR ಕೋಡ್ ಅನ್ನು ಕೆಳಗೆ ಕೇಂದ್ರೀಕರಿಸಿ"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"QR ಕೋಡ್ ಸ್ಕ್ಯಾನ್ ಮಾಡುವ ಮೂಲಕ ವೈ-ಫೈ ಗೆ ಸೇರಿ"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"ವೈ-ಫೈ ಹಂಚಿಕೊಳ್ಳಿ"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"“<xliff:g id="SSID">%1$s</xliff:g>” ಗೆ ಕನೆಕ್ಟ್ ಮಾಡಲು ಮತ್ತು ಪಾಸ್‌ವರ್ಡ್ ಹಂಚಿಕೊಳ್ಳಲು ಈ QR ಕೋಡ್ ಅನ್ನು ಸ್ಕ್ಯಾನ್ ಮಾಡಿ"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"“<xliff:g id="SSID">%1$s</xliff:g>” ಅನ್ನು ಸೇರಿಕೊಳ್ಳಲು ಬೇರೊಂದು ಸಾಧನವನ್ನು ಬಳಸಿ ಈ QR ಕೋಡ್ ಅನ್ನು ಸ್ಕ್ಯಾನ್ ಮಾಡಿ"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"“<xliff:g id="SSID">%1$s</xliff:g>” ಗೆ ಸಂಪರ್ಕಪಡಿಸಲು ಈ QR ಕೋಡ್ ಅನ್ನು ಸ್ಕ್ಯಾನ್ ಮಾಡಿ"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"ಪುನಃ ಪ್ರಯತ್ನಿಸಿ. ಸಮಸ್ಯೆ ಮುಂದುವರಿದರೆ, ಸಾಧನ ತಯಾರಕರನ್ನು ಸಂಪರ್ಕಿಸಿ"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"ಏನೋ ದೋಷ ಸಂಭವಿಸಿದೆ"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"ವೈ-ಫೈ ಪಾಸ್‌ವರ್ಡ್: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"ಹಾಟ್‌ಸ್ಪಾಟ್ ಪಾಸ್‌ವರ್ಡ್: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"ಸ್ವಯಂ-ಕನೆಕ್ಟ್"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"ನೀವು ಆ ನೆಟ್‌ವರ್ಕ್ ಬಳಿ ಇರುವಾಗ ನಿಮ್ಮ ಫೋನ್ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಕನೆಕ್ಟ್ ಆಗಲು ಅನುಮತಿಸಿ"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"ನೀವು ಆ ನೆಟ್‌ವರ್ಕ್ ಬಳಿ ಇರುವಾಗ ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌‌ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಕನೆಕ್ಟ್ ಆಗಲು ಅನುಮತಿಸಿ"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"ವ್ಯಾಪ್ತಿಯಲ್ಲಿರುವಾಗ ಈ ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಸಂಪರ್ಕವನ್ನು ಅನುಮತಿಸಿ"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"ಸಾಧನವನ್ನು ಸೇರಿಸಿ"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"ಈ ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಸಾಧನವನ್ನು ಸೇರಿಸಲು QR ಕೋಡ್ ಅನ್ನು ಬಳಸಿ"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR ಕೋಡ್ ಮಾನ್ಯ ಫಾರ್ಮ್ಯಾಟ್‌ನಲ್ಲಿ ಇಲ್ಲ"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"ಸಿಸ್ಟಂ ಪ್ರಮಾಣಪತ್ರಗಳನ್ನು ಬಳಸಿ"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"ಒದಗಿಸಬೇಡಿ"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"ಮೌಲ್ಯೀಕರಿಸಬೇಡಿ"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"ಯಾವುದೇ ಪ್ರಮಾಣಪತ್ರ ನಿರ್ದಿಷ್ಟಪಡಿಸಲಾಗಿಲ್ಲ. ನಿಮ್ಮ ಸಂಪರ್ಕವು ಖಾಸಗಿಯಾಗಿರುವುದಿಲ್ಲ."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"ನೆಟ್‌ವರ್ಕ್‌ ಹೆಸರು ತುಂಬಾ ಉದ್ದವಾಗಿದೆ."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"ಡೊಮೇನ್ ನಿರ್ದಿಷ್ಟ ಪಡಿಸಬೇಕು."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"ಪ್ರಮಾಣಪತ್ರ ಅಗತ್ಯವಿದೆ."</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"ಸಂಪರ್ಕಪಡಿಸು"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"ವೈ-ಫೈ ಆನ್ ಮಾಡಲಾಗಿದೆ"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ಗೆ ಕನೆಕ್ಟ್ ಮಾಡಲಾಗಿದೆ"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ಗೆ ಕನೆಕ್ಟ್ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"ಸಂಪರ್ಕಿಸಲಾಗುತ್ತಿದೆ…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"ನೆಟ್‌ವರ್ಕ್‌ ಸಂಪರ್ಕಿಸಲು ವಿಫಲವಾಗಿದೆ"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"ನೆಟ್‌ವರ್ಕ್ ವ್ಯಾಪ್ತಿಯಲ್ಲಿಲ್ಲ"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"ಅಪ್ಲಿಕೇಶನ್‌ ವಿಷಯವನ್ನು ಹಂಚಿಕೊಳ್ಳುತ್ತಿದೆ. ಇಂಟರ್ನೆಟ್‌ ಸಂಪರ್ಕವನ್ನು ಹಂಚಿಕೊಳ್ಳಲು, ಹಾಟ್‌ಸ್ಪಾಟ್‌ ಆಫ್‌ ಮಾಡಿ ನಂತರ ಆನ್‌ ಮಾಡಿ"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"ಯಾವುದೇ ಪಾಸ್‌ವರ್ಡ್ ಅನ್ನು ಹೊಂದಿಸಿಲ್ಲ"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"ಹಾಟ್‌ಸ್ಪಾಟ್ ಹೆಸರು"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ಅನ್ನು ಆನ್ ಮಾಡಲಾಗುತ್ತಿದೆ..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ಆನ್ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"ಇತರೆ ಸಾಧನಗಳು <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ಗೆ ಸಂಪರ್ಕವನ್ನು ಪಡೆದುಕೊಳ್ಳಬಹುದು"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"ಹಾಟ್‌ಸ್ಪಾಟ್ ಪಾಸ್‌ವರ್ಡ್"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP ಬ್ಯಾಂಡ್"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"ನಯವಾದ ಡಿಸ್‌ಪ್ಲೇ"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"ಕೆಲವು ವಿಷಯಗಳಿಗೆ ರಿಫ್ರೆಶ್ ರೇಟ್ ಅನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ 60 ರಿಂದ 90 ಕ್ಕೆ ಏರಿಸುತ್ತದೆ. ಬ್ಯಾಟರಿ ಬಳಕೆಯನ್ನು ಹೆಚ್ಚಿಸುತ್ತದೆ."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"ಸ್ಮೂತ್ ಡಿಸ್‌ಪ್ಲೇ"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"90 Hz ರಿಫ್ರೆಶ್ ರೇಟ್ ಅನ್ನು ಅನ್ವಯಿಸಿ"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"ಸುಧಾರಿತ ಸ್ಪರ್ಶ ಪ್ರತಿಕ್ರಿಯೆ ಮತ್ತು ಆ್ಯನಿಮೇಶನ್ ಗುಣಮಟ್ಟಗಳಿಗಾಗಿ ಅತ್ಯಧಿಕ ರಿಫ್ರೆಶ್ ರೇಟ್. ಬ್ಯಾಟರಿ ಬಳಕೆಯನ್ನು ಹೆಚ್ಚಿಸುತ್ತದೆ."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"ಸ್ಕ್ರೀನ್ ಆನ್ ಆಗಿರುವಿಕೆ"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"ನೀವು ಸ್ಕ್ರೀನ್‌ನ ಕಡೆಗೆ ವೀಕ್ಷಿಸುತ್ತಿರುವಾಗ, ಆನ್‌ / ಸ್ಕ್ರೀನ್ ಆಫ್ ಆಗುವುದಿಲ್ಲ"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android ಆವೃತ್ತಿ"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android ಭದ್ರತೆ ಅಪ್‌ಡೇಟ್"</string>
     <string name="model_info" msgid="8997566254717810904">"ಮಾಡೆಲ್"</string>
-    <string name="model_summary" msgid="2246651782442466213">"ಮಾದರಿ: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"ಮಾಡೆಲ್ ಮತ್ತು ಹಾರ್ಡ್‌ವೇರ್"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"ಹಾರ್ಡ್‌ವೇರ್ ಆವೃತ್ತಿ"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ಸಲಕರಣೆ ID"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"ನೆಟ್‌ವರ್ಕ್‌ ಸೆಟ್ಟಿಂಗ್‌ ಮರುಹೊಂದಿಸಲಾಗಿದೆ"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"SIM ಗಳನ್ನು ಅಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"ದೋಷದ ಕಾರಣದಿಂದಾಗಿ ಡೌನ್‌ಲೋಡ್ ಮಾಡಿದ SIM ಗಳನ್ನು ಅಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ.\n\nನಿಮ್ಮ ಸಾಧನವನ್ನು ಮರುಪ್ರಾರಂಭಿಸಿ ಮತ್ತು ಪುನಃ ಪ್ರಯತ್ನಿಸಿ."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"ಎಲ್ಲಾ ಡೇಟಾ ಅಳಿಸಿ (ಫ್ಯಾಕ್ಟರಿ ಮರುಹೊಂದಿಸಿ)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"ಎಲ್ಲಾ ಡೇಟಾ ಅಳಿಸಿ (ಫ್ಯಾಕ್ಟರಿ ಮರುಹೊಂದಿಸಿ)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"ಇದು ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌ನ "<b>"ಆಂತರಿಕ ಸಂಗ್ರಹಣೆಯ"</b>" ಎಲ್ಲ ಡೇಟಾವನ್ನು ಅಳಿಸುತ್ತದೆ, ಅವುಗಳೆಂದರೆ:\n\n"<li>"ನಿಮ್ಮ Google ಖಾತೆ"</li>\n<li>"ಸಿಸ್ಟಂ ಮತ್ತು ಆ್ಯಪ್‌ ಡೇಟಾ ಹಾಗೂ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</li>\n<li>"ಡೌನ್‌ಲೋಡ್ ಮಾಡಿರುವ ಆ್ಯಪ್‌ಗಳು"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"ಇದು ನಿಮ್ಮ ಫೋನ್‌ನ "<b>"ಆಂತರಿಕ ಸಂಗ್ರಹಣೆಯಲ್ಲಿರುವ"</b>", ಇವುಗಳನ್ನು ಒಳಗೊಂಡಂತೆ ಎಲ್ಲಾ ಡೇಟಾವನ್ನು ಅಳಿಸುತ್ತದೆ:\n\n"<li>"ನಿಮ್ಮ Google ಖಾತೆ"</li>\n<li>"ಸಿಸ್ಟಂ ಮತ್ತು ಆ್ಯಪ್‌ ಡೇಟಾ ಹಾಗೂ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</li>\n<li>"ಡೌನ್‌ಲೋಡ್ ಮಾಡಿರುವ ಆ್ಯಪ್‌ಗಳು"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"ನೀವು ಪ್ರಸ್ತುತ ಕೆಳಗಿನ ಖಾತೆಗಳಿಗೆ ಸೈನ್ ಇನ್ ಆಗಿರುವಿರಿ:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"ಈ ಸಾಧನದಲ್ಲಿ ಪ್ರಸ್ತುತ ಇತರ ಬಳಕೆದಾರರಿದ್ದಾರೆ.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"ಸಂಗೀತ"</li>\n<li>"ಫೋಟೋಗಳು"</li>\n<li>"ಇತರ ಬಳಕೆದಾರರ ಡೇಟಾ"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM ಗಳು"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"ಇದು ನಿಮ್ಮ ಮೊಬೈಲ್ ಸೇವಾ ಯೋಜನೆಯನ್ನು ರದ್ದುಗೊಳಿಸುವುದಿಲ್ಲ."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"ಸಂಗೀತ, ಚಿತ್ರಗಳು, ಮತ್ತು ಇತರ ಬಳಕೆದಾರರ ಡೇಟಾವನ್ನು ತೆರವುಗೊಳಿಸಲು, "<b>"USB ಸಂಗ್ರಹಣೆಯನ್ನು"</b>" ಅಳಿಸಬೇಕಾಗುತ್ತದೆ."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"ಸಂಗೀತ, ಚಿತ್ರಗಳು, ಮತ್ತು ಬಳಕೆದಾರರ ಇತರೆ ಡೇಟಾವನ್ನು ತೆರವುಗೊಳಿಸಲು, "<b>"SD ಕಾರ್ಡ್‌ ಅನ್ನು"</b>" ಅಳಿಸಬೇಕಾಗುತ್ತದೆ."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"ಎಲ್ಲಾ ಡೇಟಾ ಅಳಿಸಿ (ಫ್ಯಾಕ್ಟರಿ ರಿಸೆಟ್)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"ಡೇಟಾ ಅಳಿಸಿ (ಫ್ಯಾಕ್ಟರಿ ರಿಸೆಟ್)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"ಇದು ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌ನ "<b>"ಆಂತರಿಕ ಸಂಗ್ರಹಣೆಯಲ್ಲಿರುವ"</b>" ಎಲ್ಲ ಡೇಟಾವನ್ನು ಅಳಿಸುತ್ತದೆ, ಇವುಗಳನ್ನು ಒಳಗೊಂಡಂತೆ:\n\n"<li>"ನಿಮ್ಮ Google ಖಾತೆ"</li>\n<li>"ಸಿಸ್ಟಂ ಮತ್ತು ಆ್ಯಪ್‌ ಡೇಟಾ ಹಾಗೂ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</li>\n<li>"ಡೌನ್‌ಲೋಡ್ ಮಾಡಿರುವ ಆ್ಯಪ್‌ಗಳು"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"ಇದು ನಿಮ್ಮ ಫೋನ್‌ನ "<b>"ಆಂತರಿಕ ಸಂಗ್ರಹಣೆಯಲ್ಲಿರುವ"</b>" ಎಲ್ಲಾ ಡೇಟಾವನ್ನು ಅಳಿಸುತ್ತದೆ, ಇವುಗಳನ್ನು ಒಳಗೊಂಡಂತೆ :\n\n"<li>"ನಿಮ್ಮ Google ಖಾತೆ"</li>\n<li>"ಸಿಸ್ಟಂ ಮತ್ತು ಆ್ಯಪ್‌ ಡೇಟಾ ಹಾಗೂ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</li>\n<li>"ಡೌನ್‌ಲೋಡ್ ಮಾಡಿರುವ ಆ್ಯಪ್‌ಗಳು"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"ಪ್ರಸ್ತುತ, ನೀವು ಈ ಕೆಳಗಿನ ಖಾತೆಗಳಿಗೆ ಸೈನ್ ಇನ್ ಆಗಿರುವಿರಿ:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"ಪ್ರಸ್ತುತ, ಈ ಸಾಧನದಲ್ಲಿ ಇತರ ಬಳಕೆದಾರರಿದ್ದಾರೆ.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"ಸಂಗೀತ"</li>\n<li>"ಫೋಟೋಗಳು"</li>\n<li>"ಬಳಕೆದಾರರ ಇತರ ಡೇಟಾ"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"ಇ-ಸಿಮ್‌ಗಳು"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"ಇದು ನಿಮ್ಮ ಮೊಬೈಲ್ ಸೇವಾ ಯೋಜನೆಯನ್ನು ರದ್ದುಗೊಳಿಸುವುದಿಲ್ಲ."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"ಸಂಗೀತ, ಚಿತ್ರಗಳು, ಮತ್ತು ಬಳಕೆದಾರರ ಇತರ ಡೇಟಾವನ್ನು ತೆರವುಗೊಳಿಸಲು, "<b>"USB ಸಂಗ್ರಹಣೆಯನ್ನು"</b>" ಅಳಿಸಬೇಕಾಗುತ್ತದೆ."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"ಸಂಗೀತ, ಚಿತ್ರಗಳು, ಮತ್ತು ಬಳಕೆದಾರರ ಇತರ ಡೇಟಾವನ್ನು ತೆರವುಗೊಳಿಸಲು, "<b>"SD ಕಾರ್ಡ್"</b>"‌ ಅನ್ನು ಅಳಿಸಬೇಕಾಗುತ್ತದೆ."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USB ಸಂಗ್ರಹಣೆಯನ್ನು ಅಳಿಸಿ"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SD ಕಾರ್ಡ್‌ ಅಳಿಸಿ"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"ಆಂತರಿಕ USB ಸಂಗ್ರಹಣೆಯಲ್ಲಿರುವ ಸಂಗೀತ ಅಥವಾ ಫೋಟೋಗಳಂಥ ಎಲ್ಲ ಡೇಟಾವನ್ನು ಅಳಿಸಿ"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"ಸಂಗೀತ ಫೋಟೋಗಳನ್ನು ಒಳಗೊಂಡಂತೆ SD ಕಾರ್ಡ್‌ನಲ್ಲಿರುವ ಎಲ್ಲ ಡೇಟಾವನ್ನು ಅಳಿಸಿ"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"ಎಲ್ಲಾ ಡೇಟಾವನ್ನು ಅಳಿಸಿ"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"ಎಲ್ಲಾ ಡೇಟಾವನ್ನು ಅಳಿಸಿ"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"ನಿಮ್ಮ ಎಲ್ಲಾ ವೈಯಕ್ತಿಕ ಮಾಹಿತಿ ಮತ್ತು ಡೌನ್‌ಲೋಡ್ ಮಾಡಿದ ಆ್ಯಪ್‌ಗಳನ್ನು ಅಳಿಸಲಾಗುತ್ತದೆ. ನೀವು ಈ ಕ್ರಿಯೆಯನ್ನು ರದ್ದುಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"ಡೌನ್‌ಲೋಡ್ ಮಾಡಿದ ಆ್ಯಪ್‌ಗಳು ಮತ್ತು SIM ಗಳು ಸೇರಿದಂತೆ, ನಿಮ್ಮ ಎಲ್ಲಾ ವೈಯಕ್ತಿಕ ಮಾಹಿತಿಯನ್ನು ಅಳಿಸಲಾಗುತ್ತದೆ. ನೀವು ಈ ಕ್ರಿಯೆಯನ್ನು ರದ್ದುಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"ಎಲ್ಲವನ್ನೂ ಅಳಿಸಿ"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"ಸಿಸ್ಟಂ ತೆರವುಗೊಳಿಸುವ ಸೇವೆಯು ಲಭ್ಯವಿಲ್ಲದಿರುವ ಕಾರಣ ಮರುಹೊಂದಿಸುವಿಕೆಯನ್ನು ನಿರ್ವಹಿಸಲಾಗಲಿಲ್ಲ."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"ಎಲ್ಲಾ ಡೇಟಾವನ್ನು ಅಳಿಸುವುದೇ?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"ಈ ಬಳಕೆದಾರರಿಗೆ ಫ್ಯಾಕ್ಟರಿ ಮರುಹೊಂದಿಕೆ ಲಭ್ಯವಿಲ್ಲ"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"ಅಳಿಸಲಾಗುತ್ತಿದೆ"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"ದಯವಿಟ್ಟು ನಿರೀಕ್ಷಿಸಿ..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"ಎಲ್ಲಾ ಡೇಟಾವನ್ನು ಅಳಿಸಿ"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"ಎಲ್ಲಾ ಡೇಟಾವನ್ನು ಅಳಿಸಿ"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"ನಿಮ್ಮ ಎಲ್ಲಾ ವೈಯಕ್ತಿಕ ಮಾಹಿತಿ ಮತ್ತು ಡೌನ್‌ಲೋಡ್ ಮಾಡಿದ ಆ್ಯಪ್‌ಗಳನ್ನು ಅಳಿಸಲಾಗುತ್ತದೆ. ನೀವು ಈ ಕ್ರಿಯೆಯನ್ನು ರದ್ದುಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"ಡೌನ್‌ಲೋಡ್ ಮಾಡಿದ ಆ್ಯಪ್‌ಗಳು ಮತ್ತು ಸಿಮ್‌ಗಳು ಸೇರಿದಂತೆ, ನಿಮ್ಮ ಎಲ್ಲಾ ವೈಯಕ್ತಿಕ ಮಾಹಿತಿಯನ್ನು ಅಳಿಸಲಾಗುತ್ತದೆ. ನೀವು ಈ ಕ್ರಿಯೆಯನ್ನು ರದ್ದುಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"ಎಲ್ಲಾ ಡೇಟಾವನ್ನು ಅಳಿಸಬೇಕೇ?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"ಈ ಬಳಕೆದಾರರಿಗೆ ಫ್ಯಾಕ್ಟರಿ ರಿಸೆಟ್ ಲಭ್ಯವಿಲ್ಲ"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"ಅಳಿಸಲಾಗುತ್ತಿದೆ"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"ಕೊಂಚ ನಿರೀಕ್ಷಿಸಿ…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"ಕರೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"ಧ್ವನಿಮೇಲ್, ಕರೆ ಫಾರ್ವರ್ಡ್ ಮಾಡುವಿಕೆ, ಕರೆ ನಿರೀಕ್ಷೆ, ಕರೆಮಾಡುವವರ ID ಅನ್ನು ಹೊಂದಿಸಿ"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB ಟೆಥರಿಂಗ್"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> ಗಿಂತ ಹೆಚ್ಚಿನ ಸಾಧನಗಳಿಗೆ ಟೆಥರ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ಅನ್ನು ಅನ್‌ಟೆಥರ್ ಮಾಡಲಾಗುತ್ತದೆ."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"ಇಥರ್ನೆಟ್ ಟೆಥರಿಂಗ್"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"USB ಇಥರ್ನೆಟ್‌ನ ಮೂಲಕ ಫೋನ್‌ನ ಇಂಟರ್ನೆಟ್ ಸಂಪರ್ಕವನ್ನು ಹಂಚಿಕೊಳ್ಳಿ"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"ಇಥರ್ನೆಟ್‌ನ ಮೂಲಕ ಫೋನ್‌ನ ಇಂಟರ್ನೆಟ್ ಕನೆಕ್ಷನ್ ಅನ್ನು ಹಂಚಿಕೊಳ್ಳಿ"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"ನಿಮ್ಮ ಮೊಬೈಲ್ ಡೇಟಾ ಸಂಪರ್ಕದ ಮೂಲಕ ಇತರ ಸಾಧನಗಳಿಗೆ ಇಂಟರ್ನೆಟ್ ಒದಗಿಸಲು ಹಾಟ್‌ಸ್ಪಾಟ್ ಮತ್ತು ಟೆಥರಿಂಗ್ ಬಳಸಿ. ಹತ್ತಿರದ ಸಾಧನಗಳೊಂದಿಗೆ ವಿಷಯವನ್ನು ಹಂಚಿಕೊಳ್ಳಲು ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಹಾಟ್‌ಸ್ಪಾಟ್ ಅನ್ನು ಸಹ ರಚಿಸಬಹುದು."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"ನಿಮ್ಮ ವೈ-ಫೈ ಅಥವಾ ಮೊಬೈಲ್ ಡೇಟಾ ಕನೆಕ್ಷನ್ ಮೂಲಕ ಇತರ ಸಾಧನಗಳಿಗೆ ಇಂಟರ್ನೆಟ್ ಸಂಪರ್ಕವನ್ನು ಒದಗಿಸಲು ಹಾಟ್‌ಸ್ಪಾಟ್ ಮತ್ತು ಟೆಥರಿಂಗ್ ಅನ್ನು ಬಳಸಿ. ಸಮೀಪದಲ್ಲಿರುವ ಸಾಧನಗಳ ಜೊತೆಗೆ ವಿಷಯಗಳನ್ನು ಹಂಚಿಕೊಳ್ಳಲು ಆ್ಯಪ್‌ಗಳು ಹಾಟ್‌ಸ್ಪಾಟ್ ಅನ್ನು ಸಹ ರಚಿಸಬಹುದು."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"ಸಹಾಯ"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"ಶೀರ್ಷಿಕೆ ಆದ್ಯತೆಗಳು"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"ಹಿಗ್ಗಿಸುವಿಕೆ"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"ಝೂಮ್ ಮಾಡಿದ ಪ್ರದೇಶ"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"ಮ್ಯಾಗ್ನಿಫಿಕೇಶನ್ ಸಕ್ರಿಯಗೊಳಿಸುವಿಕೆ"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"ಸ್ಕ್ರೀನ್‌ ಅನ್ನು ಝೂಮ್ ಮಾಡುವಾಗ, ನೀವು ಬಳಸಲು ಬಯಸುವ ಝೂಮ್ ಮಾಡಬೇಕಾದ ಪ್ರದೇಶ(ಗಳು) ಆಯ್ಕೆಮಾಡಿ"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"ಪೂರ್ಣ ಸ್ಕ್ರೀನ್"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"ಸ್ಕ್ರೀನ್‌ನ ಅರ್ಧಭಾಗ"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"ಪೂರ್ಣ ಸ್ಕ್ರೀನ್, ಸ್ಕ್ರೀನ್‌ನ ಅರ್ಧಭಾಗ"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"ಸ್ಕ್ರೀನ್‌ನ ಸಂಪೂರ್ಣ ಭಾಗವನ್ನು ಝೂಮ್ ಮಾಡಿ"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"ಸ್ಕ್ರೀನ್‌ನ ಅರ್ಧಭಾಗವನ್ನು ಝೂಮ್ ಮಾಡಿ"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"ಪ್ರವೇಶಿಸುವಿಕೆ ಬಟನ್‌ಗೆ ಬದಲಾಯಿಸುವುದೇ?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"ಸ್ಕ್ರೀನ್‌ನ‌ ಒಂದು ಭಾಗವನ್ನು ದೊಡ್ಡದಾಗಿಸಲು ಟ್ರಿಪಲ್ ಟ್ಯಾಪ್ ಅನ್ನು ಬಳಸುವುದರಿಂದ ಟೈಪಿಂಗ್ ಮತ್ತು ಇತರ ಆ್ಯಕ್ಷನ್‌ಗಳ ವಿಳಂಬಗಳಿಗೆ ಕಾರಣವಾಗಬಹುದು.\n\nದೊಡ್ಡದಾಗಲು ಪ್ರವೇಶಿಸುವಿಕೆ ಬಟನ್ ಅನ್ನು ಬಳಸಲು ನೀವು ಬದಲಾಯಿಸಲು ಬಯಸುವಿರಾ?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"ಪ್ರವೇಶಿಸುವಿಕೆ ಬಟನ್‌ಗೆ ಬದಲಾಯಿಸಿ"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"ದೊಡ್ಡದಾಗಿಸಲು ಟ್ರಿಪಲ್ ಟ್ಯಾಪ್ ಅನ್ನು ಬಳಸಿ"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"ಝೂಮ್ ಮಾಡಿದ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"ಟ್ರಿಪಲ್-ಟ್ಯಾಪ್ ಮೂಲಕ ಹಿಗ್ಗಿಸಿ"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"ಶಾರ್ಟ್‌ಕಟ್ ಮೂಲಕ ಹಿಗ್ಗಿಸಿ"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"ಪವರ್ ಬಟನ್ ಕರೆಯನ್ನು ಕೊನೆಗೊಳಿಸುತ್ತದೆ"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"ದೊಡ್ಡ ಮೌಸ್ ಪಾಯಿಂಟರ್"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"ಅನಿಮೇಷನ್‌ಗಳನ್ನು ತೆಗೆದುಹಾಕಿ"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"ಮೊನೊ ಆಡಿಯೊ"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"ಆಡಿಯೊ ಪ್ಲೇ ಮಾಡುತ್ತಿರುವಾಗ ಚಾನಲ್‌ಗಳನ್ನು ಒಂದುಗೂಡಿಸಿ"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"ಆಡಿಯೋ ಬ್ಯಾಲೆನ್ಸ್"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"ಎಡ"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"ಬಲ"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"ಮೊನೊ ಆಡಿಯೊ"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"ಆಡಿಯೊ ಪ್ಲೇ ಮಾಡುತ್ತಿರುವಾಗ ಚಾನಲ್‌ಗಳನ್ನು ಒಂದುಗೂಡಿಸಿ"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"ಆಡಿಯೊ ಬ್ಯಾಲೆನ್ಸ್"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"ಎಡ"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"ಬಲ"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"ಡೀಫಾಲ್ಟ್"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 ಸೆಕೆಂಡುಗಳು"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 ಸೆಕೆಂಡುಗಳು"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"ಅಧಿಸೂಚನೆಯ ವೈಬ್ರೇಷನ್"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"ರಿಂಗ್‌ನೊಂದಿಗೆ ವೈಬ್ರೇಷನ್"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"ಸ್ಪರ್ಶ ಪ್ರತಿಕ್ರಿಯೆ"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ಅನ್ನು ಬಳಸಿ"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ಅನ್ನು ತೆರೆಯಿರಿ"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"ಬಣ್ಣ ತಿದ್ದುಪಡಿಯನ್ನು ಬಳಸಿ"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"ಶೀರ್ಷಿಕೆಗಳನ್ನು ತೋರಿಸಿ"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"ಬೆಂಬಲಿತ ಆ್ಯಪ್‌ಗೆ ಮಾತ್ರ"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ಅನ್ನು ಬಳಸಿ"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ಅನ್ನು ತೆರೆಯಿರಿ"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"ಬಣ್ಣ ತಿದ್ದುಪಡಿಯನ್ನು ಬಳಸಿ"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"ಶೀರ್ಷಿಕೆಗಳನ್ನು ತೋರಿಸಿ"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"ಬೆಂಬಲಿತ ಆ್ಯಪ್‌ಗೆ ಮಾತ್ರ"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"ಶೀರ್ಷಿಕೆಯ ಗಾತ್ರ ಮತ್ತು ಶೈಲಿ"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> ಪಠ್ಯದ ಗಾತ್ರ"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"ಇನ್ನಷ್ಟು ಆಯ್ಕೆಗಳು"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"ಡ್ಯುಟೆರೊನೊಮಾಲಿ"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"ಪ್ರೊಟನೊಮಾಲಿ"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"ಟ್ರೈಟನೊಮಾಲಿ"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"ಗ್ರೇಸ್ಕೇಲ್"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"ಕೆಂಪು-ಹಸಿರು"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"ಕೆಂಪು-ಹಸಿರು"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"ನೀಲಿ-ಹಳದಿ"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"ಹಿನ್ನೆಲೆ ನಿರ್ಬಂಧ"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"ಹಿನ್ನೆಲೆಯಲ್ಲಿ ರನ್ ಆಗಲು ಅಪ್ಲಿಕೇಶನ್‌ಗೆ ಅನುಮತಿ ನೀಡಿ"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"ಹಿನ್ನೆಲೆಯಲ್ಲಿ ರನ್ ಆಗಲು ಅಪ್ಲಿಕೇಶನ್‌ಗೆ ಅನುಮತಿಯಿಲ್ಲ"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"ಹಿನ್ನೆಲೆ ಬಳಕೆಯನ್ನು ನಿರ್ಬಂಧಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"ಹಿನ್ನೆಲೆ ಬಳಕೆಯನ್ನು ನಿರ್ಬಂಧಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"ಹಿನ್ನೆಲೆ ಚಟುವಟಿಕೆಯನ್ನು ಸೀಮಿತಗೊಳಿಸುವುದೇ?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"ಒಂದು ಅಪ್ಲಿಕೇಶನ್‌ನ ಹಿನ್ನೆಲೆ ಚಟುವಟಿಕೆಯನ್ನು ನೀವು ಸೀಮಿತಗೊಳಿಸಿದರೆ, ಅದು ಸರಿಯಾಗಿ ಕಾರ್ಯನಿರ್ವಹಿಸದಿರಬಹುದು"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"ಬ್ಯಾಟರಿ ಅನ್ನು ಆಪ್ಟಿಮೈಜ್ ಮಾಡಲು ಈ ಅಪ್ಲಿಕೇಶನ್ ಹೊಂದಿಸದ ಕಾರಣ, ನೀವು ಇದನ್ನು ನಿರ್ಬಂಧಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ.\n\n ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ನಿರ್ಬಂಧಿಸಲು, ಮೊದಲು ಬ್ಯಾಟರಿ ಆಪ್ಟಿಮೈಸೇಷನ್ ಅನ್ನು ಆನ್ ಮಾಡಿ."</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"ವೇಳಾಪಟ್ಟಿಯನ್ನು ಸೆಟ್ ಮಾಡಿ"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"ಬ್ಯಾಟರಿ ಬಾಳಿಕೆ ವಿಸ್ತರಿಸಿ"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"ಚಾರ್ಜ್‌ ಆದ ನಂತರ ಆಫ್ ಮಾಡಿ"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"ನಿಮ್ಮ ಫೋನ್ ಬ್ಯಾಟರಿ <xliff:g id="PERCENT">%1$s</xliff:g> ಇದ್ದಾಗ, ಬ್ಯಾಟರಿ ಸೇವರ್ ಅನ್ನು ಆಫ್ ಮಾಡಲಾಗುತ್ತದೆ"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಬ್ಯಾಟರಿ <xliff:g id="PERCENT">%1$s</xliff:g> ಇದ್ದಾಗ, ಬ್ಯಾಟರಿ ಸೇವರ್ ಅನ್ನು ಆಫ್ ಮಾಡಲಾಗುತ್ತದೆ"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"ನಿಮ್ಮ ಸಾಧನದ ಬ್ಯಾಟರಿ <xliff:g id="PERCENT">%1$s</xliff:g> ಇದ್ದಾಗ, ಬ್ಯಾಟರಿ ಸೇವರ್ ಅನ್ನು ಆಫ್ ಮಾಡಲಾಗುತ್ತದೆ"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"ನಿಮ್ಮ ಫೋನ್ <xliff:g id="PERCENT">%1$s</xliff:g> ಗಿಂತ ಹೆಚ್ಚು ಚಾರ್ಜ್ ಆದಾಗ, ಬ್ಯಾಟರಿ ಸೇವರ್‌ ಆಫ್ ಆಗುತ್ತದೆ"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ <xliff:g id="PERCENT">%1$s</xliff:g> ಗಿಂತ ಹೆಚ್ಚು ಚಾರ್ಜ್ ಆದಾಗ, ಬ್ಯಾಟರಿ ಸೇವರ್‌ ಆಫ್ ಆಗುತ್ತದೆ"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"ನಿಮ್ಮ ಸಾಧನವು <xliff:g id="PERCENT">%1$s</xliff:g> ಗಿಂತ ಹೆಚ್ಚು ಚಾರ್ಜ್ ಆದಾಗ, ಬ್ಯಾಟರಿ ಸೇವರ್‌ ಆಫ್ ಆಗುತ್ತದೆ"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"ಆನ್"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"ಮರುಹೊಂದಿಸಿ"</string>
     <string name="tts_play" msgid="2945513377250757221">"ಪ್ಲೇ"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"ಅಡಾಪ್ಟಿವ್ ಕನೆಕ್ಷನ್"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"ನಿಮ್ಮ ನೆಟ್‌ವರ್ಕ್ ಕನೆಕ್ಷನ್‌ಗಳನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ನಿರ್ವಹಿಸುವ ಮೂಲಕ ಬ್ಯಾಟರಿ ಅವಧಿಯನ್ನು ವಿಸ್ತರಿಸುತ್ತದೆ ಮತ್ತು ಸಾಧನದ ಕಾರ್ಯಕ್ಷಮತೆಯನ್ನು ಸುಧಾರಿಸುತ್ತದೆ"</string>
     <string name="credentials_title" msgid="7535942196886123656">"ರುಜುವಾತು ಸಂಗ್ರಹಣೆ"</string>
     <string name="credentials_install" msgid="3933218407598415827">"ಪ್ರಮಾಣಪತ್ರ ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಿ"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"ಸಂಗ್ರಹಣೆಯಿಂದ ಪ್ರಮಾಣಪತ್ರಗಳನ್ನು ಸ್ಥಾಪಿಸಿ"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"ಬಳಕೆದಾರ ರುಜುವಾತುಗಳು"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"ಸಂಗ್ರಹಿಸಲಾದ ರುಜುವಾತುಗಳನ್ನು ವೀಕ್ಷಿಸಿ ಮತ್ತು ಮಾರ್ಪಡಿಸಿ"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"ಸುಧಾರಿತ"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"ಸಂಗ್ರಹಣೆಯ ಪ್ರಕಾರ"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"ಹಾರ್ಡ್‌ವೇರ್‌ ಬೆಂಬಲಿತ"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"ಸಾಫ್ಟ್‌ವೇರ್‌ ಮಾತ್ರ"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"ಈ ಬಳಕೆದಾರರಿಗೆ ರುಜುವಾತುಗಳು ಲಭ್ಯವಿಲ್ಲ"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗಾಗಿ ಸ್ಥಾಪಿಸಲಾಗಿದೆ"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"ವೈ-ಫೈಗೆ ಸ್ಥಾಪಿಸಲಾಗಿದೆ"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"ಟರ್ಮಿನಲ್‌ನಲ್ಲಿ ಪಾವತಿಸಲಾಗುತ್ತಿದೆ"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"ಪಾವತಿ ಆ್ಯಪ್ ಹೊಂದಿಸಿ. ನಂತರ ಸಂಪರ್ಕವಿಲ್ಲದ ಚಿಹ್ನೆಯೊಂದಿಗೆ ಯಾವುದೇ ಟರ್ಮಿನಲ್‌ಗೆ ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಹಿಡಿದುಕೊಳ್ಳಿ."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"ತಿಳಿಯಿತು"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"ಇನ್ನಷ್ಟು..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"ಇನ್ನಷ್ಟು…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"ಡೀಫಾಲ್ಟ್ ಪಾವತಿ ಆ್ಯಪ್ ಅನ್ನು ಹೊಂದಿಸಿ"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"ಡೀಫಾಲ್ಟ್ ಪಾವತಿ ಆ್ಯಪ್ ಅನ್ನು ಅಪ್‌ಡೇಟ್ ಮಾಡಿ"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"ಸಂಪರ್ಕರಹಿತ ಟರ್ಮಿನಲ್‌ನಲ್ಲಿ, <xliff:g id="APP">%1$s</xliff:g> ಆ್ಯಪ್ ಬಳಸಿ ಪಾವತಿಸಿ"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"ಕರೆಗಳನ್ನು ಮಾಡಲು ಯಾವಾಗಲೂ ಇದನ್ನು ಬಳಸಿ"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"ಡೇಟಾಗಾಗಿ ಸಿಮ್ ಆಯ್ಕೆಮಾಡಿ"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"ಎಸ್‌ಎಂಎಸ್‌ಗಾಗಿ ಸಿಮ್ ಅನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"ಡೇಟಾ ಸಿಮ್ ಬದಲಾಯಿಸಲಾಗುತ್ತಿದೆ, ಇದಕ್ಕೆ ಒಂದು ನಿಮಿಷದವರೆಗೆ ಸಮಯ ತೆಗೆದುಕೊಳ್ಳಬಹುದು..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"ಡೇಟಾ ಸಿಮ್ ಅನ್ನು ಬದಲಾಯಿಸಲಾಗುತ್ತಿದೆ, ಇದಕ್ಕೆ ಒಂದು ನಿಮಿಷದಷ್ಟು ಸಮಯಾವಕಾಶ ಬೇಕಾಗಬಹುದು…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"ಇದರೊಂದಿಗೆ ಕರೆ ಮಾಡಿ"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"ಸಿಮ್‌ ಕಾರ್ಡ್ ಆಯ್ಕೆಮಾಡಿ"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"ಸಿಮ್‌ <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"ದಿನಚರಿ, ವೇಳಾಪಟ್ಟಿ, ಬ್ಯಾಟರಿ ಸೇವರ್, ಪವರ್ ಸೇವರ್, ಬ್ಯಾಟರಿ, ಸ್ವಯಂಚಾಲಿತ, ಶೇಕಡಾ"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, ಸುಧಾರಿತ ಕರೆ, 4g ಕರೆ"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"ಭಾಷೆಯನ್ನು ಸೇರಿಸಿ, ಭಾಷೆಯೊಂದನ್ನು ಸೇರಿಸಿ"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"ಪಠ್ಯದ ಗಾತ್ರ"</string>
     <string name="default_sound" msgid="6604374495015245195">"ಡಿಫಾಲ್ಟ್‌‌ ಧ್ವನಿ"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"ರಿಂಗ್ ಮತ್ತು ಅಧಿಸೂಚನೆ ವಾಲ್ಯೂಮ್ <xliff:g id="PERCENTAGE">%1$s</xliff:g> ರಲ್ಲಿದೆ"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"ವಾಲ್ಯೂಮ್, ವೈಬ್ರೇಶನ್‌, ಅಡಚಣೆ ಮಾಡಬೇಡಿ"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"ಧ್ವನಿಗಳನ್ನು ಪವರ್ ಆನ್ ಮಾಡಿ"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"ಲೈವ್ ಶೀರ್ಷಿಕೆ"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"ಸ್ವಯಂಚಾಲಿತ ಶೀರ್ಷಿಕೆ ಮಾಧ್ಯಮ"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"ಏನೂ ಇಲ್ಲ"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> ವೇಳಾಪಟ್ಟಿಗಳ ಸೆಟ್</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ವೇಳಾಪಟ್ಟಿಗಳ ಸೆಟ್</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{ಯಾವುದೂ ಇಲ್ಲ}=1{1 ವೇಳಾಪಟ್ಟಿಯನ್ನು ಸೆಟ್ ಮಾಡಲಾಗಿದೆ}one{# ವೇಳಾಪಟ್ಟಿಗಳನ್ನು ಸೆಟ್ ಮಾಡಲಾಗಿದೆ}other{# ವೇಳಾಪಟ್ಟಿಗಳನ್ನು ಸೆಟ್ ಮಾಡಲಾಗಿದೆ}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"ಪ್ರಮುಖ ಜನರು ಮತ್ತು ಆ್ಯಪ್‌ಗಳಿಂದ ಮಾತ್ರ ಅಧಿಸೂಚನೆ ಪಡೆಯಿರಿ"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"ಅಡಚಣೆಗಳನ್ನು ಮಿತಿಗೊಳಿಸಿ"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"ಆದ್ಯತೆ ಮಾತ್ರ"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"ಆನ್ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"ಆಫ್ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"ಆಫ್"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"ಆನ್"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"ಪ್ರತಿ ಬಾರಿ ಕೇಳಿ"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"ನೀವು ಆಫ್ ಮಾಡುವವರೆಗೆ"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> ಗಂಟೆಗಳು</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> ಗಂಟೆಗಳು</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> ನಿಮಿಷಗಳು"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> ವೇಳಾಪಟ್ಟಿಗಳನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್ ಮಾಡಬಹುದು</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ವೇಳಾಪಟ್ಟಿಗಳನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್ ಮಾಡಬಹುದು</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 ಗಂಟೆ}one{# ಗಂಟೆಗಳು}other{# ಗಂಟೆಗಳು}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 ನಿಮಿಷ}one{# ನಿಮಿಷಗಳು}other{# ನಿಮಿಷಗಳು}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{ಆಫ್}=1{ಆಫ್ / 1 ವೇಳಾಪಟ್ಟಿಯನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್ ಮಾಡಬಹುದು}one{ಆಫ್ / # ವೇಳಾಪಟ್ಟಿಗಳನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್ ಮಾಡಬಹುದು}other{ಆಫ್ / # ವೇಳಾಪಟ್ಟಿಗಳನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್ ಮಾಡಬಹುದು}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಸೆಟ್ಟಿಂಗ್ ಅನ್ನು ಯಾವುದು ಅಡ್ಡಿಪಡಿಸಬಹುದು"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"ಜನರು"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"ಆ್ಯಪ್‌ಗಳು"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"ಕಡಿಮೆ ಆದ್ಯತೆಯ ಅಧಿಸೂಚನೆಗಳನ್ನು ಸಾಮಾನ್ಯ ಎಂಬುದಕ್ಕೆ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಹೊಂದಿಸಿ"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"ಅಡಾಪ್ಟೀವ್ ಅಧಿಸೂಚನೆ ದರ್ಜೆ ನೀಡುವಿಕೆ"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"ಪ್ರಸ್ತುತತೆಯಿಂದ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಅಧಿಸೂಚನೆಗಳಿಗೆ ದರ್ಜೆ ನೀಡಿ"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"ಅಡಾಪ್ಟಿವ್‌ ಅಧಿಸೂಚನೆಯ ಪ್ರತಿಕ್ರಿಯೆ"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"ಅಧಿಸೂಚನೆಗಳಿಗೆ ಮಾಡಿದ ಹೊಂದಾಣಿಕೆಗಳನ್ನು ಸೂಚಿಸಿ ಮತ್ತು ಸಿಸ್ಟಂಗೆ ಪ್ರತಿಕ್ರಿಯೆ ಒದಗಿಸುವ ಆಯ್ಕೆಯನ್ನು ತೋರಿಸಿ"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"ಸೂಚಿಸಲಾಗಿರುವ ಕ್ರಿಯೆಗಳು ಮತ್ತು ಪ್ರತ್ಯುತ್ತರಗಳು"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"ಸಲಹೆ ಮಾಡಿರುವ ಕ್ರಿಯೆಗಳು &amp; ಪ್ರತ್ಯುತ್ತರಗಳನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ತೋರಿಸಿ"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"ಇತ್ತೀಚಿನ ಮತ್ತು ಸ್ನೂಜ್ ಮಾಡಲಾದ ಅಧಿಸೂಚನೆಗಳನ್ನು ತೋರಿಸಿ"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಪ್ರವೇಶಿಸುವಿಕೆ"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"ಅಡಚಣೆ ಮಾಡಬೇಡ ಆಯ್ಕೆಯನ್ನು ಅನುಮತಿಸಿ"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"ಯಾವುದೇ ಸ್ಥಾಪಿಸಲಾದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಪ್ರವೇಶಿಸುವಿಕೆಯನ್ನು ವಿನಂತಿಸಿಲ್ಲ"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"ಆ್ಯಪ್‌ಗಳನ್ನು ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"ನಿಮ್ಮ ವಿನಂತಿಯ ಮೇರೆಗೆ, ಈ ಸಾಧನದಲ್ಲಿ ಆ್ಯಪ್‌ಗಳ ಅಧಿಸೂಚನೆಗಳು ಕಾಣಿಸದಂತೆ Android ನಿರ್ಬಂಧಿಸುತ್ತದೆ"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"ನಿಮ್ಮ ವಿನಂತಿಯ ಮೇರೆಗೆ, ಈ ಸಾಧನದಲ್ಲಿ ಈ ಪ್ರಕಾರದ ಅಧಿಸೂಚನೆಗಳು ಕಾಣಿಸದಂತೆ Android ನಿರ್ಬಂಧಿಸುತ್ತದೆ"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"ನಿಮ್ಮ ವಿನಂತಿಯ ಮೇರೆಗೆ, ಈ ಸಾಧನದಲ್ಲಿ ಗೋಚರವಾಗುವ ಈ ಅಧಿಸೂಚನೆಗಳ ಗುಂಪನ್ನು Android ನಿರ್ಬಂಧಿಸುತ್ತದೆ"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"ಎಲ್ಲಾ ಸಂಭಾಷಣೆಗಳು"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"ಆದ್ಯತೆಯ ಸಂಭಾಷಣೆಗಳು"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"ಯಾವುದೂ ಇಲ್ಲ"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> ಸಂಭಾಷಣೆಗಳು</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> ಸಂಭಾಷಣೆಗಳು</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"ಯಾವುದೂ ಇಲ್ಲ"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{ಯಾವುದೂ ಇಲ್ಲ}=1{1 ಸಂಭಾಷಣೆ}one{# ಸಂಭಾಷಣೆಗಳು}other{# ಸಂಭಾಷಣೆಗಳು}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"ಯಾರು ಅಡಚಣೆಯನ್ನು ಉಂಟುಮಾಡಬಹುದು"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"ಕರೆಗಳು"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"ಕರೆಗಳು"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"ಅನುಮತಿಸಿದ ಕರೆಗಳ ಧ್ವನಿ ಕೇಳಿಸುವುದನ್ನು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಲು, ಸಾಧನವನ್ನು \"ರಿಂಗ್\"ಗೆ ಹೊಂದಿಸಲಾಗಿದೆಯೇ ಎಂಬುದನ್ನು ಪರಿಶೀಲಿಸಿ"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ ಗಾಗಿ ಒಳಬರುವ ಕರೆಗಳನ್ನು ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ. ನಿಮ್ಮ ಸ್ನೇಹಿತರು, ಕುಟುಂಬ ಅಥವಾ ಇತರ ಸಂಪರ್ಕಗಳು ನಿಮ್ಮನ್ನು ತಲುಪಲು ಅನುಮತಿ ನೀಡುವಂತೆ ನೀವು ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಸರಿಹೊಂದಿಸಬಹುದು."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"ನಕ್ಷತ್ರ ಹಾಕಿರುವ ಸಂಪರ್ಕಗಳು"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one"><xliff:g id="NUM_PEOPLE">%d</xliff:g> ಇತರೆ</item>
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> ಇತರೆ</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"ಯಾವುದೂ ಇಲ್ಲ"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{ಯಾವುದೂ ಇಲ್ಲ}=1{{contact_1}}=2{{contact_1} ಮತ್ತು {contact_2}}=3{{contact_1}, {contact_2} ಮತ್ತು {contact_3}}one{{contact_1}, {contact_2} ಮತ್ತು # ಇತರರು}other{{contact_1}, {contact_2} ಮತ್ತು # ಇತರರು}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Messages"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"ಸಂದೇಶಗಳು"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Messages"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ ಗಾಗಿ ಒಳಬರುವ ಸಂದೇಶಗಳನ್ನು ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ. ನಿಮ್ಮ ಸ್ನೇಹಿತರು, ಕುಟುಂಬ ಅಥವಾ ಇತರ ಸಂಪರ್ಕಗಳು ನಿಮ್ಮನ್ನು ತಲುಪಲು ಅನುಮತಿ ನೀಡುವಂತೆ ನೀವು ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಸರಿಹೊಂದಿಸಬಹುದು."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"ಎಲ್ಲಾ ಸಂದೇಶಗಳು ನಿಮ್ಮನ್ನು ತಲುಪಬಹುದು"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"ಎಲ್ಲಾ ಕರೆಗಳು ನಿಮ್ಮನ್ನು ತಲುಪಬಹುದು"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"ಯಾವುದೂ ಇಲ್ಲ"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> ಸಂಪರ್ಕಗಳು</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> ಸಂಪರ್ಕಗಳು</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{ಯಾವುದೂ ಇಲ್ಲ}=1{1 ಸಂಪರ್ಕ}one{# ಸಂಪರ್ಕಗಳು}other{# ಸಂಪರ್ಕಗಳು}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"ಯಾರಾದರೂ"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"ಸಂಪರ್ಕಗಳು"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"ನಕ್ಷತ್ರ ಹಾಕಿ ಗುರುತು ಮಾಡಿದ ಸಂಪರ್ಕಗಳು"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"ಎಲ್ಲಾ ಅಧಿಸೂಚನೆಗಳು"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"ಕೆಲವು ಅಧಿಸೂಚನೆಗಳು"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"ನೀವು ಆ್ಯಪ್‌ಗಳಿಗೆ ಅಡಚಣೆ ಉಂಟುಮಾಡಲು ಅನುಮತಿಸದಿದ್ದರೂ, ಆಯ್ದ ವ್ಯಕ್ತಿಗಳು ಈಗಲೂ ನಿಮ್ಮನ್ನು ಸಂಪರ್ಕಿಸಬಹುದು"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one"><xliff:g id="APP_NAMES">%s</xliff:g> ಅಡಚಣೆ ಮಾಡಬಹುದು</item>
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> ಅಡಚಣೆ ಮಾಡಬಹುದು</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"ಇನ್ನೂ <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{ಯಾವುದೇ ಆ್ಯಪ್‌ಗಳು ಅಡಚಣೆ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ}=1{{app_1} ಆ್ಯಪ್ ಅಡಚಣೆ ಮಾಡಬಹುದು}=2{{app_1} ಮತ್ತು {app_2} ಆ್ಯಪ್‌ಗಳು ಅಡಚಣೆ ಮಾಡಬಹುದು}=3{{app_1}, {app_2} ಮತ್ತು {app_3} ಆ್ಯಪ್‌ಗಳು ಅಡಚಣೆ ಮಾಡಬಹುದು}one{{app_1}, {app_2} ಮತ್ತು # ಇನ್ನಷ್ಟು ಅಡಚಣೆ ಮಾಡಬಹುದು}other{{app_1}, {app_2} ಮತ್ತು # ಇನ್ನಷ್ಟು ಅಡಚಣೆ ಮಾಡಬಹುದು}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"ಆ್ಯಪ್‌ಗಳು"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"ಎಲ್ಲಾ ಅಧಿಸೂಚನೆಗಳು"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"ಕೆಲವು ಅಧಿಸೂಚನೆಗಳು"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"ಅಡಚಣೆ ಉಂಟುಮಾಡಬಹುದಾದ ಅಧಿಸೂಚನೆಗಳು"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"ಎಲ್ಲಾ ಅಧಿಸೂಚನೆಗಳನ್ನು ಅನುಮತಿಸಿ"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> ಅಡಚಣೆ ಮಾಡಬಹುದು</item>
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> ಅಡಚಣೆ ಮಾಡಬಹುದು</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"ಯಾವುದೂ ಅಡಚಣೆ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"ಇನ್ನೂ <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{ಯಾವುದೂ ಅಡಚಣೆ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ}=1{{sound_category_1} ಅಡಚಣೆ ಮಾಡಬಹುದು}=2{{sound_category_1} ಮತ್ತು {sound_category_2} ಅಡಚಣೆ ಮಾಡಬಹುದು}=3{{sound_category_1}, {sound_category_2} ಮತ್ತು {sound_category_3} ಅಡಚಣೆ ಮಾಡಬಹುದು}one{{sound_category_1}, {sound_category_2} ಮತ್ತು # ಇನ್ನಷ್ಟು ಅಡಚಣೆ ಮಾಡಬಹುದು}other{{sound_category_1}, {sound_category_2} ಮತ್ತು # ಇನ್ನಷ್ಟು ಅಡಚಣೆ ಮಾಡಬಹುದು}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"ಯಾವುದೂ ಅಡಚಣೆ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"ಯಾರೂ ಅಡಚಣೆ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"ಕೆಲವು ಜನರು ಅಡಚಣೆ ಮಾಡಬಹುದು"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"ಎಲ್ಲಾ ಜನರು ಅಡಚಣೆ ಮಾಡಬಹುದು"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"ಇದರ ಮೂಲಕ USB ಅನ್ನು ನಿಯಂತ್ರಿಸಲಾಗುತ್ತಿದೆ"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"ಕನೆಕ್ಟ್ ಆದ ಸಾಧನ"</string>
     <string name="usb_control_device" msgid="527916783743021577">"ಈ ಸಾಧನ"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"ಬದಲಾಯಿಸಲಾಗುತ್ತಿದೆ..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"ಬದಲಾಯಿಸಲಾಗುತ್ತಿದೆ…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"ಈ ಸಾಧನವನ್ನು ಚಾರ್ಜ್ ಮಾಡುವುದು"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"ಸಂಪರ್ಕಗೊಂಡಿರುವ ಸಾಧನವನ್ನು ಚಾರ್ಜ್ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"ವಿವರಗಳನ್ನು ವೀಕ್ಷಿಸಿ"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"ಡೇಟಾ ಸೇವರ್"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"ಅನಿಯಂತ್ರಿತ ಡೇಟಾ"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"ಹಿನ್ನೆಲೆ ಡೇಟಾವನ್ನು ಆಫ್ ಮಾಡಲಾಗಿದೆ"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"ಹಿನ್ನೆಲೆ ಡೇಟಾವನ್ನು ಆಫ್ ಮಾಡಲಾಗಿದೆ"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"ಆನ್"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"ಆಫ್"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"ಡೇಟಾ ಸೇವರ್ ಅನ್ನು ಬಳಸಿ"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"ಸಾಧನವು ಲಾಕ್ ಆಗಿದ್ದರೆ, ಅಧಿಸೂಚನೆಗಳಲ್ಲಿ ಪ್ರತ್ಯುತ್ತರಗಳು,ಇತರ ಪಠ್ಯವನ್ನು ಟೈಪ್ ಮಾಡುವುದನ್ನು ತಡೆ"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"ಡಿಫಾಲ್ಟ್ ಕಾಗುಣಿತ ಪರೀಕ್ಷಕ"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"ಕಾಗುಣಿತ ಪರೀಕ್ಷಕ ಆಯ್ಕೆಮಾಡಿ"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"ಕಾಗುಣಿತ ಪರೀಕ್ಷಕ ಬಳಸಿ"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"ಕಾಗುಣಿತ ಪರೀಕ್ಷಕ ಬಳಸಿ"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"ಆಯ್ಕೆಮಾಡಲಾಗಿಲ್ಲ"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(ಯಾವುದೂ ಇಲ್ಲ)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"ಸಂಗ್ರಹಣೆ ಸ್ಥಳಾವಕಾಶ ಮುಕ್ತಗೊಳಿಸುವಲ್ಲಿ ಸಹಾಯ ಮಾಡಲು, ಸಂಗ್ರಹಣೆ ನಿರ್ವಾಹಕವು ಬ್ಯಾಕಪ್ ಮಾಡಲಾದ ಫೋಟೋಗಳು ಮತ್ತು ವೀಡಿಯೊಗಳನ್ನು ನಿಮ್ಮ ಸಾಧನದಿಂದ ತೆಗೆದುಹಾಕುತ್ತದೆ."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"ಫೋಟೋಗಳು ಮತ್ತು ವೀಡಿಯೊಗಳನ್ನು ತೆಗೆದುಹಾಕಿ"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"ಸಂಗ್ರಹಣೆ ನಿರ್ವಾಹಕ"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"ಸಂಗ್ರಹಣೆ ನಿರ್ವಾಹಕವನ್ನು ಬಳಸಿ"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"ಸಂಗ್ರಹಣೆ ನಿರ್ವಾಹಕವನ್ನು ಬಳಸಿ"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"ಸ್ವಯಂಚಾಲಿತ"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"ಹಸ್ತಚಾಲಿತ"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"ಈಗ ಸ್ಥಳಾವಕಾಶವನ್ನು ಮುಕ್ತಗೊಳಿಸಿ"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"ಫೋನ್ ಅನ್ನು ಪರಿಶೀಲಿಸಲು ಡಬಲ್ ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"ಟ್ಯಾಬ್ಲೆಟ್ ಪರಿಶೀಲಿಸಲು ಡಬಲ್ ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"ಸಾಧನವನ್ನು ಪರಿಶೀಲಿಸಲು ಡಬಲ್ ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"ಅಧಿಸೂಚನೆಗಳಿಗಾಗಿ ಸ್ವೈಪ್ ಮಾಡಿ"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"ನಿಮ್ಮ ಅಧಿಸೂಚನೆಗಳನ್ನು ತೋರಿಸಲು, ಸ್ಕ್ರೀನ್‌ನ ಕೆಳಭಾಗದ ಅಂಚಿನಲ್ಲಿ ಕೆಳಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"ಒಂದು ಕೈ ಮೋಡ್‌"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"ಒಂದು ಕೈ ಮೋಡ್ ಅನ್ನು ಬಳಸಿ"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"ಆ್ಯಪ್‌ಗಳನ್ನು ಬದಲಿಸುವಾಗ ನಿರ್ಗಮಿಸಿ"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"ಅವಧಿ ಮೀರಿದೆ"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 ಸೆಕೆಂಡುಗಳು"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 ಸೆಕೆಂಡುಗಳು"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 ಸೆಕೆಂಡುಗಳು"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"ಒಂದೇ ಕೈಯಲ್ಲಿ ಆ್ಯಕ್ಸೆಸ್"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"ಸಮಯ, ಅಧಿಸೂಚನೆಗಳು ಮತ್ತು ಇತರ ಮಾಹಿತಿಯನ್ನು ವೀಕ್ಷಿಸಲು, ನಿಮ್ಮ ಪರದೆಯನ್ನು ಡಬಲ್-ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"ಫೋನ್‌ ಪರಿಶೀಲಿಸಲು ಕೈಗೆತ್ತಿಕೊಳ್ಳಿ"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"ಟ್ಯಾಬ್ಲೆಟ್ ಪರಿಶೀಲಿಸಲು ಎತ್ತಿರಿ"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"ಟ್ಯಾಬ್ಲೆಟ್ ಪರಿಶೀಲಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"ಸಾಧನವನ್ನು ಪರಿಶೀಲಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"ಸಮಯ, ಅಧಿಸೂಚನೆಗಳು ಮತ್ತು ಇತರ ಮಾಹಿತಿಯನ್ನು ಪರಿಶೀಲಿಸಲು, ನಿಮ್ಮ ಸ್ಕ್ರೀನ್ ಅನ್ನು ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"ಪ್ಯಾನಿಕ್ ಬಟನ್"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"ಪವರ್ ಬಟನ್ ಅನ್ನು ತ್ವರಿತವಾಗಿ 5 ಬಾರಿ ಒತ್ತುವ ಮೂಲಕ ತುರ್ತು SOS ಆ್ಯಕ್ಷನ್‌ಗಳನ್ನು ಪ್ರಾರಂಭಿಸಿ."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"ಎಚ್ಚರಿಕೆಯ ಶಬ್ದ"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"ಆ್ಯಕ್ಷನ್‌ಗಳನ್ನು ಪ್ರಾರಂಭಿಸುವ ಮೊದಲು ಎಚ್ಚರಿಕೆ ನೀಡಿ"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"ತುರ್ತು ಸಂಪರ್ಕಗಳು"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"ಅಧಿಸೂಚನೆಗಳಿಗಾಗಿ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಸ್ವೈಪ್ ಮಾಡಿ"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಅನ್ನು ಸ್ವೈಪ್ ಮಾಡಿ"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"ನಿಮ್ಮ ಅಧಿಸೂಚನೆಗಳನ್ನು ಪರಿಶೀಲಿಸಲು, ನಿಮ್ಮ ಫೋನ್ ಹಿಂಭಾಗದಲ್ಲಿನ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಸೆನ್ಸರ್‌ನಲ್ಲಿ ಕೆಳಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ."</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"ಎಲ್ಲಾ ಆ್ಯಪ್‌ಗಳಿಗಾಗಿ ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"ಗ್ರಾಫಿಕ್ಸ್ ಡ್ರೈವರ್ ಆಯ್ಕೆ ಮಾಡಿ"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"ಡೀಫಾಲ್ಟ್"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"ಗೇಮ್‌ ಡ್ರೈವರ್"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"ಗೇಮ್ ಡ್ರೈವರ್"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"ಡೆವಲಪರ್ ಡ್ರೈವರ್‌"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"ಸಿಸ್ಟಂ ಗ್ರಾಫಿಕ್ಸ್ ಡ್ರೈವರ್"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"ನೆಟ್‌ವರ್ಕ್‌ಗಳನ್ನು ಹುಡುಕಲಾಗಲಿಲ್ಲ. ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(ನಿಷೇಧಿತ)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"ಯಾವುದೇ ಸಿಮ್ ಕಾರ್ಡ್ ಇಲ್ಲ"</string>
+    <string name="sim_card" msgid="6381158752066377709">"ಸಿಮ್"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"ಯಾವುದೇ ಸಿಮ್‌ ಇಲ್ಲ"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"ಯಾವುದೂ ಅಲ್ಲ"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"ಕನೆಕ್ಟ್ ಮಾಡಲು ಸಿಮ್‌ನ ಅಗತ್ಯವಿದೆ"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"ಕನೆಕ್ಟ್ ಮಾಡಲು <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> ಸಿಮ್‌ನ ಅಗತ್ಯವಿದೆ"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"ಪ್ರಾಶಸ್ತ್ಯ ನೀಡಿದ ನೆಟ್‌ವರ್ಕ್‌ ಮೋಡ್‌: WCDMA ಗೆ ಪ್ರಾಶಸ್ತ್ಯ ನೀಡಲಾಗಿದೆ"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"ಪ್ರಾಶಸ್ತ್ಯ ನೀಡಿದ ನೆಟ್‌ವರ್ಕ್‌ ಮೋಡ್‌‌: GSM ಮಾತ್ರ"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"ಪ್ರಾಶಸ್ತ್ಯ ನೀಡಿದ ನೆಟ್‌ವರ್ಕ್‌ ಮೋಡ್‌: WCDMA ಮಾತ್ರ"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"ಮೊಬೈಲ್ ಡೇಟಾ"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"ಮೊಬೈಲ್ ನೆಟ್‌ವರ್ಕ್‌ ಬಳಸಿ ಡೇಟಾ ಪ್ರವೇಶಿಸಿ"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"ಫೋನ್ ಈ ವಾಹಕದ ವ್ಯಾಪ್ತಿಯಲ್ಲಿದ್ದಾಗ, ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಈ ವಾಹಕಕ್ಕೆ ಬದಲಾಗುತ್ತದೆ"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"ಯಾವುದೇ SIM ಕಾರ್ಡ್ ಲಭ್ಯವಿಲ್ಲ"</string>
     <string name="calls_preference" msgid="2166481296066890129">"ಕರೆಗಳ ಆದ್ಯತೆಗಳು"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS ಆದ್ಯತೆ"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"ಪ್ರತಿ ಬಾರಿ ಕೇಳಿ"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ಸ್ಕ್ರೀನ್ ಓವರ್‌ಲೇಗಳನ್ನು ಅನುಮತಿಸಿ"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"ಸೆಟ್ಟಿಂಗ್‌ಗಳ ಸ್ಕ್ರೀನ್‌ಗಳನ್ನು ಓವರ್‌ಲೇ ಮಾಡಲು ಇತರ ಆ್ಯಪ್‌ಗಳಲ್ಲಿ ಡಿಸ್‌ಪ್ಲೇ ಮಾಡಬಹುದಾದ ಆ್ಯಪ್‌ಗಳನ್ನು ಅನುಮತಿಸಿ"</string>
     <string name="media_controls_title" msgid="403271085636252597">"ಮಾಧ್ಯಮ"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"ಮಾಧ್ಯಮ ಸೆಶನ್ ಮುಗಿದ ನಂತರ ಪ್ಲೇಯರ್ ಅನ್ನು ಮರೆಮಾಡಿ"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"ವಿಸ್ತರಿತ ತ್ವರಿತ ಸೆಟ್ಟಿಂಗ್‌ಗಳ ಫಲಕದಿಂದ ಸೆಶನ್ ಅನ್ನು ಪುನರಾರಂಭಿಸಲು ಪ್ಲೇಯರ್ ನಿಮಗೆ ಅನುಮತಿಸುತ್ತದೆ."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"ತ್ವರಿತ ಸೆಟ್ಟಿಂಗ್‌‌ಗಳಲ್ಲಿ ಮೀಡಿಯಾ ಪ್ಲೇಯರ್"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"ಪ್ಲೇಬ್ಯಾಕ್ ಅನ್ನು ಸುಲಭವಾಗಿ ಪುನರಾರಂಭಿಸಲು, ವಿಸ್ತರಿತ ಅವಧಿಗೆ ಮೀಡಿಯಾ ಪ್ಲೇಯರ್ ಅನ್ನು ತೋರಿಸಿ"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"ಪ್ಲೇಯರ್ ಮರೆಮಾಡಿ"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"ಪ್ಲೇಯರ್ ತೋರಿಸಿ"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"ಯಾವುದೇ ಪ್ಲೇಯರ್‌ಗಳು ಲಭ್ಯವಿಲ್ಲ"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"ಅನುಮತಿಸಲಾದ ಆ್ಯಪ್‌ಗಳು"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"ಮಾಧ್ಯಮ"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"ಬ್ಲೂಟೂತ್ ಆನ್ ಆಗುತ್ತದೆ"</string>
 </resources>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index 8c61c6b..7f685f7 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"보통"</item>
     <item msgid="6740026006576843477">"길게"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"짧게"</item>
+    <item msgid="7397961711906421599">"보통"</item>
+    <item msgid="4079132024502041928">"길게"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"기본값"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA+LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"글로벌"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA 전용"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"전체"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 63243fb..8346f8e 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"잠금 화면에 프로필 정보 표시"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"계정"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"위치"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"위치 사용"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"위치 사용"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"사용 안함"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">사용 - <xliff:g id="COUNT_1">%1$d</xliff:g>개의 앱이 위치에 액세스할 수 있음</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"얼굴로 인증"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"시작"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"접근성 얼굴인식 잠금해제가 사용 중지되면 음성 안내 지원 사용 시 일부 설정 단계가 제대로 작동하지 않을 수 있습니다."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"뒤로"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"설정 계속"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"접근성 설정 사용"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="one"><xliff:g id="NUMBER_0">%d</xliff:g>자리 미만이어야 합니다.</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"기기 관리자가 최근 PIN 사용을 허용하지 않습니다."</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"IT 관리자가 일반 PIN을 차단했습니다. 다른 PIN을 시도해 보세요."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"잘못된 문자를 포함할 수 없습니다."</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"문자가 1개 이상 포함되어야 합니다."</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"숫자가 1개 이상 포함되어야 합니다."</string>
@@ -653,7 +655,6 @@
       <item quantity="one">숫자가 아닌 문자를 1개 이상 포함해야 합니다.</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"기기 관리자가 최근 비밀번호 사용을 허용하지 않습니다."</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"IT 관리자가 일반적인 단어로 된 비밀번호를 허용하지 않습니다. 다른 비밀번호를 시도해 보세요."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"연속으로 올라가거나 내려가는 숫자 또는 반복되는 숫자의 배열은 허용되지 않습니다."</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"확인"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"취소"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Wi-Fi 사용"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Wi-Fi 사용"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Wi-Fi 사용"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wi-Fi 설정"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"무선 액세스포인트(AP) 설정 및 관리"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"\'<xliff:g id="SSID">%1$s</xliff:g>\'에 연결하려면 아래 창의 가운데 부분에 QR 코드를 맞추세요."</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"QR 코드를 스캔하여 Wi‑Fi에 연결하세요."</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Wi‑Fi 공유"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"이 QR 코드를 스캔하여 \'<xliff:g id="SSID">%1$s</xliff:g>\'에 연결하고 비밀번호를 공유하세요."</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"다른 기기로 이 QR 코드를 스캔하여 \'<xliff:g id="SSID">%1$s</xliff:g>\'에 연결"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"이 QR 코드를 스캔하여 \'<xliff:g id="SSID">%1$s</xliff:g>\'에 연결"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"다시 시도해 보세요. 문제가 계속되면 기기 제조업체에 문의하세요."</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"문제 발생"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi-Fi 비밀번호: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"핫스팟 비밀번호: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"자동 연결"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"이 네트워크 근처에 있을 때 휴대전화가 자동으로 연결되도록 허용"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"이 네트워크 근처에 있을 때 태블릿이 자동으로 연결되도록 허용"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"범위 안에 들어오면 이 네트워크의 연결을 허용합니다."</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"기기 추가"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"QR 코드를 사용하여 네트워크에 기기 추가"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR 코드가 유효한 형식이 아닙니다."</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"시스템 인증 사용"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"제공하지 않음"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"확인하지 않음"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"지정한 인증서가 없습니다. 비공개로 연결되지 않습니다."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"네트워크 이름이 너무 깁니다."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"도메인을 지정해야 합니다."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"인증서가 필요합니다."</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"연결"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi 사용 설정됨"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>에 연결됨"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>에 연결 중"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"연결 중…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"네트워크 연결 실패"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"범위 안에 네트워크가 없음"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"앱에서 콘텐츠를 공유하지 않습니다. 인터넷 연결을 공유하려면 핫스팟을 껐다가 켜세요"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"설정된 비밀번호 없음"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"핫스팟 이름"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> 켜는 중..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> 켜는 중…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"다른 기기에서 <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>에 연결할 수 있습니다."</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"핫스팟 비밀번호"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP 대역"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"스무스 디스플레이"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"일부 콘텐츠의 새로고침 빈도를 자동으로 60Hz에서 90Hz로 늘립니다. 이렇게 하면 배터리 사용량이 증가합니다."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"스무스 디스플레이"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"90Hz 새로고침 빈도 강제 적용"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"향상된 터치 반응 속도 및 애니메이션 품질에 맞는 가장 높은 새로고침 빈도입니다. 배터리 사용량이 증가합니다."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"화면 시선 감지"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"사용/화면을 보고 있으면 꺼지지 않음"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android 버전"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android 보안 업데이트"</string>
     <string name="model_info" msgid="8997566254717810904">"모델"</string>
-    <string name="model_summary" msgid="2246651782442466213">"모델: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"모델 및 하드웨어"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"하드웨어 버전"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"장비 ID"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"네트워크 설정이 재설정되었습니다."</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"SIM을 삭제할 수 없음"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"오류로 인해 다운로드한 SIM을 삭제할 수 없습니다.\n\n기기를 재부팅하고 다시 시도하세요."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"모든 데이터 삭제(초기화)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"모든 데이터 삭제(초기화)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"초기화하면 다음을 포함한 태블릿의 "<b>"내부 저장소"</b>"의 모든 데이터가 삭제됩니다.\n\n"<li>"Google 계정"</li>\n<li>"시스템과 앱 데이터 및 설정"</li>\n<li>"다운로드된 앱"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"초기화하면 다음을 포함한 휴대전화 "<b>"내부 저장소"</b>"의 모든 데이터가 삭제됩니다.\n\n"<li>"Google 계정"</li>\n<li>"시스템과 앱 데이터 및 설정"</li>\n<li>"다운로드된 앱"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"현재 로그인한 계정:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"이 기기에 다른 사용자가 있습니다.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"음악"</li>\n<li>"사진"</li>\n<li>"기타 사용자 데이터"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"모바일 서비스 요금제는 취소되지 않습니다."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"음악이나 사진, 기타 사용자 데이터를 지우려면 "<b>"USB 저장소"</b>"를 삭제해야 합니다."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"음악이나 사진, 기타 사용자 데이터를 지우려면 "<b>"SD 카드"</b>"를 삭제해야 합니다."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"모든 데이터 삭제(초기화)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"모든 데이터 삭제(초기화)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"초기화하면 다음을 포함한 태블릿 "<b>"내부 저장소"</b>"의 모든 데이터가 삭제됩니다.\n\n"<li>"Google 계정"</li>\n<li>"시스템과 앱의 데이터 및 설정"</li>\n<li>"다운로드된 앱"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"초기화하면 다음을 포함한 휴대전화 "<b>"내부 저장소"</b>"의 모든 데이터가 삭제됩니다.\n\n"<li>"Google 계정"</li>\n<li>"시스템과 앱의 데이터 및 설정"</li>\n<li>"다운로드된 앱"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"현재 로그인한 계정:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"이 기기에 다른 사용자가 있습니다.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"음악"</li>\n<li>"사진"</li>\n<li>"기타 사용자 데이터"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"모바일 서비스 요금제는 취소되지 않습니다."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"음악이나 사진, 기타 사용자 데이터를 지우려면 "<b>"USB 저장소"</b>"를 삭제해야 합니다."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"음악이나 사진, 기타 사용자 데이터를 지우려면 "<b>"SD 카드"</b>"를 삭제해야 합니다."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USB 저장소 지우기"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SD 카드 지우기"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"내부 USB 저장소에 있는 모든 데이터(예: 음악 또는 사진)를 지웁니다."</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"SD 카드에 있는 모든 데이터(예: 음악 또는 사진)를 지웁니다."</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"모든 데이터 삭제"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"모든 데이터 삭제"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"모든 개인정보와 다운로드한 앱이 삭제됩니다. 이 작업은 실행취소할 수 없습니다."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"다운로드한 앱 및 SIM을 포함한 모든 개인정보가 삭제됩니다. 이 작업은 실행취소할 수 없습니다."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"모두 지우기"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"시스템 지우기 서비스를 사용할 수 없어 초기화하지 못했습니다."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"모든 데이터를 삭제하시겠습니까?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"초기화를 수행할 권한이 없는 사용자입니다."</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"지우는 중"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"잠시 기다려 주세요..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"모든 데이터 삭제"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"모든 데이터 삭제"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"모든 개인 정보와 다운로드한 앱이 삭제됩니다. 이 작업은 실행취소할 수 없습니다."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"다운로드한 앱 및 SIM을 포함한 모든 개인 정보가 삭제됩니다. 이 작업은 실행취소할 수 없습니다."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"모든 데이터를 삭제하시겠습니까?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"초기화를 실행할 권한이 없는 사용자입니다."</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"삭제 중"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"잠시만 기다려 주세요…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"통화 설정"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"음성메일, 착신전환, 통화중 대기, 발신자 번호 설정"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB 테더링"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g>개의 기기까지만 테더링 사용 가능"</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> 기기의 테더링이 끊깁니다."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"이더넷 테더링"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"USB 이더넷을 통해 휴대전화의 인터넷 연결 공유"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"이더넷을 통해 휴대전화의 인터넷 연결을 공유합니다."</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"핫스팟 및 테더링을 사용하여 다른 기기에서 내 모바일 데이터 연결을 통해 인터넷을 사용할 수 있도록 합니다. 앱에서도 핫스팟을 만들어 주변 기기와 콘텐츠를 공유할 수 있습니다."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"핫스팟 및 테더링으로 다른 기기에서 내 Wi-Fi 또는 모바일 데이터 연결을 통해 인터넷을 사용할 수 있도록 합니다. 앱에서도 핫스팟을 만들어 주변 기기와 콘텐츠를 공유할 수 있습니다."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"고객센터"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"자막 환경설정"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"확대"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"확대 영역"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"확대 사용 설정"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"화면 확대 시 사용할 확대 영역 선택"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"전체 화면"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"화면 일부"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"전체 화면 및 화면 일부"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"전체 화면 확대"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"화면 일부 확대"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"접근성 버튼으로 전환할까요?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"화면 일부를 확대하기 위해 세 번 탭하는 동작을 사용하면 입력 및 기타 작업이 지연됩니다.\n\n접근성 버튼을 사용하여 확대하는 동작으로 전환하시겠습니까?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"접근성 버튼으로 전환"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"세 번 탭하여 확대하기 계속 사용"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"확대 설정"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"세 번 탭하여 확대"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"바로가기를 사용하여 확대"</string>
@@ -2169,7 +2169,7 @@
     <string name="accessibility_global_gesture_preference_title" msgid="3713636732641882959">"볼륨 키 단축키"</string>
     <string name="accessibility_shortcut_service_title" msgid="6842883700702723355">"단축키 서비스"</string>
     <string name="accessibility_shortcut_settings" msgid="836783442658447995">"단축키 설정"</string>
-    <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="3923122834058574478">"잠금 화면에서 단축키 사용"</string>
+    <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="3923122834058574478">"잠금 화면에서 바로가기 사용"</string>
     <string name="accessibility_shortcut_description" msgid="2184693606202133549">"잠금 화면에서 기능 단축키 사용을 허용합니다. 볼륨 키 2개를 몇 초 동안 동시에 길게 누릅니다."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"고대비 텍스트"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"화면 확대 자동 업데이트"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"전원 버튼으로 통화 종료"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"대형 마우스 포인터"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"애니메이션 삭제"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"모노 오디오"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"오디오 재생 시 채널 통합"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"오디오 밸런스"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"왼쪽"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"오른쪽"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"모노 오디오"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"오디오 재생 시 채널 통합"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"오디오 밸런스"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"왼쪽"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"오른쪽"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"기본"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10초"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30초"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"알림 진동"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"벨소리 진동"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"터치 반응"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> 사용"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> 열기"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"색상 보정 사용"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"자막 보기"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"지원되는 앱만 해당"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> 사용"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> 열기"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"색상 보정 사용"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"자막 보기"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"지원되는 앱만 해당"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"자막 크기 및 스타일"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"텍스트 크기: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"추가 옵션"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"녹색약"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"적색약"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"청색약"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"그레이 스케일"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"적녹색약"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"적녹색약"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"청황색약"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"백그라운드 제한"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"앱이 백그라운드에서 실행되도록 허용"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"앱이 백그라운드에서 실행되도록 허용하지 않습니다."</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"백그라운드 사용은 제한할 수 없습니다."</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"백그라운드 사용은 제한할 수 없음"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"백그라운드 활동을 제한하시겠습니까?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"앱의 백그라운드 활동을 제한하면 앱이 정상적으로 작동하지 않을 수도 있습니다."</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"배터리 최적화를 설정하지 않아 이 앱을 제한할 수 없습니다.\n\n앱을 제한하려면 먼저 배터리 최적화를 사용 설정하세요."</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"일정 설정"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"배터리 수명 연장"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"충전 완료 시 사용 중지"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"휴대전화가 <xliff:g id="PERCENT">%1$s</xliff:g>가 되면 절전 모드를 사용 중지합니다."</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"태블릿이 <xliff:g id="PERCENT">%1$s</xliff:g>가 되면 절전 모드를 사용 중지합니다."</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"기기가 <xliff:g id="PERCENT">%1$s</xliff:g>가 되면 절전 모드를 사용 중지합니다."</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"휴대전화가 <xliff:g id="PERCENT">%1$s</xliff:g> 이상 충전되면 절전 모드를 사용 중지합니다."</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"태블릿이 <xliff:g id="PERCENT">%1$s</xliff:g> 이상 충전되면 절전 모드를 사용 중지합니다."</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"기기가 <xliff:g id="PERCENT">%1$s</xliff:g> 이상 충전되면 절전 모드를 사용 중지합니다."</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"사용 설정"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"재설정"</string>
     <string name="tts_play" msgid="2945513377250757221">"재생"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"스마트 연결"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"네트워크 연결을 자동으로 관리하여 배터리 수명을 연장하고 기기 성능을 개선합니다."</string>
     <string name="credentials_title" msgid="7535942196886123656">"사용자 인증 정보 저장소"</string>
     <string name="credentials_install" msgid="3933218407598415827">"인증서 설치"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"저장소에서 인증서 설치"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"사용자 인증 정보"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"저장된 사용자 인증 정보를 확인하고 수정"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"고급"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"저장공간 유형"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"하드웨어 지원"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"소프트웨어 전용"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"이 사용자는 자격증명을 확인하거나 수정할 수 없습니다."</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN 및 앱에 사용하도록 설치됨"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi에 사용하도록 설치됨"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"단말기에서 결제"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"결제 앱을 설정하세요. 그런 다음 미접촉 기호가 있는 단말기 위에 휴대전화의 뒷면을 갖다 대세요."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"확인"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"더보기..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"더보기…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"기본 결제 앱 설정"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"기본 결제 앱 업데이트"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"미접촉 결제 단말기에서 <xliff:g id="APP">%1$s</xliff:g> 앱으로 결제"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"통화에 항상 사용"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"데이터에 사용할 SIM 선택"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"SMS용 SIM 선택"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"데이터 SIM을 전환하는 중입니다. 최대 1분 정도 걸릴 수 있습니다..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"데이터 SIM을 전환하는 중입니다. 최대 1분 정도 걸릴 수 있습니다…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"통화에 사용할 SIM"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"SIM 카드 선택"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"루틴, 일정, 절전 모드, 전력 절약 모드, 배터리, 자동, 퍼센트"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"VoLTE, 고급 통화, 4G 통화"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"언어 추가, 언어 한 개 추가"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"텍스트 크기"</string>
     <string name="default_sound" msgid="6604374495015245195">"기본 사운드"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"벨소리 및 알림 볼륨이 <xliff:g id="PERCENTAGE">%1$s</xliff:g>로 설정되었습니다."</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"볼륨, 진동, 방해 금지 모드"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"부팅 소리"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"실시간 자막"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"미디어 자막 자동 생성"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"없음"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other">예약 <xliff:g id="ON_COUNT">%d</xliff:g>개 설정됨</item>
-      <item quantity="one">예약 1개 설정됨</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{없음}=1{일정 1개 설정됨}other{일정 #개 설정됨}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"방해 금지 모드"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"중요한 사람과 앱의 알림만 받기"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"방해 요소 제한"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"중요 알림만 허용"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"켜짐/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"사용 안함/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"사용 안함"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"켜짐"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"항상 확인"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"사용 중지할 때까지"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g>시간</item>
-      <item quantity="one">1시간</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g>분"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g>개의 예약이 자동으로 사용 설정될 수 있습니다.</item>
-      <item quantity="one">1개의 예약이 자동으로 사용 설정될 수 있습니다.</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1시간}other{#시간}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1분}other{#분}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{꺼짐}=1{꺼짐/일정 1개가 자동으로 사용 설정될 수 있음}other{꺼짐/일정 #개가 자동으로 사용 설정될 수 있음}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"방해 금지 모드 예외 항목"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"사람"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"앱"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"우선순위가 낮은 알림을 조용한 알림으로 자동 설정합니다."</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"적응형 알림 순위 지정"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"관련성에 따라 자동으로 알림 순위 지정"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"적응형 알림 의견"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"알림의 수정사항을 표시하며 시스템에 의견을 제공하는 옵션을 보여줍니다."</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"추천 작업 및 답장"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"추천 작업 및 답장을 자동으로 표시합니다."</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"최근 알림 및 일시 중지된 알림 표시"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"방해 금지 모드 액세스"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"방해 금지 모드 허용"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"설치된 앱 중에서 방해 금지 모드 액세스를 요청한 앱이 없습니다."</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"앱 로드 중..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"앱 로드 중…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"사용자의 요청에 따라 Android에서 기기에 이 앱의 알림이 표시되지 않도록 차단하고 있습니다"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"사용자의 요청에 따라 Android에서 기기에 이 카테고리의 알림이 표시되지 않도록 차단하고 있습니다"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"사용자의 요청에 따라 Android에서 기기에 이 그룹의 알림이 표시되지 않도록 차단하고 있습니다"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"모든 대화"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"우선순위 대화"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"없음"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other">대화 <xliff:g id="CONVERSATIONS">%d</xliff:g>개</item>
-      <item quantity="one">대화 1개</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"없음"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{없음}=1{대화 1개}other{대화 #개}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"예외 사용자"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"전화"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"전화"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"허용된 전화를 놓치지 않도록 기기가 벨소리로 설정되어 있는지 확인하세요."</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"예약된 시간(‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\')에 수신 전화가 차단됩니다. 설정을 조정하여 친구, 가족 또는 연락처에 등록된 다른 사용자의 연락을 허용할 수 있습니다."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"별표 표시한 연락처"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other">외 <xliff:g id="NUM_PEOPLE">%d</xliff:g>명</item>
-      <item quantity="one">외 1명</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"없음"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{없음}=1{{contact_1}}=2{{contact_1} 및 {contact_2}}=3{{contact_1}, {contact_2} 및 {contact_3}}other{{contact_1}, {contact_2} 외 #명}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"메시지"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"메시지"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"메시지"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"예약된 시간(‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\')에 수신 메시지가 차단됩니다. 설정을 조정하여 친구, 가족 또는 연락처에 등록된 다른 사용자의 연락을 허용할 수 있습니다."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"모든 메시지 받기"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"모든 전화 받기"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"없음"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other">연락처 <xliff:g id="NUM_CONTACTS">%d</xliff:g>개</item>
-      <item quantity="one">연락처 1개</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{없음}=1{연락처 1개}other{연락처 #개}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"모든 사용자"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"연락처"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"별표표시한 연락처"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"모든 알림"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"일부 알림"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"선택된 사람은 앱 알림이 사용 중지되어 있어도 나에게 연락할 수 있습니다."</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> 예외</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> 예외</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"외 <xliff:g id="NUMBER">%d</xliff:g>개"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{예외 앱 없음}=1{{app_1} 예외}=2{{app_1} 및 {app_2} 예외}=3{{app_1}, {app_2}, {app_3} 예외}other{{app_1}, {app_2} 외 #개 예외}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"앱"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"모든 알림"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"일부 알림"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"예외 알림"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"모든 알림 허용"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> 예외</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> 예외</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"예외 소리 없음"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"외 <xliff:g id="NUMBER">%d</xliff:g>개"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{예외 소리 없음}=1{{sound_category_1} 예외}=2{{sound_category_1} 및 {sound_category_2} 예외}=3{{sound_category_1}, {sound_category_2}, {sound_category_3} 예외}other{{sound_category_1}, {sound_category_2} 외 #가지 예외}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"예외 소리 없음"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"예외 사용자 없음"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"일부 사용자만 예외"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"모든 사람 예외"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB 제어 기기"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"연결된 기기"</string>
     <string name="usb_control_device" msgid="527916783743021577">"이 기기"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"전환 중..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"전환 중…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"전환할 수 없습니다."</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"기기 충전"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"연결된 기기 충전 중"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"세부정보 보기"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"데이터 절약 모드"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"무제한 데이터"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"백그라운드 데이터 사용 중지됨"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"백그라운드 데이터 사용 중지됨"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"사용"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"사용 안함"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"데이터 절약 모드 사용"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"기기가 잠기면 알림에 답장이나 다른 텍스트를 입력하지 못하게 합니다."</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"기본 맞춤법 검사기"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"맞춤법 검사기 선택"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"맞춤법 검사기 사용"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"맞춤법 검사기 사용"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"선택되지 않음"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(없음)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"저장용량 관리자가 저장 공간을 확보하기 위해 백업된 사진과 동영상을 기기에서 삭제합니다."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"사진 및 동영상 삭제"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"저장용량 관리자"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"저장용량 관리자 사용"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"저장용량 관리자 사용"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"자동"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"수동"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"지금 여유 공간 확보"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"두 번 탭하여 휴대전화 확인"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"두 번 탭하여 태블릿 확인"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"두 번 탭하여 기기 확인"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"스와이프하여 알림 확인"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"화면 하단에서 아래로 스와이프하여 알림을 표시합니다."</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"한 손 사용 모드"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"한 손 사용 모드 사용"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"앱 전환 시 종료"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"시간 제한"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4초"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8초"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12초"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"한 손 사용 가능 여부"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"시간, 알림, 기타 정보를 확인하려면 화면을 두 번 탭하세요."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"들어 올려 휴대전화 확인"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"들어서 태블릿 확인"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"탭하여 태블릿 확인"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"탭하여 기기 확인"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"시간, 알림, 기타 정보를 확인하려면 화면을 탭하세요."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"긴급 버튼"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"전원 버튼을 빠르게 5회 누르면 긴급 SOS 기능이 실행됩니다."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"알림 사운드"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"긴급 SOS 기능 실행 전에 알립니다."</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"비상 연락처"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"지문을 스와이프하여 알림 보기"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"지문 스와이프"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"알림을 확인하려면 휴대전화 뒷면의 지문 센서에서 아래로 스와이프합니다."</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"모든 앱에서 사용 설정"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"그래픽 드라이버 선택"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"기본값"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"게임 드라이버"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"게임 드라이버"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"개발자 드라이버"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"시스템 그래픽 드라이버"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"네트워크를 찾지 못했습니다. 다시 시도해 주세요."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(금지됨)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"SIM 카드 없음"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"SIM 없음"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"없음"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"연결하려면 SIM이 필요합니다."</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"연결하려면 <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> SIM이 필요합니다."</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"기본 네트워크 모드: WCDMA 선호"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"기본 네트워크 모드: GSM 전용"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"기본 네트워크 모드: WCDMA 전용"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"모바일 데이터"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"모바일 네트워크를 사용하여 데이터 액세스"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"범위 안에 들어오면 휴대전화가 이 이동통신사로 자동 전환됩니다."</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"사용할 수 있는 SIM 카드가 없음"</string>
     <string name="calls_preference" msgid="2166481296066890129">"통화 환경설정"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS 환경설정"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"항상 확인"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"설정에서 화면 오버레이 허용"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"다른 앱 위에 표시할 수 있는 앱이 설정 화면을 오버레이하도록 허용합니다."</string>
     <string name="media_controls_title" msgid="403271085636252597">"미디어"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"미디어 세션이 종료되면 플레이어를 숨깁니다."</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"플레이어를 사용하여 펼쳐진 빠른 설정 패널에서 세션을 다시 시작할 수 있습니다."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"빠른 설정의 미디어 플레이어"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"쉽게 이어서 재생할 수 있도록 미디어 플레이어를 오랫동안 표시합니다."</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"플레이어를 숨깁니다."</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"플레이어를 표시합니다."</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"사용 가능한 플레이어가 없습니다."</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"허용되는 앱"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"미디어"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"블루투스를 사용 설정함"</string>
 </resources>
diff --git a/res/values-ky/arrays.xml b/res/values-ky/arrays.xml
index 0cd420a..c489e9e 100644
--- a/res/values-ky/arrays.xml
+++ b/res/values-ky/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Орточо"</item>
     <item msgid="6740026006576843477">"Узун"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Кыска"</item>
+    <item msgid="7397961711906421599">"Орто"</item>
+    <item msgid="4079132024502041928">"Узун"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Демейки"</item>
     <item msgid="4234707448428002595">"Санс-сериф"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Жалпы"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA гана"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Жалпы"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 968d415..5dcee2a 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Бөгөт көшөгөсүндө профайлдын маалыматын көргөзүү"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Аккаунттар"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Жайгашкан жер"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Кайда жүргөнүм көрүнүп турсун"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Жайгашкан жерди колдонуу"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Өчүк"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">Күйүк - <xliff:g id="COUNT_1">%1$d</xliff:g> колдонмо жайгашкан жерди көрө алат</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Жүзүңүз менен аныктыгыңызды текшертиңиз"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Баштадык"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Атайын мүмкүнчүлүктөр кызматындагы жүзүнөн таанып ачуу функциясы өчүрүлсө, TalkBack\'теги айрым жөндөө кадамдары туура иштебеши мүмкүн."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Артка"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Жөндөөнү улантуу"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Атайын мүмкүнчүлүктөрдү колдонуу"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="one"><xliff:g id="NUMBER_0">%d</xliff:g> сандан ашпашы керек</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Түзмөктүн администратору акыркы PIN кодду колдонууга тыюу салган"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Жөнөкөй PIN-коддорду коюу IT администраторуңуз тарабынан бөгөттөлгөн. Татаалыраак PIN-кодду коюп көрүңүз."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Бул жерде жараксыз белги камтылбашы керек"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Кеминде бир тамга болушу керек"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Кеминде бир сан болушу керек"</string>
@@ -653,7 +655,6 @@
       <item quantity="one">Тамгадан башка кеминде 1 сандык эмес символ болушу керек</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Түзмөктүн администратору акыркы сырсөздү колдонууга тыюу салган"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Жөнөкөй сырсөздөрү коюу IT администраторуңуз тарабынан бөгөттөлгөн. Татаалыраак сырсөздү коюп көрүңүз."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Сандар чоңойгон, кичирейген же кайталанган ыраатта болбошу керек"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Ырастоо"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Жокко чыгаруу"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Wi‑Fi\'ды жандыруу"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Wi-Fi\'ды иштетүү"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Wi-Fi\'ды колдонуу"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wi‑Fi тууралоолору"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Зымсыз кошулуу түйүндөрүн орнотуу жана башкаруу"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"\"<xliff:g id="SSID">%1$s</xliff:g>\" тармагына кошулуу үчүн, камераны төмөнкү QR кодго алып келиңиз"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Wi‑Fi\'га кошулуу үчүн, QR кодун скандаңыз"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Wi‑Fi\'ды бөлүшүү"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"\"<xliff:g id="SSID">%1$s</xliff:g>\" тармагына туташып, сырсөз менен бөлүшүү үчүн, бул QR кодун скандаңыз"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"\"<xliff:g id="SSID">%1$s</xliff:g>\" тармагына кошулуу үчүн башка түзмөктө QR кодун скандаңыз"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"\"<xliff:g id="SSID">%1$s</xliff:g>\" тармагына туташуу үчүн, бул QR кодун скандаңыз"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Кайталап көрүңүз. Эгер маселе чечилбесе, түзмөктү өндүрүүчүгө кайрылыңыз"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Бир жерден ката кетти"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi‑Fi сырсөзү: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Байланыш түйүнүнүн сырсөзү: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Авто-туташуу"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Ушул тармакка жакын жерде автоматтык түрдө туташууга уруксат берүү"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Планшетке ушул тармакка автоматтык түрдө туташууга уруксат берүү"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Тейлөө аймагына келгенде, бул тармакка туташууга уруксат берүү"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Түзмөк кошуу"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Түзмөктү бул тармакка кошуу үчүн, QR кодун колдонуңуз"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR кодунун форматы жараксыз"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Тутумдун тастыктамаларын көрсөтүү"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Берилбесин"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Текшерилбесин"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Эч тастыктама көрсөтүлгөн жок. Туташууңуз купуя болбойт."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Тармактын аталышы өтө узун."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Домен көрсөтүлүшү керек."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Тастыктама талап кылынат."</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Туташуу"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi күйгүзүлдү"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> менен туташты"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> менен туташууда"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Туташууда…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Түйүндгө байланышкан жок"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Тармак тейлөө аймагында эмес"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Колдонмо мазмунду бөлүшүүдө. Интернет байланышын бөлүшүү үчүн байланыш түйүнүн өчүрүп, кайра күйгүзүңүз"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Бир да сырсөз коюлган жок"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Байланыш түйүнүнүн аталышы"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> күйгүзүлүүдө…"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> күйгүзүлүүдө…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Башка түзмөктөр <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> тармагына туташа алышат"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Байланыш түйүнүнүн сырсөзү"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Wi-Fi жыштыктарынын диапазону"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Айрым мазмундар үчүн жаңыртуу ылдамдыгын 60 Герцтен 90 Герцке көтөрөт. Батареянын колдонулушун жогорулатат."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"90 Герц жаңыртуу ылдамдыгын колдонуу"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Сенсордун функциясын жана анимациянын сапатын жакшыртуу үчүн жаңыртуу ылдамдыгы жогорулатылды. Батареянын колдонулушун жогорулатат."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Ыңгайлашуучу көшүү режими"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Күйүк / Экранды карап турганда, ал өчүп калбайт"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android версиясы"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android\'дин коопсуздукту жаңыртуусу"</string>
     <string name="model_info" msgid="8997566254717810904">"Үлгүсү"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Үлгүсү: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Түзмөктүн үлгүсү/аппараттык камсыздалышы"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Аппараттык камсыздоонун версиясы"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Жабдуунун ID\'си"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Тармак жөндөөлөрү баштапкы абалга келди"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"SIM карталар тазаланбай жатат"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Жүктөлүп алынган SIM карталарды катадан улам тазалоого болбойт.\n\nТүзмөгүңүздү өчүрүп күйгүзүп, кайталап көрүңүз."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Бардык дайын-даректерди тазалоо (баштапкы абалга келтирүү)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Бардык дайын-даректерди тазалоо"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Планшетиңиздин "<b>"ички сактагычындагы"</b>" бардык маалымат өчүрүлөт, тактап айтканда:\n\n"<li>"Google аккаунтуңуз"</li>\n<li>"Тутумдун жана колдонмолордун жөндөөлөрү жана дайындары"</li>\n<li>"Жүктөлүп алынган колдонмолор"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Телефонуңуздун "<b>"ички сактагычындагы"</b>" бардык маалымат өчүрүлөт, тактап айтканда:\n\n"<li>"Google аккаунтуңуз"</li>\n<li>"Тутумдун жана колдонмолордун жөндөөлөрү жана дайындары"</li>\n<li>"Жүктөлүп алынган колдонмолор"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Ушул түзмөктөгү аккаунттар:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Бул түзмөктө башка колдонуучулар бар.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Музыка"</li>\n<li>"Сүрөттөр"</li>\n<li>"Башка колдонуучу дайындары"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM-карталар"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Байланыш операторуңуздун кызматын пайдалана бересиз."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Музыканы, сүрөттөрдү, жана башка колдонуучу берилиштерин өчүрүш үчүн, "<b>"USB сактагычты"</b>" тазалаш керек."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Музыканы, сүрөттөрдү, жана башка колдонуучу берилиштерин өчүрүш үчүн, "<b>"SD-картаны"</b>" тазалаш керек."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Бардык дайындарды өчүрүү (демейки жөндөөлөргө кайтаруу)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Бардык дайындарды өчүрүү (демейки жөндөөлөргө кайтаруу)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Планшетиңиздин "<b>"ички сактагычындагы"</b>" бардык маалымат өчүрүлөт, тактап айтканда:\n\n"<li>"Google аккаунтуңуз"</li>\n<li>"Тутумдун жана колдонмолордун жөндөөлөрү жана дайындары"</li>\n<li>"Жүктөлүп алынган колдонмолор"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Телефонуңуздун "<b>"ички сактагычындагы"</b>" бардык маалымат өчүрүлөт, тактап айтканда:\n\n"<li>"Google аккаунтуңуз"</li>\n<li>"Тутумдун жана колдонмолордун жөндөөлөрү жана дайындары"</li>\n<li>"Жүктөлүп алынган колдонмолор"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Учурда төмөнкү аккаунттарга кирип турасыз:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Бул түзмөктө башка колдонуучулар бар.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Музыка"</li>\n<li>"Сүрөттөр"</li>\n<li>"Колдонуучунун башка дайындары"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM-карталар"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Байланыш операторуңуздун кызматын пайдалана бересиз."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Музыканы, сүрөттөрдү, жана колдонуучунун башка дайындарын өчүрүү үчүн, "<b>"USB эстутумун"</b>" тазалоо керек."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Музыканы, сүрөттөрдү, жана колдонуучунун башка дайындарын өчүрүү үчүн, "<b>"SD-картаны"</b>" тазалоо керек."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USB сактагычты тазалоо"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SD картаны тазалоо"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Ички USB сактагычтагы музыка же сүрөттөр сыяктуу бардык берилиштерди тазалоо"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"SD-картадагы музыка же сүрөттөр сыяктуу бардык берилиштерди тазалоо"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Бардык маалыматты өчүрүү"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Бардык маалыматты өчүрүү"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Бардык жеке маалыматыңыз жана жүктөлүп алынган колдонмолор өчүрүлөт. Бул аракетти артка кайтара албайсыз."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Бардык жеке маалыматыңыз, анын ичинде жүктөлүп алынган колдонмолор жана SIM карталар өчүрүлөт. Бул аракетти артка кайтара албайсыз."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Баарын тазалоо"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Тазалоо аткарылган жок, анткени System Clear кызматы жеткиликсиз."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Бардык дайындар тазалансынбы?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Бул колдонуучу демейки абалга келтире албайт"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Өчүрүүдө"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Күтө туруңуз…"</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Бардык дайындарды тазалоо"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Бардык дайындарды тазалоо"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Бардык жеке маалыматыңыз жана жүктөлүп алынган колдонмолор өчүрүлөт. Бул аракетти артка кайтара албайсыз."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Бардык жеке маалыматыңыз, анын ичинде жүктөлүп алынган колдонмолор жана SIM карталар жок кылынат. Бул аракетти артка кайтара албайсыз."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Бардык дайындар тазалансынбы?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Бул колдонуучунун демейки жөндөөлөргө кайтарууга уруксаты жок"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Өчүрүлүүдө"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Күтө туруңуз…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Чалуу жөндөөлөрү"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Үн почтасы, чалууну багыттоо, чалууну кармоо, номурду аныктоону жөндөө"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB модем"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> ашык түзмөк менен интернет бөлүшүү болбойт."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> жалгашуудан бошотулат."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ethernet модем режими"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Телефондогу Интернетти Ethernet USB аркылуу бөлүшөсүз"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Телефондогу Интернетти Ethernet аркылуу бөлүшүү"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Башка түзмөктөрдү мобилдик Интернетке туташтыруу үчүн байланыш түйүнүн же модем режимин колдонуңуз. Колдонмолор да жакын жердеги түзмөктөр менен мазмун бөлүшүү үчүн байланыш түйүнүн түзө алышат."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Башка түзмөктөрдү Wi‑Fi же мобилдик Интернетке туташтыруу үчүн, байланыш түйүнүн же модем режимин колдонуңуз. Ошондой эле, колдонмолор жакын жердеги түзмөктөр менен кандайдыр бир нерселерди бөлүшүү үчүн, байланыш түйүндөрүн түзө алышат."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Жардам"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Коштомо жазуулардын жөндөөлөрү"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Чоңойтуу"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Чоңойтуу аймагы"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Чоңойтууну иштетүү"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Экранды чоңойтуп жатканда чоңойтула турган аймакты(тарды) тандаңыз"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Толук экран"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Экрандын бир бөлүгү"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Толук экран жана экранды бир бөлүгү"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Толук экранды чоңойтуу"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Экрандын бир бөлүгүн чоңойтуу"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Атайын мүмкүнчүлүктөр баскычына которуласызбы?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Экранды чоңойтуу үчүн үч жолу басканда терүү же башка аракеттер кечигүү менен аткарылат.\n\nЭкранды чоңойтуу үчүн атайын мүмкүнчүлүктөр баскычын колдоносузбу?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Атайын мүмкүнчүлүктөр баскычына которулуу"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Чоңойтуу үчүн үч жолуу басуу аракетин колдонуу"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Чоңойтуу жөндөөлөрү"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Үч жолу таптап чоңойтуу"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Ыкчам баскыч менен чоңойтуу"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Чалууну кубат баскычы бүтүрөт"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Чычкандын чоң көрсөткүчү"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Анимацияларды алып салуу"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Моно аудио"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Аудио ойнотулуп жатканда каналдар биригет"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Аудионун балансы"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Сол"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Оң"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Моно аудио"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Аудио ойнотулуп жатканда каналдар биригет"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Аудионун балансы"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Сол"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Оң"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Демейки"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 секунд"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 секунд"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Билдирменин дирилдөөсү"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Шыңгырдын дирилдөөсү"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Басып жооп берүү"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> колдонмосун пайдалануу"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ачуу"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Түсүн тууралоону иштетүү"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Коштомо жазууларды көрсөтүү"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Колдоого алынган колдонмолордо гана"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> колдонмосун пайдалануу"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> колдонмосун ачуу"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Түстөрдү тууралоону колдонуу"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Коштомо жазууларды көрсөтүү"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Колдоого алынган колдонмолордо гана"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Коштомо жазуунун өлчөмү жана стили"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Текст өлчөмү: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Көбүрөөк параметр"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Дейтераномалия"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Протаномалия"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Тританомалия"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Боз"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Кызыл-жашыл"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Кызыл-жашыл"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Көк-сары"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Фондо керектелишин чектөө"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Колдонмо фондо аткарылсын"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Колдонмону фондо иштетүүгө уруксат жок"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Фондо колдонуу чектелбейт"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Фондо колдонуу чектелбейт"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Фондогу аракеттери чектелсинби?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Колдонмонун фондогу аракеттери чектелсе, ал туура эмес иштеп калышы мүмкүн"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Бул колдонмодо батареянын үнөмдөлүшү жөндөлбөгөндүктөн, аны чектөөгө болбойт.\n\nКолдонмону чектөө үчүн, адегенде Батареяны үнөмдөө режимин күйгүзүңүз."</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Пландаштыруу"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Батареяны үнөмдөө"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Кубатталганда өчүрүү"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Телефон <xliff:g id="PERCENT">%1$s</xliff:g> жеткенде, батареяны үнөмдөгүч өчүп калат"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Планшет <xliff:g id="PERCENT">%1$s</xliff:g> жеткенде, батареяны үнөмдөгүч өчүп калат"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Түзмөк <xliff:g id="PERCENT">%1$s</xliff:g> жеткенде, батареяны үнөмдөгүч өчүп калат"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Телефон <xliff:g id="PERCENT">%1$s</xliff:g> жеткенде, батареяны үнөмдөгүч өчүп калат"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Планшет <xliff:g id="PERCENT">%1$s</xliff:g> жеткенде, батареяны үнөмдөгүч өчүп калат"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Түзмөк <xliff:g id="PERCENT">%1$s</xliff:g> жеткенде, батареяны үнөмдөгүч өчүп калат"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Күйгүзүү"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Баштапкы абалга келтирүү"</string>
     <string name="tts_play" msgid="2945513377250757221">"Угуу"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Ыңгайлаштырылган туташуу"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Батареянын кубатынын мөөнөтүн узартып, түзмөктүн майнаптуулугун тармактык туташууларды автоматтык түрдө башкаруу жолу менен жакшыртат."</string>
     <string name="credentials_title" msgid="7535942196886123656">"Каттоо маалыматы сакталган жер"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Тастыктаманы орнотуу"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Тастыктамалар сактагычтан орнотулат"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Колдонуучунун каттоо маалыматы"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Сакталган эсептик дайын-даректерди көрүп/өзгөртө аласыз"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Өркүндөтүлгөн"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Сактагычтын түрү"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Аппараттык негизде"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Програмдык гана"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Бул колдонуучу далдаштырма дайындарын колдоно албайт"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN жана колдонмолор үчүн орнотулган"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi үчүн орнотулган"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Терминалдан акы төлөө"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Төлөм колдонмосун жөндөп туруп, телефондун арткы бетин тийбей төлөө белгиси түшүрүлгөн терминалга жакындатыңыз."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Түшүндүм"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Дагы…"</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Дагы…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Демейки төлөм колдонмосун коюу"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Демейки төлөм колдонмосун жаңыртуу"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Тийбей төлөө терминалында <xliff:g id="APP">%1$s</xliff:g> менен төлөңүз"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Бул нерсе дайым чалуулр үчүн колдонулсн"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Дайындар үчүн SIM тандаңыз"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"SMS жөнөтүү үчүн SIM картаны тандаңыз"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Дайындар SIM\'и которулууда, бул бир мүнөткө чейин созулушу мүмкүн…"</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Интернетти колдонуу үчүн SIM карта которулууда, бул бир мүнөткө чейин созулушу мүмкүн…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Төмөнкү менен чалуу"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"SIM карта тандаңыз"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"тартип, ырааттама, батареяны үнөмдөгүч режими, батареяны үнөмдөгүч, батаеря, автоматтык түрдө, пайыз"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, өркүндөтүлгөн чалуу, 4g чалуу"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"тил кошуу, тил кошуу"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"текст өлчөмү"</string>
     <string name="default_sound" msgid="6604374495015245195">"Демейки үн"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Шыңгырлар менен билдирмелердин үнүнүн катуулугу <xliff:g id="PERCENTAGE">%1$s</xliff:g> коюлду"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Үн деңгээли, дирилдөө, \"Тынчымды алба\" режими"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Түзмөк күйгүзүлгөндөгү үндөр"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Ыкчам коштомо жазуулар"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Автоматтык коштомо жазуулар"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Жок"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> график коюлду</item>
-      <item quantity="one">1 график коюлду</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Жок}=1{1 график коюлду}other{# график коюлду}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Тынчымды алба"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Маанилүү байланыштар менен колдонмолордон гана билдирмелерди алуу"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Билдирмелерди чектөө"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Шашылыш билдирүүлөр гана"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Күйүк / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Өчүк / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Өчүк"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Күйүк"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Ар дайым суралсын"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Бул функция өчүрүлгөнгө чейин"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> саат</item>
-      <item quantity="one">1 саат</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> мүнөт"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ырааттама автоматтык түрдө иштетилет</item>
-      <item quantity="one">1 ырааттама автоматтык түрдө иштетилет</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 саат}other{# саат}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 мүнөт}other{# мүнөт}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Өчүк}=1{Өчүк / 1 ырааттама автоматтык түрдө иштетилет}other{Өчүк / # ырааттама автоматтык түрдө иштетилет}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"\"Тынчымды алба\" режимин эмне үзгүлтүккө учуратышы мүмкүн"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Байланыштар"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Колдонмолор"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Маанилүү эмес билдирмелерге үнсүз режим автоматтык түрдө коюлат"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Ыңгайлаштырылуучу билдирменин ирети"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Билдирмелерди ылайыктуулугу боюнча автоматтык түрдө иреттөө"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Ыңгайлаштырылуучу билдирмелер жөнүндө пикир билдирүү"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Билдирмелерге киргизилген тууралоолорду жана тутумга пикир билдирүү опциясын көрсөтүү"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Сунушталган аракеттер жана жооптор"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Сунушталган аракеттер менен жооптор автоматтык түрдө көрүнөт"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Акыркы жана тындырылган билдирмелер көрүнөт"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"\"Тынчымды алба\" функциясы"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"\"Тынчымды алба\" режимине уруксат берүү"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Орнотулган колдонмолор үчүн \"Тынчымды алба\" функциясы талап кылынбайт"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Колдонмолор жүктөлүүдө…"</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Колдонмолор жүктөлүүдө…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Өтүнүчүңүз боюнча Android бул колдонмонун билдирмелерин бул түзмөктө көрсөтпөй, жашырып жатат"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Суранычыңыз боюнча Android ушул категориядагы билдирмелерди бул түзмөктөн көрсөтпөй, бөгөттөп жатат"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Суранычыңыз боюнча Android ушул категориядагы билдирмелерди бул түзмөктөн көрсөтпөй, бөгөттөп жатат"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Бардык жазышуулар"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Маанилүү жазышуулар"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Эч бири"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> жазышуу</item>
-      <item quantity="one">1 жазышуу</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Эч бири"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Жок}=1{1 жазышуу}other{# жазышуу}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"\"Тынчымды алба\" режими таасир этпеген колдонуучулар"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Чалуулар"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Чалуулар"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Маанилүү чалууларды өткөрүп жибербөө үчүн, түзмөгүңүздүн үнүн чыгарып коюңуз."</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Кирүүчү чалуулар \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" эрежеси менен бөгөттөлгөн. Достордун, үй-бүлө мүчөлөрүнүн же башка тааныштарыңыздын чалууларын кабыл алуу үчүн жөндөөлөрдү тууралап алыңыз."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Жылдызчаланган байланыштар"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other">Башка <xliff:g id="NUM_PEOPLE">%d</xliff:g> байланыш</item>
-      <item quantity="one">Башка 1 байланыш</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Жок"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Жок}=1{{contact_1}}=2{{contact_1} жана {contact_2}}=3{{contact_1}, {contact_2} жана {contact_3}}other{{contact_1}, {contact_2} жана дагы #}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Билдирүүлөр"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"билдирүүлөр"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Билдирүүлөр"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"\"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" эрежеси иштетилгенде, билдирүүлөр алынбайт. Достордун, үй-бүлө мүчөлөрүнүн же башка тааныштарыңыздын билдирүүлөрүн алуу үчүн жөндөөлөрдү тууралап алыңыз."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"\"Тынчымды алба\" режими айрым билдирүүлөр үчүн иштебейт"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"\"Тынчымды алба\" режими айрым чалуулар үчүн иштебейт"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Жок"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> байланыш</item>
-      <item quantity="one">1 байланыш</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Жок}=1{1 байланыш}other{# байланыш}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Баары"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Байланыштар"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Жылдызчаланган байланыштар"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Бардык билдирмелер"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Айрым билдирмелер"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Колдонмолор үчүн \"Тынчымды алба\" режими иштетилген болсо да, тандалган адамдар сиз менен баары бир байланыша беришет."</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> үзгүлтүккө учуратышы мүмкүн</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> үзгүлтүккө учуратышы мүмкүн</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"Дагы <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Бир да колдонмо үзгүлтүккө учурата албайт}=1{{app_1} үзгүлтүккө учурата алат}=2{{app_1} жана {app_2} үзгүлтүккө учурата алат}=3{{app_1}, {app_2} жана {app_3} үзгүлтүккө учурата алат}other{{app_1}, {app_2} жана дагы # үзгүлтүккө учурата алат}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Колдонмолор"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Бардык билдирмелер"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Айрым билдирмелер"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"\"Тынчымды алба\" режими таасир этпеген билдирмелер"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Бардык билдирмелерге уруксат берүү"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> үзгүлтүккө учуратышы мүмкүн</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> үзгүлтүккө учуратышы мүмкүн</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Эч нерсе үзгүлтүккө учурата албайт"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"Дагы <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Эч нерсе үзгүлтүккө учурата албайт}=1{{sound_category_1} үзгүлтүккө учурата алат}=2{{sound_category_1} жана {sound_category_2} үзгүлтүккө учурата алат}=3{{sound_category_1}, {sound_category_2} жана {sound_category_3} үзгүлтүккө учурата алат}other{{sound_category_1}, {sound_category_2} жана дагы # үзгүлтүккө учурата алат}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Эч нерсе үзгүлтүккө учурата албайт"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Эч ким үзгүлтүккө учурата албайт"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Айрым байланыштар үзгүлтүккө учуратышы мүмкүн"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Бардык байланыштар үзгүлтүккө учуратышы мүмкүн"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB\'ни көзөмөлдөгөн түзмөк:"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Туташкан түзмөк"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Ушул түзмөк"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Которулууда..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Которулууда…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Которулбай калды"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Бул түзмөктү кубаттап жатат"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Туташкан түзмөктү кубаттоо"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Кеңири маалымат"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Трафикти үнөмдөө"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Чексиз трафик"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Фондук дайындар өчүрүлгөн"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Фондогу дайындарды колдонуу өчүрүлдү"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Күйүк"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Өчүк"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Трафикти үнөмдөө режимин иштетүү"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Түзмөк кулпуланып турса, эскертмелерде жооптор жана башка тексттер жазылбасын"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Демейки орфография текшергич"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Орфографияны текшергич тандаңыз"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Орфографияны текшергичти колдонуу"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Орфография текшергичин колдонуу"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Тандалган жок"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(эч бири)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Орун бошотуу үчүн сактагычты көзөмөлдөгүч камдык көчүрмөсү сакталган сүрөттөр менен видеолорду жок кылат."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Сүрөттөрдү жана видеолорду алып салуу"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Сактагычты көзөмөлдөгүч"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Сактагычты көзөмөлдөгүчтү колдонуу"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Сактагычты башкаргыч куралын колдонуу"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Автоматтык"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Кол менен"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Орун бошотуу"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Убакытты жана билдирмелерди текшерүү үчүн, эки жолу басуу"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Планшетти текшерүү үчүн, эки жолу таптаңыз"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Түзмөктү текшерүү үчүн, эки жолу таптаңыз"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Билдирмелер үчүн сүрүү"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Билдирмелериңизди көрсөтүү үчүн, экрандын ылдый жагынан төмөн көздөй сүрүңүз"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Бир кол режими"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Бир кол режимин колдонуу"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Колдонмолор которуштурулганда чыгуу"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Таймаут"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 секунд"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 секунд"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 секунд"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"бир кол менен колдонуу"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Убакытты, билдирмелерди жана башка маалыматты көрүү үчүн, экраныңызды эки жолу таптаңыз."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Билдирмелерди текшерүү үчүн, телефонду көтөрүү"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Планшетти текшерүү үчүн, көтөрүңүз"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Планшетти текшерүү үчүн, басып коюу"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Түзмөктү текшерүү үчүн, басып коюу"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Убакытты, билдирмелерди жана башка маалыматты көрүү үчүн, экранды таптап коюңуз."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Сирена баскычы"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Күйгүзүү/өчүрүү баскычын 5 жолу катары менен басып, SOS аракеттерин иштетиңиз."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Эскертүү добушу"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Аракеттерди аткарып баштоодон мурда эскертүү"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Өзгөчө кырдаал байланыштары"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Билдирмелерди манжа изинин сенсору менен көрүү"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Манжа изинин сканери"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Билдирмелериңизди текшерүү үчүн, телефондун аркасындагы манжа изинин сенсорун ылдый сүртүп коюңуз"</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Бардык колдонмолор үчүн иштетүү"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Графикалык драйвер тандоо"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Демейки"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Оюн драйвери"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Оюн драйвери"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Иштеп чыгуучунун драйвери"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Тутумдун графикалык драйвери"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Тармактар табылбай койду. Кайталап көрүңүз."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(тыюу салынган)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"SIM-карта жок"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM-карта"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"SIM-карта жок"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Жок"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"SIM-картаны туташтыруу талап кылынат"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"<xliff:g id="WIRELESS_CARRIER">%s</xliff:g> SIM-картасын туташтыруу талап кылынат"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Тандалган тармак режими: WCDMA тандалган"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Тандалган тармак режими: GSM гана"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Тандалган тармак режими: WCDMA гана"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Мобилдик Интернет"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Интернетке мобилдик тармак аркылуу чыгуу"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Тейлөө аймагына келгенде, телефон автоматтык түрдө бул операторго которулат"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"SIM-карта жеткиликсиз"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Чалуулардын параметрлери"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS билдирүүлөрүнүн параметрлери"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Ар дайым суралсын"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Колдонмолорду жөндөөлөрдүн үстүнө коюуга уруксат берүү"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Башка колдонмолордун үстүнөн көрүнгөн колдонмолорго Жөндөөлөр экранынын үстүнөн да көрүнүүгө уруксат берүү"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Медиа"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Медиа сеанс аягына чыгарылганда ойноткучту жашыруу"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Бул ойноткуч сеансты жайылып көрсөтүлгөн Ыкчам жөндөөлөр панелинде улантууга мүмкүнчүлүк берет."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Ыкчам жөндөөлөрдөгү Медиа ойноткуч"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Ойнотууну оңой улантуу үчүн, медиа ойноткучту узагыраак убакытка көрсөтүңүз"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Ойноткучту жашыруу"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Ойноткучту көрсөтүү"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Ойноткучтар жеткиликсиз"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Уруксат берилген колдонмолор"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"медиа"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth күйгүзүлөт"</string>
 </resources>
diff --git a/res/values-lo/arrays.xml b/res/values-lo/arrays.xml
index 2568a52..8cc06d3 100644
--- a/res/values-lo/arrays.xml
+++ b/res/values-lo/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"ຂະໜາດກາງ"</item>
     <item msgid="6740026006576843477">"ຍາວ"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"ສັ້ນ"</item>
+    <item msgid="7397961711906421599">"ກາງ"</item>
+    <item msgid="4079132024502041928">"ຍາວ"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"ຄ່າເລີ່ມຕົ້ນ"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"ທົ່ວໂລກ"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA ເທົ່ານັ້ນ"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"ທົ່ວໂລກ"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 0f65f1e..12dfb9c 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"ສະແດງຂໍ້ມູນໂປຣໄຟລ໌ໃນໜ້າຈໍລັອກ"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"ບັນຊີ"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"ສະຖານທີ່"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"ໃຊ້​ສະຖານທີ່"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"ໃຊ້ສະຖານທີ່"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"ປິດ"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">ເປີດ - <xliff:g id="COUNT_1">%1$d</xliff:g> ແອັບມີສິດເຂົ້າເຖິງສະຖານທີ່</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"ໃຊ້ໃບໜ້າຂອງທ່ານເພື່ອພິສູດຢືນຢັນ"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"ເລີ່ມ"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"ຫາກປິດການປົດລັອກດ້ວຍໃບໜ້າແບບຊ່ວຍເຂົ້າເຖິງໄວ້, ຂັ້ນຕອນການຕັ້ງຄ່າບາງຢ່າງອາດບໍ່ສາມາດເຮັດວຽກກັບ TalkBack ໄດ້ຕາມປົກກະຕິ."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"ກັບຄືນ"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"ສືບຕໍ່ການຕັ້ງຄ່າ"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"ໃຊ້ການຕັ້ງຄ່າການຊ່ວຍເຂົ້າເຖິງ"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="one">ຕ້ອງມີໜ້ອຍກວ່າ <xliff:g id="NUMBER_0">%d</xliff:g> ຕົວເລກ</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"ຜູ້ເບິ່ງແຍງລະບົບອຸປະກອນບໍ່ອະນຸຍາດໃຫ້ໃຊ້ລະຫັດ PIN ເມື່ອບໍ່ດົນມານີ້"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"ລະຫັດ PIN ທົ່ວໄປແມ່ນຖືກບລັອກໂດຍຜູ້ເບິ່ງແຍງລະບົບໄອທີຂອງທ່ານ. ໃຫ້ລອງໃຊ້ລະຫັດ PIN ອື່ນແທນ."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"ນີ້ບໍ່ສາມາດຮວມມີຕົວອັກສອນທີ່ບໍ່ຖືກຕ້ອງນຳໄດ້"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"ຕ້ອງມີຢ່າງໜ້ອຍໜຶ່ງຕົວອັກສອນ"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"ຕ້ອງມີຢ່າງໜ້ອຍໜຶ່ງຕົວເລກ"</string>
@@ -653,7 +655,6 @@
       <item quantity="one">ຕ້ອງມີຕົວອັກສອນທີ່ບໍ່ແມ່ນຕົວເລກຢ່າງໜ້ອຍ 1 ຕົວ</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"ຜູ້ເບິ່ງແຍງລະບົບບໍ່ອະນຸຍາດໃຫ້ໃຊ້ລະຫັດຜ່ານເມື່ອບໍ່ດົນມານີ້ໄດ້"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"ລະຫັດຜ່ານທົ່ວໄປແມ່ນຖືກບລັອກໂດຍຜູ້ເບິ່ງແຍງລະບົບໄອທີຂອງທ່ານ. ໃຫ້ລອງໃຊ້ລະຫັດອື່ນແທນ."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"ນ້ອຍຫາໃຫຍ່, ໃຫຍ່ຫານ້ອຍ ຫຼື ຊຸດຕົວເລກຊ້ຳໆແມ່ນບໍ່ສາມາດໃຊ້ໄດ້"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"ຢືນຢັນ"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"ຍົກເລີກ"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi​-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"ເປີດໃຊ້ Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi​-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"ໃຊ້ Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"ໃຊ້ Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"ການຕັ້ງຄ່າ Wi​-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi​-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"ຕັ້ງຄ່າ &amp; ຈັດການຈຸດການເຂົ້າໃຊ້ລະບົບໄຮ້ສາຍ"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"ວາງລະຫັດ QR ໄວ້ທາງກາງຢູ່ລຸ່ມເພື່ອເຊື່ອມຕໍ່ຫາ “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"ເຂົ້າຮ່ວມ Wi‑Fi ໂດຍການສະແກນລະຫັດ QR"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"ແບ່ງປັນ Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"ສະແກນລະຫັດ QR ນີ້ເພື່ອເຊື່ອມຕໍ່ຫາ “<xliff:g id="SSID">%1$s</xliff:g>” ແລະ ແບ່ງປັນລະຫັດຜ່ານ"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"ກະລຸນາສະແກນລະຫັດ QR ນີ້ດ້ວຍອຸປະກອນອື່ນເພື່ອເຂົ້າຮ່ວມ “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"ສະແກນລະຫັດ QR ນີ້ເພື່ອເຊື່ອມຕໍ່ຫາ “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"ລອງໃໝ່ອີກເທື່ອໜຶ່ງ. ຫາກຍັງຄົງພົບບັນຫາຢູ່, ກະລຸນາຕິດຕໍ່ຜູ້ຜະລິດອຸປະກອນ"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"ມີບາງຢ່າງຜິດພາດ"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"ລະຫັດຜ່ານ Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"ລະຫັດຜ່ານຮັອດສະປອດ: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"ເຊື່ອມຕໍ່ອັດຕະໂນມັດ"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"ອະນຸຍາດໃຫ້ໂທລະສັບເຊື່ອມຕໍ່ໃກ້ເຄືອຂ່າຍນີ້ໂດຍອັດຕະໂນມັດ"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"ອະນຸຍາດໃຫ້ແທັບເລັດເຊື່ອມຕໍ່ໃກ້ເຄືອຂ່າຍນີ້ໂດຍອັດຕະໂນມັດ"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"ອະນຸຍາດການເຊື່ອມຕໍ່ຫາເຄືອຂ່າຍນີ້ເມື່ອຢູ່ໃນໄລຍະ"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"ເພີ່ມອຸປະກອນ"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"ໃຊ້ລະຫັດ QR ເພື່ອເພີ່ມອຸປະກອນໃສ່ເຄືອຂ່າຍນີ້"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"ຮູບແບບລະຫັດ QR ບໍ່ຖືກຕ້ອງ"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"ໃຊ້ໃບຮັບຮອງລະບົບ"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"ບໍ່ໃຫ້"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"ບໍ່ກວດຮັບຮອງ"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"ບໍ່ໄດ້ລະບຸໃບຢັ້ງຢືນໃດໆ. ການເຊື່ອມຕໍ່ຂອງທ່ານຈະບໍ່ເປັນສ່ວນຕົວ."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"ຊື່ເຄືອຂ່າຍຍາວເກີນໄປ."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"ຕ້ອງລະບຸໂດເມນ."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"ຕ້ອງມີໃບຮັບຮອງ."</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"ເຊື່ອມຕໍ່"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"ເປີດໃຊ້ Wi-Fi ແລ້ວ"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"ເຊື່ອມຕໍ່ຫາ <xliff:g id="NETWORK_NAME">%1$s</xliff:g> ແລ້ວ"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"ກຳລັງເຊື່ອມຕໍ່ຫາ <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"ກຳລັງເຊື່ອມຕໍ່…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"ລົ້ມເຫລວໃນການເຊື່ອມຕໍ່ເຄືອຂ່າຍ"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"ເຄືອຂ່າຍບໍ່ຢູ່ໃນໄລຍະ"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"ແອັບກຳລັງແບ່ງປັນເນື້ອຫາ. ເພື່ອແບ່ງປັນອິນເຕີເນັດ, ໃຫ້ປິດຮັອດສະປອດໄວ້ກ່ອນ ຈາກນັ້ນເປີດຄືນໃໝ່"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"ບໍ່ໄດ້ຕັ້ງລະຫັດຜ່ານ"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"ຊື່ຮັອດສະປອດ"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"ກຳລັງເປີດໃຊ້ <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"ກຳລັງເປີດໃຊ້ <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"ອຸປະກອນອື່ນສາມາດເຊື່ອມຕໍ່ຫາ <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ໄດ້"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"ລະຫັດຜ່ານຮັອດສະປອດ"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"ຄື້ນ AP"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"ເພີ່ມຣີເຟຣຊເຣດຈາກ 60 ເປັນ 90 Hz ສຳລັບບາງເນື້ອຫາໂດຍອັດຕະໂນມັດ. ເພີ່ມການນຳໃຊ້ແບັດເຕີຣີ."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"ບັງຄັບໃຫ້ເປັນຣີເຟຣດເຣດ 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"ຣີເຟຣດເຣດສູງສຸດເພື່ອປັບປຸງການຕອບສະໜອງການສຳຜັດ ແລະ ຄຸນນະພາບອະນິເມຊັນ. ເພີ່ມການນຳໃຊ້ແບັດເຕີຣີ."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"ການເອົາໃຈໃສ່ໜ້າຈໍ"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"ເປີດ / ໜ້າຈໍຈະບໍ່ປິດຫາກທ່ານເບິ່ງມັນຢູ່"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"ເວີຊັນຂອງ Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"ອັບເດດຄວາມປອດໄພ Android"</string>
     <string name="model_info" msgid="8997566254717810904">"ໂມເດວ"</string>
-    <string name="model_summary" msgid="2246651782442466213">"ໂມເດວ: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"ໂມເດວ ແລະ ຮາດແວ"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"ເວີຊັນຂອງຮາດແວ"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ໝາຍເລກອຸປະກອນ"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"​ການ​ຕັ້ງ​ຄ່າ​ເຄືອ​ຂ່າຍ​ຖືກຕັ້ງ​ຄ່າ​ຄືນ​ໃໝ່​ແລ້ວ."</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"ບໍ່ສາມາດລຶບ SIM ອອກໄດ້"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"ບໍ່ສາມາດລຶບຂໍ້ມູນ SIM ທີ່ດາວໂຫລດມາໄດ້ເນື່ອງຈາກມີຂໍ້ຜິດພາດຂຶ້ນ.\n\nກະລຸນາຣີສະຕາດແອັບຂອງທ່ານແລ້ວລອງໃໝ່."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"ລຶບຂໍ້ມູນທັງໝົດ (ຣີເຊັດເປັນຄ່າຈາກໂຮງງານ)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"ລຶບຂໍ້ມູນທັງໝົດ (ຣີເຊັດເປັນຄ່າຈາກໂຮງງານ)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"ນີ້ຈະເປັນການລຶບຂໍ້ມູນທັງໝົດຈາກ "<b>"ໜ່ວຍຄວາມຈຳພາຍໃນ"</b>" ຂອງແທັບເລັດຂອງທ່ານ, ຮວມທັງ:\n\n"<li>"ບັນຊີ Google ຂອງທ່ານ"</li>\n<li>"ຂໍ້ມູນ ແລະ ການຕັ້ງຄ່າຂອງລະບົບ ແລະ ແອັບພລິເຄຊັນ"</li>\n<li>"ແອັບທີ່ດາວໂຫລດມາ"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"ນີ້ຈະເປັນການລຶບຂໍ້ມູນທັງໝົດໃນ "<b>"ໜ່ວຍຄວາມຈຳພາຍໃນ"</b>" ຂອງໂທລະສັບທ່ານ ຮວມທັງ:\n\n"<li>"ບັນຊີ Google ຂອງທ່ານ"</li>\n<li>"ຂໍ້ມູນ ແລະ ການຕັ້ງຄ່າຂອງລະບົບ ແລະ ແອັບພລິເຄຊັນ"</li>\n<li>"ແອັບພລິເຄຊັນທີ່ດາວໂຫລດມາ"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"ປັດຈຸບັນທ່ານກຳລັງເຂົ້າສູ່ລະບົບບັນຊີຕໍ່ໄປນີ້:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"ມີ​ຜູ້​ໃຊ້​ອື່ນ​ຢູ່​ເທິງ​ອຸ​ປະ​ກອນ​ນີ້.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"ເພງ"</li>\n<li>"ຮູບພາບ"</li>\n<li>"ຂໍ້ມູນຜູ່ໃຊ້ອື່ນໆ"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"ນີ້ຈະບໍ່ແມ່ນການຍົກເລີກແພັກເກດບໍລິການມືຖືຂອງທ່ານ."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"ເພື່ອລຶບເພງ, ຮູບພາບ ແລະ ຂໍ້ມູນຜູ້ໃຊ້ອື່ນໆ, ຈະຕ້ອງລຶບ "<b>"ບ່ອນຈັດເກັບຂໍ້ມູນ USB"</b>" ອອກນຳ."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"ເພື່ອລຶບເພງ, ຮູບພາບ ແລະ ຂໍ້ມູນຜູ້ໃຊ້ອື່ນໆ, ຈະຕ້ອງລຶບ "<b>"ບ່ອນຈັດເກັບຂໍ້ມູນ USB"</b>" ອອກນຳ."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"ລຶບຂໍ້ມູນທັງໝົດ (ຣີເຊັດເປັນຄ່າຈາກໂຮງງານ)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"ລຶບຂໍ້ມູນທັງໝົດ (ຣີເຊັດເປັນຄ່າຈາກໂຮງງານ)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"ນີ້ຈະເປັນການລຶບຂໍ້ມູນທັງໝົດຈາກ "<b>"ພື້ນທີ່ຈັດເກັບພາຍໃນ"</b>" ຂອງແທັບເລັດຂອງທ່ານ, ຮວມທັງ:\n\n"<li>"ບັນຊີ Google ຂອງທ່ານ"</li>\n<li>"ຂໍ້ມູນ ແລະ ການຕັ້ງຄ່າຂອງລະບົບ ແລະ ແອັບພລິເຄຊັນ"</li>\n<li>"ແອັບທີ່ດາວໂຫຼດມາ"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"ນີ້ຈະເປັນການລຶບຂໍ້ມູນທັງໝົດໃນ "<b>"ພື້ນທີ່ຈັດເກັບພາຍໃນ"</b>" ຂອງໂທລະສັບທ່ານ, ຮວມທັງ:\n\n"<li>"ບັນຊີ Google ຂອງທ່ານ"</li>\n<li>"ຂໍ້ມູນ ແລະ ການຕັ້ງຄ່າຂອງລະບົບ ແລະ ແອັບພລິເຄຊັນ"</li>\n<li>"ແອັບພລິເຄຊັນທີ່ດາວໂຫຼດມາ"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"ຕອນນີ້ທ່ານກຳລັງເຂົ້າສູ່ລະບົບບັນຊີຕໍ່ໄປນີ້:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"ມີ​ຜູ້​ໃຊ້​ອື່ນ​ຢູ່​ເທິງ​ອຸ​ປະ​ກອນ​ນີ້.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"ເພງ"</li>\n<li>"ຮູບພາບ"</li>\n<li>"ຂໍ້ມູນຜູ້ໃຊ້ອື່ນໆ"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"ນີ້ຈະບໍ່ແມ່ນການຍົກເລີກແພັກເກດບໍລິການມືຖືຂອງທ່ານ."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"ເພື່ອລຶບເພງ, ຮູບພາບ ແລະຂໍ້ມູນຜູ້ໃຊ້ອື່ນໆ, ຈະຕ້ອງລຶບ "<b>"ບ່ອນຈັດເກັບຂໍ້ມູນ USB"</b>" ອອກນຳ."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"ເພື່ອລຶບເພງ, ຮູບພາບ ແລະຂໍ້ມູນຜູ້ໃຊ້ອື່ນໆ, ຈະຕ້ອງລຶບ "<b>"SD card"</b>" ອອກນຳ."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"ລຶບພື້ນທີ່ຈັດເກັບຂໍ້ມູນ USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"ລຶບຂໍ້ມູນ SD card"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"ລຶບຂໍ້ມູນທຸກຢ່າງທີ່ຢູ່ໃນພື້ນທີ່ຈັດເກັບຂໍ້ມູນ USB ພາຍໃນ ເຊັ່ນເພງ ຫຼືຮູບພາບ"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"ລຶບຂໍ້ມູນທັງໝົດໃນ SD card ເຊັ່ນ: ເພງ ແລະຮູບພາບ"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"ລຶບຂໍ້ມູນທັງໝົດ"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"ລຶບຂໍ້ມູນທັງໝົດ"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"ຂໍ້ມູນສ່ວນຕົວຂອງທ່ານ ແລະ ແອັບທີ່ດາວໂຫຼດມາທັງໝົດຈະຖືກລຶບອອກ. ທ່ານບໍ່ສາມາດຍົກເລີກຄຳສັ່ງນີ້ໄດ້."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"ຂໍ້ມູນສ່ວນຕົວທັງໝົດຂອງທ່ານ, ຮວມທັງແອັບທີ່ດາວໂຫລດມາແລ້ວ ແລະ SIM ຈະຖືກລຶບອອກ. ທ່ານບໍ່ສາມາດຍົກເລີກຄຳສັ່ງນີ້ໄດ້."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"ລຶບທຸກສິ່ງທຸກຢ່າງ"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"ບໍ່ໄດ້ດຳເນີນການຣີເຊັດເທື່ອ ເນື່ອງຈາກບໍລິການ System Clear ບໍ່ສາມາດເຮັດວຽກໄດ້."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"ລຶບຂໍ້ມູນທັງໝົດບໍ?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"ຜູ່​ໃຊ້​ນີ້​ບໍ່​ສາ​ມາດ​ຣີ​ເຊັດ​ຄ່າ​ໂຮງ​ງານ​​ໄດ້"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"ກຳລັງລຶບ"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"ກະລຸນາລໍຖ້າ..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"ລຶບຂໍ້ມູນທັງໝົດ"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"ລຶບຂໍ້ມູນທັງໝົດ"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"ຂໍ້ມູນສ່ວນຕົວຂອງທ່ານ ແລະ ແອັບທີ່ດາວໂຫຼດມາທັງໝົດຈະຖືກລຶບອອກ. ທ່ານບໍ່ສາມາດຍົກເລີກຄຳສັ່ງນີ້ໄດ້."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"ຂໍ້ມູນສ່ວນຕົວທັງໝົດຂອງທ່ານ, ຮວມທັງແອັບທີ່ດາວໂຫຼດມາແລ້ວ ແລະ SIM ຈະຖືກລຶບອອກ. ທ່ານບໍ່ສາມາດຍົກເລີກຄຳສັ່ງນີ້ໄດ້."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"ລຶບຂໍ້ມູນທັງໝົດອອກບໍ?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"ຜູ້​ໃຊ້​ນີ້​ບໍ່​ສາ​ມາດ​ຣີ​ເຊັດ​ຄ່າ​ໂຮງ​ງານ​​ໄດ້"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"ກຳລັງລຶບ"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"ກະລຸນາລໍຖ້າ…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"ຕັ້ງຄ່າການໂທ"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"ຕັ້ງຄ່າຂໍ້ຄວາມສຽງ, ການໂອນສາຍ, ສາຍຊ້ອນ, ID ຜູ່ໂທ"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"ການປ່ອຍສັນຍານຜ່ານ USB"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"ບໍ່ສາມາດປ່ອຍສັນຍານໃຫ້ໄດ້ຫຼາຍກວ່າ <xliff:g id="MAXCONNECTION">%1$d</xliff:g> ອຸປະກອນ."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ຈະຖືກຍົກເລີກການປ່ອຍສັນຍານ."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"ການປ່ອຍສັນຍານ Ethernet"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"ແບ່ງປັນອິນເຕີເນັດຂອງໂທລະສັບຜ່ານທາງ USB Ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"ແບ່ງປັນອິນເຕີເນັດຂອງໂທລະສັບຜ່ານທາງ Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"ໃຊ້ຮັອດສະປອດ ແລະ ການປ່ອຍສັນຍານເພື່ອສະໜອງອິນເຕີເນັດໃຫ້ອຸປະກອນອື່ນຜ່ານທາງການເຊື່ອມຕໍ່ອິນເຕີເນັດມືຖືຂອງທ່ານ. ແອັບຕ່າງໆສາມາດສ້າງຮັອດສະປອດ ແລະ ແບ່ງປັນເນື້ອຫາກັບອຸປະກອນທີ່ຢູ່ໃກ້ຄຽງໄດ້."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"ໃຊ້ຮັອດສະປອດ ແລະ ການປ່ອຍສັນຍານເພື່ອສະໜອງອິນເຕີເນັດໃຫ້ກັບອຸປະກອນອື່ນຜ່ານການເຊື່ອມຕໍ່ Wi‑Fi ຫຼື ອິນເຕີເນັດມືຖືຂອງທ່ານ. ແອັບສາມາດສ້າງຮັອດສະປອດເພື່ອແບ່ງປັນເນື້ອຫາກັບອຸປະກອນທີ່ຢູ່ໃກ້ຄຽງໄດ້ນຳ."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"ຊ່ວຍເຫຼືອ"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"ການຕັ້ງຄ່າຄຳບັນຍາຍ"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"ການຂະຫຍາຍ"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"ພື້ນທີ່ການຂະຫຍາຍ"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"ເປີດການນຳໃຊ້ການຂະຫຍາຍ"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"ເລືອກພື້ນທີ່ການຂະຫຍາຍທີ່ທ່ານຕ້ອງການໃຊ້ເມື່ອຂະຫຍາຍໜ້າຈໍ"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"ເຕັມຈໍ"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"ບາງສ່ວນຂອງໜ້າຈໍ"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"ເຕັມຈໍ ແລະ ບາງສ່ວນຂອງຈໍ"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"ຂະຫຍາຍທັງໜ້າຈໍ"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"ຂະຫຍາຍບາງສ່ວນຂອງໜ້າຈໍ"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"ສະຫຼັບໄປໃຊ້ປຸ່ມການຊ່ວຍເຂົ້າເຖິງບໍ?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"ການແຕະສາມເທື່ອເພື່ອຂະຫຍາຍບາງສ່ວນຂອງໜ້າຈໍຈະເຮັດໃຫ້ການພິມ ແລະ ຄຳສັ່ງອື່ນໆຊ້າລົງ.\n\nທ່ານຕ້ອງການສະຫຼັບໄປໃຊ້ປຸ່ມການຊ່ວຍເຂົ້າເຖິງເພື່ອຂະຫຍາຍບໍ່?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"ສະຫຼັບໄປໃຊ້ປຸ່ມການຊ່ວຍເຂົ້າເຖິງ"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"ເກັບການແຕະສາມເທື່ອເພື່ອຂະຫຍາຍໄວ້"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"ການຕັ້ງຄ່າການຂະຫຍາຍ"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"ຂະຫຍາຍດ້ວຍການແຕະສາມເທື່ອ"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"ຂະຫຍາຍດ້ວຍທາງລັດ"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"ກົດປຸ່ມ ປິດ/ເປີດ ເພື່ອວາງສາຍ"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"ຕົວຊີ້ເມົ້າຂະໜາດໃຫຍ່"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"ລຶບການເຄື່ອນໄຫວອອກ"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"ສຽງໂມໂນ"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"ຮວມຊ່ອງເມື່ອຫຼິ້ນສຽງ"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"ສົມດຸນສຽງ"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"ຊ້າຍ"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"ຂວາ"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"ສຽງໂມໂນ"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"ຮວມຊ່ອງເມື່ອຫຼິ້ນສຽງ"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"ສົມດຸນສຽງ"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"ຊ້າຍ"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"ຂວາ"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"ຄ່າເລີ່ມຕົ້ນ"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 ວິນາທີ"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 ວິນາທີ"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"ການແຈ້ງເຕືອນແບບສັ່ນເຕືອນ"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"ສຽງພ້ອມການສັ່ນເຕືອນ"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"ການຕອບສະໜອງການສຳຜັດ"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"ໃຊ້ <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"ເປີດ <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"ໃຊ້ການປັບແຕ່ງສີ"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"ສະແດງຄຳບັນຍາຍ"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"ສຳລັບແອັບທີ່ຮອງຮັບເທົ່ານັ້ນ"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"ໃຊ້ <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"ເປີດ <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"ໃຊ້ການແກ້ໄຂສີ"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"ສະແດງຄຳບັນຍາຍ"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"ສຳລັບແອັບທີ່ຮອງຮັບເທົ່ານັ້ນ"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"ຂະໜາດ ແລະ ຮູບແບບຄຳບັນຍາຍ"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"ຂະໜາດຕົວອັກສອນ <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"ຕົວເລືອກເພີ່ມເຕີມ"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"ຕາບອດຈາງສີຂຽວ"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"ຕາບອດຈາງສີແດງ"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"ຕາບອດຈາງສີຟ້າ"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"ຂາວດຳ"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"ສີແດງ-ຂຽວ"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"ສີແດງ-ຂຽວ"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"ສີຟ້າ-ເຫຼືອງ"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"ການຈຳກັດການນຳໃຊ້ໃນພື້ນຫຼັງ"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"ອະນຸຍາດໃຫ້ແອັບເຮັດວຽກໃນພື້ນຫຼັງໄດ້"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"ແອັບບໍ່ອະນຸຍາດໃຫ້ໃຊ້ໃນພື້ນຫຼັງໄດ້"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"ບໍ່ສາມາດຈຳກັດການນຳໃຊ້ໃນພື້ນຫຼັງໄດ້"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"ບໍ່ສາມາດຈຳກັດການນຳໃຊ້ໃນພື້ນຫຼັງໄດ້"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"ຈຳກັດການເຄື່ອນໄຫວໃນພື້ນຫຼັງບໍ?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"ຫາກທ່ານຈຳກັດການເຄື່ອນໄຫວໃນພື້ນຫຼັງສຳລັບແອັບໃດໜຶ່ງ, ມັນຈະເຮັດວຽກຜິດປົກກະຕິ"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"ເນື່ອງຈາກແອັບນີ້ຍັງບໍ່ໄດ້ປັບແຕ່ງໃຫ້ໃຊ້ແບັດເຕີຣີໄດ້ຢ່າງເໝາະສົມເທື່ອ, ທ່ານຈຶ່ງບໍ່ສາມາດຈຳກັດມັນໄດ້.\n\nເພື່ອຈຳກັດແອັບດັ່ງກ່າວ, ໃຫ້ເປີດການປັບແຕ່ງແບັດເຕີຣີໃຫ້ເໝາະສົມກ່ອນ."</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"ຕັ້ງກຳນົດເວລາ"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"ຂະຫຍາຍອາຍຸແບັດເຕີຣີ"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"ປິດເມື່ອສາກເຕັມແລ້ວ"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"ປິດຕົວປະຢັດແບັດເຕີຣີເມື່ອໂທລະສັບຂອງທ່ານເຫຼືອ <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"ປິດຕົວປະຢັດແບັດເຕີຣີເມື່ອແທັບເລັດຂອງທ່ານເຫຼືອ <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"ປິດຕົວປະຢັດແບັດເຕີຣີເມື່ອອຸປະກອນຂອງທ່ານເຫຼືອ <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"ຕົວປະຢັດ​ແບັດເຕີຣີຈະປິດເມື່ອໂທລະສັບຂອງທ່ານມີແບັດເຕີຣີເກີນ <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"ຕົວປະຢັດ​ແບັດເຕີຣີຈະປິດເມື່ອແທັບເລັດຂອງທ່ານມີແບັດເຕີຣີເກີນ <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"ຕົວປະຢັດ​ແບັດເຕີຣີຈະປິດເມື່ອອຸປະກອນຂອງທ່ານມີແບັດເຕີຣີເກີນ <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"ເປີດ"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"ຣີເຊັດ"</string>
     <string name="tts_play" msgid="2945513377250757221">"ຫຼິ້ນ"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"ການເຊື່ອມຕໍ່ແບບປັບຕົວໄດ້"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"ຍືດອາຍຸແບັດເຕີຣີ ແລະ ປັບປຸງປະສິດທິພາບອຸປະກອນໂດຍອັດຕະໂນມັດດ້ວຍການຈັດການການເຊື່ອມຕໍ່ເຄືອຂ່າຍຂອງທ່ານ"</string>
     <string name="credentials_title" msgid="7535942196886123656">"ພື້ນທີ່ຈັດເກັບຂໍ້ມູນຮັບຮອງ"</string>
     <string name="credentials_install" msgid="3933218407598415827">"ຕິດຕັ້ງໃບຮັບຮອງ"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"ຕິດຕັ້ງໃບຮັບຮອງຈາກບ່ອນຈັດເກັບຂໍ້ມູນ"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"ຂໍ້ມູນປະຈໍາຕົວຜູ້ໃຊ້"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"ເບິ່ງ ແລະ ດັດ​ແປງ​ຂໍ້ມູນປະຈໍາຕົວທີ່ເກັບໄວ້"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"ຂັ້ນສູງ"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"ປະເພດພື້ນທີ່ຈັດເກັບຂໍ້ມູນ"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"ໃຊ້ຮາດແວ"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"ຊອບແວເທົ່ານັ້ນ"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"ບໍ່​ມີຂໍ້​ມູນ​​ຮັບ​ຮອງ​ໂຕສຳ​ລັບ​ຜູ່​ໃຊ້​ນີ້"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"ຕິດຕັ້ງສຳລັບ VPN ແລະ ແອັບຕ່າງໆແລ້ວ"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"ຕິດຕັ້ງສຳລັບ Wi-Fi ແລ້ວ"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"ການຈ່າຍເງິນຢູ່ເຄື່ອງຈ່າຍເງິນ"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"ຕັ້ງ​ແອັບ​ການຈ່າຍເງິນ. ຈາກນັ້ນ​ຈັບ​ດ້ານ​ຫຼັງໂທ​ລະ​ສັບ​ຂອງ​ທ່ານ​ຂຶ້ນເທິງ​ເຄື່ອງຈ່າຍເງິນ​ໃດ​ໜຶ່ງ​ທີ່​ມີ​ສັນ​ຍາ​ລັກ​ contactless​."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"ໄດ້​ແລ້ວ"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"ເພີ່ມເຕີມ..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"ເພີ່ມເຕີມ…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"ຕັ້ງແອັບການຈ່າຍເງິນເລີ່ມຕົ້ນ"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"ອັບເດດແອັບການຈ່າຍເງິນເລີ່ມຕົ້ນ"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"ຢູ່ຈຸດຈ່າຍເງິນແບບ Contactless, ໃຫ້ຈ່າຍດ້ວຍ <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"ໃຊ້​ອັນ​ນີ້​ທຸກ​ເທື່ອ​ເພື່ອ​ໂທ"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"​ເລືອກ​ຊິມ​ທີ່​ໃຊ້​ສຳ​ລັບ​ຂໍ້​ມູນ"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"ເລືອກ SIM ສຳລັບ SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"ກຳ​ລັງ​ສະ​ຫຼັບ​ SIM ຂໍ້​ມູນ, ອັນ​ນີ້​ອາດ​ຈະ​ໃຊ້​ເວ​ລາ​ເປັນ​ນາ​ທີ..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"ກຳ​ລັງ​ສະ​ຫຼັບ​ SIM ອິນເຕີເນັດ, ຂັ້ນຕອນ​ນີ້​ອາດ​ຈະ​ໃຊ້​ເວ​ລາ​ຮອດ​ນາ​ທີ…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"ໂທ​ດ້ວຍ"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"ເລືອກ SIM ກາດ"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"ກິດຈະກັດ, ກຳນົດການ, ຕົວປະຢັດແບັດເຕີຣີ, ຕົວປະຢັດໄຟ, ແບັດເຕີຣີ, ອັດຕະໂນມັດ, ເປີເຊັນ"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, ການໂທຂັ້ນສູງ, ການໂທ 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"ເພີ່ມພາສາ, ເພີ່ມພາສາໃດໜຶ່ງ"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"ຂະໜາດຂໍ້ຄວາມ"</string>
     <string name="default_sound" msgid="6604374495015245195">"​ສຽງ​ເລີ່ມ​ຕົ້ນ"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"ລະດັບສຽງໂທເຂົ້າ ແລະ ສຽງແຈ້ງເຕືອນທີ່ <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"ລະດັບສຽງ, ການສັ່ນເຕືອນ, ຫ້າມລົບກວນ"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"ສຽງຕອນເປີດເຄື່ອງ"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"ຄຳບັນຍາຍສົດ"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"ສ້າງຄຳບັນຍາຍມີເດຍໂດຍອັດຕະໂນມັດ"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"ບໍ່ມີ"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other">ຕັ້ງກຳນົດເວລາ <xliff:g id="ON_COUNT">%d</xliff:g> ລາຍການແລ້ວ</item>
-      <item quantity="one">ຕັ້ງກຳນົດເວລາ 1 ລາຍການແລ້ວ</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{ບໍ່ມີ}=1{ຕັ້ງກຳນົດເວລາ 1 ລາຍການແລ້ວ}other{ຕັ້ງກຳນົດເວລາ # ລາຍການແລ້ວ}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"ຫ້າມລົບກວນ"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"ຮັບການແຈ້ງເຕືອນສະເພາະຄົນ ແລະ ແອັບສຳຄັນເທົ່ານັ້ນ"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"ຈຳກັດການລົບກວນ"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"ສຳຄັນເທົ່ານັ້ນ"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"ເປີດ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"ປິດ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"ປິດ"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"ເປີດ"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"ຖາມທຸກເທື່ອ"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"ຈົນກວ່າທ່ານຈະປິດ"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> ຊົ່ວໂມງ</item>
-      <item quantity="one">1 ຊົ່ວໂມງ</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> ນາທີ"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other">ສາມາດເປີດໃຊ້ <xliff:g id="ON_COUNT">%d</xliff:g> ການກຳນົດເວລາໃຫ້ເປັນອັດຕະໂນມັດໄດ້</item>
-      <item quantity="one">ສາມາດເປີດໃຊ້ 1 ການກຳນົດເວລາໃຫ້ເປັນອັດຕະໂນມັດໄດ້</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 ຊົ່ວໂມງ}other{# ຊົ່ວໂມງ}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 ນາທີ}other{# ນາທີ}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{ປິດ}=1{ປິດ / ສາມາດເປີດໃຊ້ 1 ການກຳນົດເວລາໃຫ້ເປັນອັດຕະໂນມັດໄດ້}other{ປິດ / ສາມາດເປີດໃຊ້ # ການກຳນົດເວລາໃຫ້ເປັນອັດຕະໂນມັດໄດ້}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"ມີຫຍັງສາມາດລົບກວນໂໝດຫ້າມລົບກວນໄດ້ແດ່"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"ຜູ້ຄົນ"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"ແອັບ"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"ຕັ້ງການແຈ້ງເຕືອນທີ່ມີຄວາມສຳຄັນຕ່ຳກວ່າໃຫ້ເປັນແບບສຸພາບໂດຍອັດຕະໂນມັດ"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"ການຈັດອັນດັບການແຈ້ງເຕືອນແບບປັບແຕ່ງອັດຕະໂນມັດ"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"ຈັດອັນດັບການແຈ້ງເຕືອນຕາມຄວາມກ່ຽວຂ້ອງ"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"ຄຳຕິຊົມການແຈ້ງເຕືອນແບບປັບຕົວໄດ້"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"ຊີ້ບອກການປັບແຕ່ງທີ່ເກີດຂຶ້ນກັບການແຈ້ງເຕືອນ ແລະ ສະແດງຕົວເລືອກເພື່ອສົ່ງຄຳຕິຊົມຫາລະບົບ"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"ຄຳສັ່ງ ແລະ ການຕອບກັບທີ່ແນະນຳ"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"ສະແດງຄຳສັ່ງ ແລະ ການຕອບກັບທີ່ແນະນຳໂດຍອັດຕະໂນມັດ"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"ສະແດງການແຈ້ງເຕືອນຫຼ້າສຸດ ແລະ ການແຈ້ງເຕືອນທີ່ເລື່ອນໄປແລ້ວ"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"​ການເຂົ້າເຖິງ ຫ້າມ​ລົບ​ກວນ"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"ອະນຸຍາດໂໝດຫ້າມລົບກວນ"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"ບໍ່​ມີ​ການ​ຂໍ​ແອັບ​ທີ່​ຕິດ​ຕັ້ງ​ໄວ້ ​ຫາ​ຫ້າມ​ລົບ​ກວນການ​ເຂົ້າ"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"​ກຳ​ລັງ​ໂຫລດ​ແອັບຯ..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"ກໍາລັງໂຫຼດແອັບ…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"ຕາມຄຳຂໍຂອງທ່ານ, Android ຈະບລັອກການແຈ້ງເຕືອນຂອງແອັບນີ້ບໍ່ໃຫ້ປາກົດຢູ່ອຸປະກອນນີ້"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"ຕາມຄຳຂໍຂອງທ່ານ, Android ຈະບລັອກໝວດໝູ່ການແຈ້ງເຕືອນນີ້ບໍ່ໃຫ້ປາກົດຢູ່ອຸປະກອນນີ້"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"ຕາມຄຳຂໍຂອງທ່ານ, Android ຈະບລັອກກຸ່ມການແຈ້ງເຕືອນນີ້ບໍ່ໃຫ້ປາກົດຢູ່ອຸປະກອນນີ້"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"ການສົນທະນາທັງໝົດ"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"ການສົນທະນາສຳຄັນ"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"ບໍ່ມີ"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> ການສົນທະນາ</item>
-      <item quantity="one">1 ການສົນທະນາ</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"ບໍ່ມີ"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{ບໍ່ມີ}=1{1 ການສົນທະນາ}other{# ການສົນທະນາ}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"ໃຜທີ່ສາມາດລົບກວນໄດ້"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"ການໂທ"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"​ການ​ໂທ"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"ກວດສອບວ່າທ່ານຕັ້ງຄ່າອຸປະກອນໃຫ້ສົ່ງສຽງ, ເພື່ອໃຫ້ແນ່ໃຈວ່າອຸປະກອນຈະສົ່ງສຽງເມື່ອມີສາຍທີ່ອະນຸຍາດໂທເຂົ້າ"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"ສຳລັບ ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’, ສາຍໂທເຂົ້າຈະຖືກບລັອກໄວ້. ທ່ານສາມາດປັບແຕ່ງການຕັ້ງຄ່າເພື່ອອະນຸຍາດໃຫ້ໝູ່, ຄອບຄົວ ແລະ ລາຍຊື່ຜູ້ຕິດຕໍ່ອື່ນໆຂອງທ່ານສາມາດຕິດຕໍ່ຫາທ່ານໄດ້."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"ລາຍຊື່ຜູ້ຕິດຕໍ່ທີ່ຕິດດາວ"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other">ອີກ <xliff:g id="NUM_PEOPLE">%d</xliff:g> ຄົນ</item>
-      <item quantity="one">ອີກ 1 ຄົນ</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"ບໍ່ມີ"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{ບໍ່ມີ}=1{{contact_1}}=2{{contact_1} ແລະ {contact_2}}=3{{contact_1}, {contact_2} ແລະ {contact_3}}other{{contact_1}, {contact_2} ແລະ ອີກ # ຄົນ}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"ຂໍ້​ຄວາມ"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"ຂໍ້ຄວາມ"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"ຂໍ້ຄວາມ"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"ສຳລັບ ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’, ຂໍ້ຄວາມຂາເຂົ້າຈະຖືກບລັອກໄວ້. ທ່ານສາມາດປັບແຕ່ງການຕັ້ງຄ່າເພື່ອອະນຸຍາດໃຫ້ໝູ່, ຄອບຄົວ ແລະ ລາຍຊື່ຜູ້ຕິດຕໍ່ອື່ນໆຂອງທ່ານສາມາດຕິດຕໍ່ຫາທ່ານໄດ້."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"ທຸກຂໍ້ຄວາມສາມາດສົ່ງຫາທ່ານໄດ້"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"ທຸກສາຍສາມາດຕິດຕໍ່ຫາທ່ານໄດ້"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"ບໍ່ມີ"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> ລາຍຊື່ຜູ້ຕິດຕໍ່</item>
-      <item quantity="one">1 ລາຍຊື່ຜູ້ຕິດຕໍ່</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{ບໍ່ມີ}=1{1 ລາຍຊື່ຜູ້ຕິດຕໍ່}other{# ລາຍຊື່ຜູ້ຕິດຕໍ່}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"ທຸກຄົນ"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"ລາຍຊື່ຜູ້ຕິດຕໍ່"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"ລາຍຊື່ຜູ້ຕິດຕໍ່ທີ່ຕິດດາວ"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"ການແຈ້ງເຕືອນທັງໝົດ"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"ການແຈ້ງເຕືອນບາງຢ່າງ"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"ຄົນທີ່ເລືອກຈະຍັງຄົງສາມາດຕິດຕໍ່ຫາທ່ານໄດ້ຢູ່, ເຖິງແມ່ນວ່າທ່ານຈະບໍ່ອະນຸຍາດໃຫ້ແອັບລົບກວນໄດ້ກໍຕາມ"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> ສາມາດລົບກວນໄດ້</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> ສາມາດລົບກວນໄດ້</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"ອີກ <xliff:g id="NUMBER">%d</xliff:g> ແອັບ"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{ບໍ່ມີແອັບທີ່ສາມາດລົບກວນໄດ້}=1{{app_1} ສາມາດລົບກວນໄດ້}=2{{app_1} ແລະ {app_2} ສາມາດລົບກວນໄດ້}=3{{app_1}, {app_2}, ແລະ {app_3} ສາມາດລົບກວນໄດ້}other{{app_1}, {app_2} ແລະ ອີກ # ແອັບສາມາດລົບກວນໄດ້}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"ແອັບ"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"ການແຈ້ງເຕືອນທັງໝົດ"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"ການແຈ້ງເຕືອນບາງຢ່າງ"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"ການແຈ້ງເຕືອນທີ່ສາມາດລົບກວນໄດ້"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"ອະນຸຍາດການແຈ້ງເຕືອນທັງໝົດ"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> ສາມາດລົບກວນໄດ້</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> ສາມາດລົບກວນໄດ້</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"ບໍ່ມີຫຍັງທີ່ສາມາດລົບກວນໄດ້"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"ອີກ <xliff:g id="NUMBER">%d</xliff:g> ແອັບ"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{ບໍ່ມີຫຍັງທີ່ສາມາດລົບກວນໄດ້}=1{{sound_category_1} ສາມາດລົບກວນໄດ້}=2{{sound_category_1} ແລະ {sound_category_2} ສາມາດລົບກວນໄດ້}=3{{sound_category_1}, {sound_category_2} ແລະ {sound_category_3} ສາມາດລົບກວນໄດ້}other{{sound_category_1}, {sound_category_2} ແລະ ອີກ # ໝວດໝູ່ສາມາດລົບກວນໄດ້}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"ບໍ່ມີຫຍັງທີ່ສາມາດລົບກວນໄດ້"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"ບໍ່ມີໃຜສາມາດລົບກວນໄດ້"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"ບາງຄົນສາມາດລົບກວນໄດ້"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"ທຸກຄົນສາມາດລົບກວນໄດ້"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB ຖືກຄວບຄຸມໂດຍ"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"ອຸປະກອນທີ່ເຊື່ອມຕໍ່"</string>
     <string name="usb_control_device" msgid="527916783743021577">"ອຸປະກອນນີ້"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"ກຳລັງສຳຫຼັບ..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"ກຳລັງສະຫຼັບ…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"ບໍ່ສາມາດສະຫຼັບໄດ້"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"ກຳລັງສາກໄຟອຸປະກອນນີ້"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"ການສາກໄຟອຸປະກອນທີ່ເຊື່ອມຕໍ່"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"ເບິ່ງລາຍລະອຽດ"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"ຕົວປະຢັດອິນເຕີເນັດ"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"ຂໍ້ມູນທີ່ບໍ່ຖືກຈຳກັດ"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"ຂໍ້ມູນພື້ນຫຼັງຖືກປິດໄວ້"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"ຂໍ້ມູນພື້ນຫຼັງຖືກປິດໄວ້"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"ເປີດ"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"ປິດ"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"ໃຊ້ຕົວປະຢັດອິນເຕີເນັດ"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"ຫາກອຸປະກອນຖືກລັອກໄວ້, ຈະມີການປ້ອງກັນບໍ່ໃຫ້ພິມຕອບກັບ ຫຼື ຂໍ້ຄວາມອື່ນໆໃນການແຈ້ງເຕືອນ"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"ຕົວກວດການສະກົດຄຳເລີ່ມຕົ້ນ"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"ເລືອກຕົວກວດການສະກົດຄຳ"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"ໃຊ້ຕົວກວດການສະກົດຄຳ"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"ໃຊ້ຕົວກວດການສະກົດຄຳ"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"ບໍ່ໄດ້ເລືອກ"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(ບໍ່ມີ)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"ເພື່ອຊ່ວຍເພີ່ມພື້ນທີ່ຫວ່າງສຳລັບການຈັດເກັບຂໍ້ມູນ, ຕົວຈັດການບ່ອນຈັດເກັບຂໍ້ມູນຈະລຶບຮູບພາບ ແລະ ວິດີໂອທີ່ສຳຮອງຂໍ້ມູນໄວ້ອອກຈາກອຸປະກອນຂອງທ່ານ."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"ລຶບຮູບພາບ ແລະ ວິດີໂອ"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"ຕົວຈັດການບ່ອນຈັດເກັບຂໍ້ມູນ"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"ໃຊ້ຕົວຈັດການບ່ອນຈັດເກັບຂໍ້ມູນ"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"ໃຊ້ຕົວຈັດການບ່ອນຈັດເກັບຂໍ້ມູນ"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"ອັດຕະໂນມັດ"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"ຕັ້ງຄ່າເອງ"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"ສ້າງພື້ນທີ່ຈັດເກັບຂໍ້ມູນເພີ່ມ"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"ແຕະສອງເທື່ອເພື່ອກວດສອບໂທລະສັບ"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"ແຕະສອງເທືື່ອເພື່ອກວດສອບແທັບເລັດ"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"ແຕະສອງເທືື່ອເພື່ອກວດສອບອຸປະກອນ"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"ປັດເພື່ອເບິ່ງການແຈ້ງເຕືອນ"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"ປັດລົງຢູ່ຂອບລຸ່ມຂອງໜ້າຈໍເພື່ອສະແດງການແຈ້ງເຕືອນຂອງທ່ານ"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"ໂໝດມືດຽວ"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"ໃຊ້ໂໝດມືດຽວ"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"ອອກເມື່ອສະຫຼັບແອັບ"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"ໝົດເວລາ"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 ວິນາທີ"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 ວິນາທີ"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 ວິນາທີ"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"ຄວາມສາມາດໃນການເອື້ອມເຖິງ"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"ເພື່ອກວດສອບເວລາ, ການແຈ້ງເຕືອນ ແລະ ຂໍ້ມູນອື່ນໆ, ໃຫ້ແຕະສອງເທື່ອຢູ່ໜ້າຈໍຂອງທ່ານ."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"ຍົກຂຶ້ນເພື່ອກວດສອບໂທລະສັບ"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"ຍົກຂຶ້ນເພື່ອກວດສອບແທັບເລັດ"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"ແຕະເພື່ອກວດສອບແທັບເລັດ"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"ແຕະເພື່ອກວດສອບອຸປະກອນ"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"ເພື່ອກວດສອບເວລາ, ການແຈ້ງເຕືອນ ແລະ ຂໍ້ມູນອື່ນໆ, ໃຫ້ແຕະໃສ່ໜ້າຈໍຂອງທ່ານ."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"ປຸ່ມສັນຍານເຕືອນໄພ"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"ເລີ່ມຄຳສັ່ງ SOS ສຸກເສີນໂດຍການກົດປຸ່ມເປີດປິດໄວໆ 5 ເທື່ອ."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"ສຽງຄຳເຕືອນ"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"ແຈ້ງເຕືອນກ່ອນເລີ່ມຄຳສັ່ງ"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"ລາຍຊື່ຜູ້ຕິດຕໍ່ສຸກເສີນ"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"ປັດລາຍນິ້ວມືສຳລັບການແຈ້ງເຕືອນ"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"ປັດລາຍນິ້ວມື"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"ເພື່ອກວດເບິ່ງການແຈ້ງເຕືອນຂອງທ່ານ, ໃຫ້ເລື່ອນລົງໃສ່ເຊັນເຊີນລາຍນິ້ວມືທີ່ຢູ່ຫຼັງໂທລະສັບຂອງທ່ານ."</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"ເປີດໃຊ້ສຳລັບທຸກແອັບ"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"ເລືອກໄດຣເວີກຣາບຟິກ"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"ຄ່າເລີ່ມຕົ້ນ"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"ໄດຣເວີເກມ"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"ໄດຣເວີເກມ"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"ໄດຣເວີນັກພັດທະນາ"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"ໄດຣເວີກຣາບຟິກລະບົບ"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"ບໍ່ພົບເຄືອຂ່າຍ. ກະລຸນາລອງໃໝ່ອີກເທື່ອໜຶ່ງ."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(ຕ້ອງຫ້າມ)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"ບໍ່ມີຊິມກາດ"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"ບໍ່ມີຊິມ"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"ບໍ່ມີ"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"ຕ້ອງໃຊ້ SIM ເພື່ອເຊື່ອມຕໍ່"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"ຕ້ອງໃຊ້ SIM <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> ເພື່ອເຊື່ອມຕໍ່"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"ໂໝດເຄືອຂ່າຍທີ່ຕ້ອງການ: ຕ້ອງການ WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"ໂໝດເຄືອຂ່າຍທີ່ຕ້ອງການ: GSM ເທົ່ານັ້ນ"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"ໂໝດເຄືອຂ່າຍທີ່ຕ້ອງການ: WCDMA ເທົ່ານັ້ນ"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"ອິນເຕີເນັດມືຖື"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"ເຂົ້າເຖິງອິນເຕີເນັດຜ່ານເຄືອຂ່າຍມືຖື"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"ໂທລະສັບຈະສະຫຼັບໄປໃຊ້ຜູ້ໃຫ້ບໍລິການນີ້ໂດຍອັດຕະໂນມັດເມື່ອຢູ່ໃນໄລຍະ"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"ບໍ່ມີຊິມກາດທີ່ສາມາດໃຊ້ໄດ້"</string>
     <string name="calls_preference" msgid="2166481296066890129">"ການຕັ້ງຄ່າການໂທ"</string>
     <string name="sms_preference" msgid="7742964962568219351">"ການຕັ້ງຄ່າ SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"ຖາມທຸກເທື່ອ"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"ອະນຸຍາດໃຫ້ມີການຊ້ອນໜ້າຈໍຢູ່ການຕັ້ງຄ່າ"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"ອະນຸຍາດໃຫ້ແອັບທີ່ສາມາດສະແດງຜົນທັບແອັບອື່ນເພື່ອຊ້ອນໜ້າຈໍການຕັ້ງຄ່າ"</string>
     <string name="media_controls_title" msgid="403271085636252597">"ມີເດຍ"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"ເຊື່ອງຕົວຫຼິ້ນເມື່ອເຊດຊັນມີເດຍສິ້ນສຸດແລ້ວ"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"ຕົວຫຼິ້ນຈະເຮັດໃຫ້ທ່ານສາມາດສືບຕໍ່ເຊດຊັນໃດໜຶ່ງໄດ້ຈາກແຜງການຕັ້ງຄ່າດ່ວນທີ່ຂະຫຍາຍແລ້ວໄດ້."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"ເຄື່ອງຫຼິ້ນມີເດຍໃນການຕັ້ງຄ່າດ່ວນ"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"ສະແດງເຄື່ອງຫຼິ້ນມີເດຍດົນຂຶ້ນເພື່ອສືບຕໍ່ການຫຼິ້ນໄດ້ຢ່າງງ່າຍດາຍ"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"ເຊື່ອງຕົວຫຼິ້ນ"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"ສະແດງຕົວຫຼິ້ນ"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"ບໍ່ມີຕົວຫຼິ້ນທີ່ສາມາດໃຊ້ໄດ້"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"ແອັບທີ່ອະນຸຍາດແລ້ວ"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"ມີເດຍ"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth ຈະ​ເປີດ"</string>
 </resources>
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
index d423cd5..5b42dbf 100644
--- a/res/values-lt/arrays.xml
+++ b/res/values-lt/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Vidutinė"</item>
     <item msgid="6740026006576843477">"Ilga"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Trumpas"</item>
+    <item msgid="7397961711906421599">"Vidutinis"</item>
+    <item msgid="4079132024502041928">"Ilgas"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Numatytasis"</item>
     <item msgid="4234707448428002595">"Be užraitų"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA / „EvDo“ / GSM / WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA ir LTE / „EvDo“"</item>
     <item msgid="2247906254631766720">"GSM / WCDMA / LTE"</item>
-    <item msgid="1091258946200124345">"Visuotinis"</item>
+    <item msgid="4147872615520331421">"LTE / CDMA / „EvDo“ / GSM / WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"Tik TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR / LTE"</item>
     <item msgid="5237423971422723128">"NR / LTE / CDMA / „EvDo“"</item>
     <item msgid="6856991565745877075">"NR / LTE / GSM / WCDMA"</item>
-    <item msgid="473436147270962091">"NR / LTE / CDMA / „EvDo“ / GSM / WCDMA"</item>
+    <item msgid="8908263949185004366">"Visuotinis"</item>
     <item msgid="6692179237956480280">"NR / LTE / WCDMA"</item>
     <item msgid="8160757136163231885">"NR / LTE / TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR / LTE / TDSCDMA / GSM"</item>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 7cd8254..523bcb4 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -300,7 +300,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Rodyti profilio informaciją užrakinimo ekrane"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Paskyros"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Vietovė"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Naudoti vietovę"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Naudoti vietovę"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Išjungti"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">Įjungta – <xliff:g id="COUNT_1">%1$d</xliff:g> programa gali pasiekti vietovę</item>
@@ -335,6 +335,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Autentifikavimas naudojant veidą"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Pradėti"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Jei pritaikomumo atrakinimo pagal veidą funkcija išjungta, kai kurie sąrankos veiksmai gali tinkamai neveikti su „TalkBack“."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Grįžti"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Tęsti sąranką"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Naud. pritaikymo neįgal. sąranką"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -635,7 +638,6 @@
       <item quantity="other">Turi būti mažiau nei <xliff:g id="NUMBER_1">%d</xliff:g> skaitmenų</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Įrenginio administratorius neleidžia naudoti pastarojo PIN kodo"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Dažnai naudojamus PIN kodus užblokavo IT administratorius. Bandykite naudoti kitą PIN kodą."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Negali būti netinkamų simbolių"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Turi būti bent viena raidė"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Turi būti bent vienas skaitmuo"</string>
@@ -683,7 +685,6 @@
       <item quantity="other">Turi būti bent <xliff:g id="COUNT">%d</xliff:g> neskaitinių simbolių</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Įrenginio administratorius neleidžia naudoti pastarojo slaptažodžio"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Dažnai naudojamus slaptažodžius užblokavo IT administratorius. Bandykite naudoti kitą slaptažodį."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Didėjanti, mažėjanti ar pasikartojanti skaitmenų seka neleidžiama"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Patvirtinti"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Atšaukti"</string>
@@ -829,7 +830,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Įjungti „Wi-Fi“"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Naudoti „Wi-Fi“"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Naudoti „Wi-Fi“"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"„Wi-Fi“ nustatymai"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Nustatyti ir valdyti bevielius prieigos taškus"</string>
@@ -937,7 +938,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Centruokite toliau pateiktą QR kodą, kad galėtumėte prisijungti prie „<xliff:g id="SSID">%1$s</xliff:g>“"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Prisijunkite prie „Wi‑Fi“ nuskaitydami QR kodą"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"„Wi‑Fi“ bendrinimas"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Nuskaitykite šį QR kodą, kad prisijungtumėte prie „<xliff:g id="SSID">%1$s</xliff:g>” ir galėtumėte bendrinti slaptažodį"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Nuskaitykite šį QR kodą kitu įrenginiu, kad prisijungtumėte prie „<xliff:g id="SSID">%1$s</xliff:g>“"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Nuskaitykite šį QR kodą, kad prisijungtumėte prie „<xliff:g id="SSID">%1$s</xliff:g>“"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Bandykite dar kartą. Jei problema išlieka, susisiekite su įrenginio gamintoju"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Iškilo problema"</string>
@@ -963,8 +964,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"„Wi-Fi“ slaptažodis: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Viešosios interneto prieigos taško slaptažodis: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Automatiškai prisijungti"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Leisti telefonui automatiškai prisijungti esant netoli šio tinklo"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Leisti planšetiniam kompiuteriui automatiškai prisijungti esant netoli šio tinklo"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Leisti prisijungti prie šio tinklo, kai įrenginys bus tinklo diapazone"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Pridėti įrenginį"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Naudokite QR kodą, kad galėtumėte pridėti įrenginį prie šio tinklo"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR kodas netinkamo formato"</string>
@@ -976,7 +976,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Naudoti sistemos sertifikatus"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Neteikti"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Nepatvirtinti"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Nenurodytas joks sertifikatas. Ryšys nebus privatus."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Tinklo pavadinimas per ilgas."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Būtina nurodyti domeną."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Būtinas sertifikatas."</string>
@@ -1003,6 +1002,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Prijungti"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"„Wi-Fi“ įjungtas"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Prisijungta prie „<xliff:g id="NETWORK_NAME">%1$s</xliff:g>“"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Prisijungiama prie „<xliff:g id="NETWORK_NAME">%1$s</xliff:g>“"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Prijungiama…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Jungiantis prie tinklo įvyko klaida."</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Tinklas ne diapazone"</string>
@@ -1080,7 +1080,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Programa bendrina turinį. Norėdami bendrinti interneto ryšį, išjunkite viešosios interneto prieigos tašką ir vėl jį įjunkite."</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Nenustatyta jokių slaptažodžių"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Viešosios interneto prieigos taško pavadinimas"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Įjungiamas „<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>“..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Įjungiama „<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>“…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Kiti įrenginiai gali prisijungti prie „<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>“"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Viešosios interneto prieigos taško slaptažodis"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Prieigos taško juosta"</string>
@@ -1230,7 +1230,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Automatiškai padidinamas kai kurio turinio atnaujinimo dažnis nuo 60 iki 90 Hz. Vartojama daugiau akumuliatoriaus energijos."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Priverstinis 90 Hz atnaujinimo dažnis"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Didžiausias atnaujinimo dažnis, siekiant patobulinti palietimo atsakomumą ir animacijos kokybę. Vartojama daugiau akumuliatoriaus energijos."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Žiūrėjimas į ekraną"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Įjungta – ekranas neišsijungs, kol į jį žiūrėsite"</string>
@@ -1371,7 +1371,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"„Android“ versija"</string>
     <string name="security_patch" msgid="4071756145347865382">"„Android“ saugos naujinys"</string>
     <string name="model_info" msgid="8997566254717810904">"Modelis"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Modelis: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Modelis, aparat. įranga"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Aparatinės įrangos versija"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Įrangos ID"</string>
@@ -1646,31 +1645,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Tinklo nustatymai nustatyti iš naujo"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Nepavyko ištrinti SIM kortelių"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Atsisiųstų SIM kortelių negalima ištrinti dėl klaidos.\n\nIš naujo paleiskite įrenginį ir bandykite dar kartą."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Ištrinti visus duomenis (atkurti gamyklinius duomenis)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Ištrinti visus duomenis (atkurti gamyklinius duomenis)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Bus ištrinti visi duomenys iš planšetinio kompiuterio "<b>"vidinės atminties"</b>", įskaitant:\n\n"<li>"„Google“ paskyrą;"</li>\n<li>"sistemos ir programų duomenis bei nustatymus;"</li>\n<li>"atsisiųstas programas."</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Bus ištrinti visi duomenys iš telefono "<b>"vidinės atminties"</b>", įskaitant:\n\n"<li>"„Google“ paskyrą;"</li>\n<li>"sistemos ir programų duomenis bei nustatymus;"</li>\n<li>"atsisiųstas programas."</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Šiuo metu esate prisijungę prie šių paskyrų:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Yra kitų šio įrenginio naudotojų.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Muzika"</li>\n<li>"Nuotraukos"</li>\n<li>"Kiti naudotojo duomenys"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"„eSIM“ kortelės"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Tai atlikus mobiliojo ryšio paslaugos planas nebus atšauktas."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Norint išvalyti muzikos failus, paveikslėlius bei kitus naudotojo duomenis, reikia ištrinti "<b>"USB atmintį"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Norint išvalyti muzikos failus, paveikslėlius ir kitus naudotojo duomenis, reikia ištrinti "<b>"SD kortelę"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Ištrinti visus duomenis (atkurti gamyklinius nustatymus)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Ištr. duom. (atk. gam. nust.)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Bus ištrinti visi duomenys iš planšetinio kompiuterio "<b>"vidinės atminties"</b>", įskaitant:\n\n"<li>"„Google“ paskyrą;"</li>\n<li>"sistemos ir programų duomenis bei nustatymus;"</li>\n<li>"atsisiųstas programas."</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Bus ištrinti visi duomenys iš telefono "<b>"vidinės atminties"</b>", įskaitant:\n\n"<li>"„Google“ paskyrą;"</li>\n<li>"sistemos ir programų duomenis bei nustatymus;"</li>\n<li>"atsisiųstas programas."</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Šiuo metu esate prisijungę prie šių paskyrų:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Yra kitų šio įrenginio naudotojų.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Muzika"</li>\n<li>"Nuotraukos"</li>\n<li>"Kiti naudotojo duomenys"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"„eSIM“ kortelės"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Tai atlikus mobiliojo ryšio paslaugų planas nebus atšauktas."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Norint išvalyti muzikos failus, nuotraukas ir kitus naudotojo duomenis, reikia ištrinti "<b>"USB atmintį"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Norint išvalyti muzikos failus, nuotraukas ir kitus naudotojo duomenis, reikia ištrinti "<b>"SD kortelę"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Ištrinti USB atmintinę"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Ištrinti SD kortelę"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Ištrinti visus vidinės USB atminties duomenis, pvz., muzikos failus ar nuotraukas"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Ištrinti visus SD kortelės duomenis, pvz., muzikos failus ar nuotraukas"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Trinti visus duomenis"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Trinti visus duomenis"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Bus ištrinta visa asmens informacija ir atsisiųstos programos. Negalite anuliuoti šio veiksmo."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Bus ištrinta visa asmens informacija, įskaitant atsisiųstas programas ir SIM korteles. Negalite anuliuoti šio veiksmo."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Ištrinti viską"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Nebuvo nustatyta iš naujo, nes paslauga „Sistemos išvalymas“ nepasiekiama."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Ištrinti visus duomenis?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Šis naudotojas negali atkurti gamyklinių nustatymų"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Ištrinama"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Palaukite..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Trinti visus duomenis"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Trinti visus duomenis"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Bus ištrinta visa asmens informacija ir atsisiųstos programos. Negalite anuliuoti šio veiksmo."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Bus ištrinta visa asmens informacija, įskaitant atsisiųstas programas ir SIM korteles. Negalite anuliuoti šio veiksmo."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Ištrinti visus duomenis?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Šis naudotojas negali atkurti gamyklinių nustatymų"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Ištrinama"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Palaukite…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Skambinimo nustatymai"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Nustatyti balso paštą, skambučio peradresavimą, skambučio laukimą, skambintojo ID"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB susiejimas"</string>
@@ -1718,7 +1715,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Negalima daugiau nei <xliff:g id="MAXCONNECTION">%1$d</xliff:g> įrenginių (-io) naudoti kaip modemo (-ų)."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"„<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“ bus atsietas."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Eterneto susiejimas"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Bendrinkite telefono interneto ryšį per USB eternetu"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Bendrinkite telefono interneto ryšį eternetu"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Naudodami viešosios interneto prieigos tašką ir įrenginį kaip modemą galite teikti internetą kitiems įrenginiams per mobiliojo ryšio duomenų tinklą. Be to, programos gali sukurti viešosios interneto prieigos tašką ir bendrinti turinį su netoliese esančiais įrenginiais."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Naudodami viešosios interneto prieigos tašką ir įrenginį kaip modemą galite teikti internetą kitiems įrenginiams „Wi-Fi“ arba mobiliųjų duomenų ryšiu. Be to, programos gali sukurti viešosios interneto prieigos tašką ir bendrinti turinį su netoliese esančiais įrenginiais."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Pagalba"</string>
@@ -2165,13 +2162,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Subtitrų nuostatos"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Didinimas"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Didinimo sritis"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Didinimo įgalinimas"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Pasirinkite didinimo sritį (-is), kurią (-ias) norite naudoti, kai didinate ekraną"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Visas ekranas"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Ekrano dalis"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Visas ekranas ir ekrano dalis"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Didinti visą ekraną"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Didinti ekrano dalį"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Perjungti į pritaikomumo mygtuką?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Jei didinsite ekrano dalį naudodami palietimo tris kartus funkciją, įvesties ir kiti veiksmai vėluos.\n\nAr norite didinti naudodami pritaikomumo mygtuką?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Perjungti į pritaikomumo mygtuką"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Didinti paliečiant tris kartus"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Didinimo nustatymai"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Didinti palietus tris kartus"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Didinimas naudojant spart. klavišą"</string>
@@ -2225,11 +2225,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Maitinimo mygt. baig. skamb."</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Didelis pelės žymeklis"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Pašalinti animacijas"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Monofoninis garsas"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Sujungti kanalus leidžiant garsą"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Garso balansas"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Kairė"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Dešinė"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Monofoninis garsas"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Sujungti kanalus leidžiant garsą"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Garso balansas"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Kairysis"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Dešinysis"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Numatytasis"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 sek."</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 sek."</string>
@@ -2259,11 +2259,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Vibravimas gavus pranešimą"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Vibravimas skambant telefonui"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Lietimo grįžtamasis ryšys"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Naudoti „<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>“"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Atidaryti „<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>“"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Naudoti spalvų taisymą"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Rodyti subtitrus"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Tik palaikomai programai"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Naudoti „<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>“"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Atidaryti „<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>“"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Naudoti spalvų taisymą"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Rodyti subtitrus"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Tik palaikomai programai"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Antraštės dydis ir stilius"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Teksto dydis: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Daugiau parinkčių"</string>
@@ -2295,6 +2295,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomalija"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomalija"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomalija"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Pilkumo tonas"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Raudona, žalia"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Raudona, žalia"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Mėlyna, geltona"</string>
@@ -2436,7 +2437,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Fono ribojimas"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Leiskite vykdyti programą fone"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Neleidžiama vykdyti programos fone"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Naudojimo fone negalima apriboti"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Naudojimo fone negalima apriboti"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Apriboti veiklą fone?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Jei apribosite programos veiklą fone, ji gali netinkamai veikti"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Negalite apriboti progr., nes ji nenust. optimiz. akum. naud.\n\nJei norite apr. progr., pirmiausia įj. akum. naud. optimiz."</string>
@@ -2667,9 +2668,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Nustatyti tvarkaraštį"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Pailginti akumuliatoriaus veikimo laiką"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Išjungti įkrovus"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Akumuliatoriaus tausojimo priemonė išjungiama telefonui pasiekus <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Akumuliatoriaus tausojimo priemonė išjungiama planšetiniam kompiuteriui pasiekus <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Akumuliatoriaus tausojimo priemonė išjungiama įrenginiui pasiekus <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Akumuliatoriaus tausojimo priemonė išjungiama, kai telefono įkrovimo lygis viršija <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Akumuliatoriaus tausojimo priemonė išjungiama, kai planšetinio kompiuterio įkrovimo lygis viršija <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Akumuliatoriaus tausojimo priemonė išjungiama, kai įrenginio įkrovimo lygis viršija <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Įjungti"</string>
@@ -2734,6 +2735,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Nustatyti iš naujo"</string>
     <string name="tts_play" msgid="2945513377250757221">"Paleisti"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Adaptyvusis ryšių tvarkymas"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Automatiškai tvarkant tinklo ryšius pailgėja akumuliatoriaus veikimo laikas ir pagerėja įrenginio našumas"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Prisijungimo duomenų saugykla"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Įdiegti sertifikatą"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Įdiegti sertifikatus iš saugyklos"</string>
@@ -2745,9 +2748,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Naudotojo prisijungimo duom."</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Peržiūrėkite ir keiskite išsaugotus prisijungimo duomenis"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Išplėstiniai"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Saugyklos tipas"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Atsarginė kopija saugoma įrenginio vidinėje atmintyje"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Saugoma tik programinėje įrangoje"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Prisijungimo duomenys nepasiekiami šiam naudotojui"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Įdiegta VPN ir programoms"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Įdiegta „Wi-Fi“"</string>
@@ -3146,7 +3146,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Mokėjimas terminale"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Nustatykite mokėjimo programą. Tada tiesiog palaikykite užpakalinę telefono dalį prie bet kokios terminalo su nekontaktinio mokėjimo simboliu."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Supratau"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Daugiau..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Daugiau…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Nustatyti numatytąją mokėjimo programą"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Atnaujinti numatytąją mokėjimo programą"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Nekontaktiniame terminale galima mokėti naudojant „<xliff:g id="APP">%1$s</xliff:g>“"</string>
@@ -3230,7 +3230,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Visada naudoti tai skambučiams"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Pasirinkite duomenims skirtą SIM"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Pasirinkite SIM arba SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Perjungiama duomenų SIM kortelė. Tai gali užtrukti iki minutės..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Perjungiama duomenų SIM kortelė. Tai gali užtrukti iki minutės…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Skambinkite naudodami…"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Pasirinkite SIM kortelę"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM Nr. <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3375,6 +3375,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"veiksmų seka, tvarkaraštis, akumuliatoriaus tausojimo priemonė, energijos tausojimo priemonė, akumuliatorius, automatinis, procentai"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"„VoLTE“, išplėstinės skambinimo parinktys, 4G skambinimas"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"pridėti kalbą"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"teksto dydis"</string>
     <string name="default_sound" msgid="6604374495015245195">"Numatytasis garsas"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Skambučių ir nustatymų garsumas: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Garsumas, vibravimas, netrukdymo režimas"</string>
@@ -3414,13 +3415,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Įjungti garsus"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Subtitrai realiuoju laiku"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Taikyti automatinius medijos subtitrus"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Nėra"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one">Nustatytas <xliff:g id="ON_COUNT">%d</xliff:g> tvarkaraštis</item>
-      <item quantity="few">Nustatyti <xliff:g id="ON_COUNT">%d</xliff:g> tvarkaraščiai</item>
-      <item quantity="many">Nustatyta <xliff:g id="ON_COUNT">%d</xliff:g> tvarkaraščio</item>
-      <item quantity="other">Nustatyta <xliff:g id="ON_COUNT">%d</xliff:g> tvarkaraščių</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Nė vieno}=1{Nustatytas 1 tvarkaraštis}one{Nustatytas # tvarkaraštis}few{Nustatyti # tvarkaraščiai}many{Nustatyta # tvarkaraščio}other{Nustatyta # tvarkaraščių}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Netrukdymo režimas"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Gauti pranešimus tik iš svarbių žmonių ar įvykių"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Pertraukčių apribojimas"</string>
@@ -3488,24 +3483,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Tik prioritetiniai"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Įjungta / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Išjungta / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Išjungta"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Įjungta"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Klausti kaskart"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Kol išjungsite"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> valanda</item>
-      <item quantity="few"><xliff:g id="NUM_HOURS">%d</xliff:g> valandos</item>
-      <item quantity="many"><xliff:g id="NUM_HOURS">%d</xliff:g> valandos</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> valandų</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> min."</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> tvarkaraštis gali įsijungti automatiškai</item>
-      <item quantity="few"><xliff:g id="ON_COUNT">%d</xliff:g> tvarkaraščiai gali įsijungti automatiškai</item>
-      <item quantity="many"><xliff:g id="ON_COUNT">%d</xliff:g> tvarkaraščio gali įsijungti automatiškai</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> tvarkaraščių gali įsijungti automatiškai</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 valanda}one{# valanda}few{# valandos}many{# valandos}other{# valandų}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minutė}one{# minutė}few{# minutės}many{# minutės}other{# minučių}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Išjungta}=1{Išjungta; 1 tvarkaraštis gali įsijungti automatiškai}one{Išjungta; # tvarkaraštis gali įsijungti automatiškai}few{Išjungta; # tvarkaraščiai gali įsijungti automatiškai}many{Išjungta; # tvarkaraščio gali įsijungti automatiškai}other{Išjungta; # tvarkaraščių gali įsijungti automatiškai}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Kas gali trikdyti netrukdymo režimu"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Žmonės"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Programos"</string>
@@ -3551,6 +3534,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Žemesnio prioriteto pranešimus automatiškai nustatyti kaip netrikdančius"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Prisitaikantis pranešimų reitingavimas"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Automatiškai reitinguoti pranešimus pagal atitikimą"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Atsiliepimai apie adaptyviuosius pranešimus"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Nurodyti pranešimų koregavimus ir rodyti parinktį teikti atsiliepimus apie sistemą"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Siūlomi veiksmai ir atsakymai"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Automatiškai rodyti siūlomus veiksmus ir atsakymus"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Naujausių ir atidėtų pranešimų rodymas"</string>
@@ -3757,7 +3742,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Prieiga „Netrukdyti“"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Leisti netrukdymo režimą"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Jokios įdiegtos programos nepateikė prieigos „Netrukdyti“ užklausos"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Įkeliamos programos..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Įkeliamos programos…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"„Android“ jūsų prašymu blokuoja šios programos pranešimus, kad jie nebūtų rodomi šiame įrenginyje"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"„Android“ jūsų prašymu blokuoja šios kategorijos pranešimus, kad jie nebūtų rodomi šiame įrenginyje"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"„Android“ jūsų prašymu blokuoja šios grupės pranešimus, kad jie nebūtų rodomi šiame įrenginyje"</string>
@@ -3855,13 +3840,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Visi pokalbiai"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Svarbiausi pokalbiai"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Nėra"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> pokalbis</item>
-      <item quantity="few"><xliff:g id="CONVERSATIONS">%d</xliff:g> pokalbiai</item>
-      <item quantity="many"><xliff:g id="CONVERSATIONS">%d</xliff:g> pokalbio</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> pokalbių</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Nėra"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Nė vieno}=1{1 pokalbis}one{# pokalbis}few{# pokalbiai}many{# pokalbio}other{# pokalbių}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Kas gali trikdyti"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Skambučiai"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Skambučiai"</string>
@@ -3870,13 +3849,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Kad užtikrintumėte, jog įrenginys skambės priimant leidžiamus skambučius, patikrinkite, ar jame nustatytas skambėjimo režimas"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Veikiant „<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>“ blokuojami gaunamieji skambučiai. Galite koreguoti nustatymus ir leisti draugams, šeimos nariams ar kitiems kontaktams jus pasiekti."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Žvaigždute pažymėti kontaktai"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one">Dar <xliff:g id="NUM_PEOPLE">%d</xliff:g> kontaktas</item>
-      <item quantity="few">Dar <xliff:g id="NUM_PEOPLE">%d</xliff:g> kontaktai</item>
-      <item quantity="many">Dar <xliff:g id="NUM_PEOPLE">%d</xliff:g> kontakto</item>
-      <item quantity="other">Dar <xliff:g id="NUM_PEOPLE">%d</xliff:g> kontaktų</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Nėra"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Nė vieno}=1{{contact_1}}=2{{contact_1} ir {contact_2}}=3{{contact_1}, {contact_2} ir {contact_3}}one{{contact_1}, {contact_2} ir dar # žmogus}few{{contact_1}, {contact_2} ir dar # žmonės}many{{contact_1}, {contact_2} ir dar # žmogaus}other{{contact_1}, {contact_2} ir dar # žmonių}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Pranešimai"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"pranešimai"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Pranešimai"</string>
@@ -3885,13 +3858,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Veikiant „<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>“ blokuojami gaunami pranešimai. Galite koreguoti nustatymus ir leisti draugams, šeimos nariams ar kitiems kontaktams jus pasiekti."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Visi pranešimai gali jus pasiekti"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Visi skambučiai gali jus pasiekti"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Nėra"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontaktas</item>
-      <item quantity="few"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontaktai</item>
-      <item quantity="many"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontakto</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontaktų</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Nė vieno}=1{1 kontaktas}one{# kontaktas}few{# kontaktai}many{# kontakto}other{# kontaktų}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Bet kas"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Kontaktai"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Žvaigždutėmis pažymėti kontaktai"</string>
@@ -3929,26 +3896,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Visi pranešimai"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Kai kurie pranešimai"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Pasirinkti žmonės vis tiek gali jus pasiekti, net jei neleidžiate programoms trikdyti"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one">„<xliff:g id="APP_NAMES">%s</xliff:g>“ gali trikdyti</item>
-      <item quantity="few">„<xliff:g id="APP_NAMES">%s</xliff:g>“ gali trikdyti</item>
-      <item quantity="many">„<xliff:g id="APP_NAMES">%s</xliff:g>“ gali trikdyti</item>
-      <item quantity="other">„<xliff:g id="APP_NAMES">%s</xliff:g>“ gali trikdyti</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"Dar <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Jokios programos negali trikdyti}=1{„{app_1}“ gali trikdyti}=2{„{app_1}“ ir „{app_2}“ gali trikdyti}=3{„{app_1}“, „{app_2}“ ir „{app_3}“ gali trikdyti}one{„{app_1}“, „{app_2}“ ir dar # programa gali trikdyti}few{„{app_1}“, „{app_2}“ ir dar # programos gali trikdyti}many{„{app_1}“, „{app_2}“ ir dar # programos gali trikdyti}other{„{app_1}“, „{app_2}“ ir dar # programų gali trikdyti}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Programos"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Visi pranešimai"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Kai kurie pranešimai"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Pranešimai, kurie gali trikdyti"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Leisti visus pranešimus"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one">„<xliff:g id="SOUND_CATEGORIES">%s</xliff:g>“ gali trikdyti</item>
-      <item quantity="few">„<xliff:g id="SOUND_CATEGORIES">%s</xliff:g>“ gali trikdyti</item>
-      <item quantity="many">„<xliff:g id="SOUND_CATEGORIES">%s</xliff:g>“ gali trikdyti</item>
-      <item quantity="other">„<xliff:g id="SOUND_CATEGORIES">%s</xliff:g>“ gali trikdyti</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Niekas negali trikdyti"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"Dar <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Niekas negali trikdyti}=1{„{sound_category_1}“ gali trikdyti}=2{„{sound_category_1}“ ir „{sound_category_2}“ gali trikdyti}=3{„{sound_category_1}“, „{sound_category_2}“ ir „{sound_category_3}“ gali trikdyti}one{„{sound_category_1}“, „{sound_category_2}“ ir dar # garsas gali trikdyti}few{„{sound_category_1}“, „{sound_category_2}“ ir dar # garsai gali trikdyti}many{„{sound_category_1}“, „{sound_category_2}“ ir dar # garso gali trikdyti}other{„{sound_category_1}“, „{sound_category_2}“ ir dar # garsų gali trikdyti}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Niekas negali trikdyti"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Niekas negali trikdyti"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Kai kurie žmonės gali trikdyti"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Visi žmonės gali trikdyti"</string>
@@ -4212,7 +4167,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB valdo"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Prijungtas įrenginys"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Šis įrenginys"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Perjungiama..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Perjungiama…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Nepavyko perjungti"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Šio įrenginio įkrovimas"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Įkraunamas prijungtas įrenginys"</string>
@@ -4473,7 +4428,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Žr. išsamią informaciją"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Duom. taupymo priem."</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Neriboti duomenys"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Foniniai duomenys išjungti"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Foniniai duomenys išjungti"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Įjungta"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Išjungta"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Naudoti duomenų taupymo priemonę"</string>
@@ -4496,7 +4451,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Jei įrenginys užrakintas, neleisti įvesti atsakymų ar kito teksto pranešimuose"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Numatytasis rašybos tikrinimas"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Rašybos tikrinimo pasirinkimas"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Naudoti rašybos tikrinimą"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Naudoti rašybos tikrinimą"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Nepasirinkta"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(nėra)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4594,7 +4549,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Kad padėtų atlaisvinti saugyklos vietos, saugyklos tvarkytuvė iš įrenginio pašalina nuotraukas ir vaizdo įrašus, kurių atsarginė kopija sukurta."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Pašalinti nuotraukas ir vaizdo įrašus"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Saugyklos tvarkytuvė"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Naudoti Saugyklos tvarkytuvę"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Naudoti Saugyklos tvarkytuvę"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automatiniai"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Neautomatiniai"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Atlaisvinkite vietos dabar"</string>
@@ -4632,6 +4587,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Telefono tikrinimas dukart palietus"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Planšetinio kompiuterio tikrinimas dukart palietus"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Įrenginio tikrinimas dukart palietus"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Perbraukimas norint patikrinti pranešimus"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Perbraukite žemyn ekrano apatiniame krašte, kad būtų rodomi pranešimai"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Vienos rankos režimas"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Naudoti vienos rankos režimą"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Išeiti perjungiant programas"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Skirtasis laikas"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 sek."</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 sek."</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 sek."</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"pasiekiamumas"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Norėdami sužinoti laiką, peržiūrėti pranešimus ir kitą informaciją, dukart palieskite ekraną."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Telefono tikrinimas pakėlus"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Planšetinio kompiuterio tikrinimas pakėlus"</string>
@@ -4644,6 +4609,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Palieskite, kad patikrintumėte planšetinį kompiuterį"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Palieskite, kad patikrintumėte įrenginį"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Norėdami sužinoti laiką, peržiūrėti pranešimus ir kitą informaciją, palieskite ekraną."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Pavojaus signalo mygtukas"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Pradėkite pagalbos iškvietimo kritiniu atveju veiksmus penkis kartus greitai paspausdami maitinimo mygtuką."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Įspėjamasis garsas"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Įspėti prieš pradedant veiksmus"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Kritinės padėties kontaktai"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Perbraukimas piršto antspaudo jutikliu norint peržiūrėti pranešimus"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Perbr. kontr. k. jutikliu"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Jei norite patikrinti pranešimus, perbraukite žemyn piršto antspaudo jutikliu telefono užpakalinėje dalyje."</string>
@@ -4812,7 +4782,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Įgalinimas visose programose"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Grafikos tvarkyklės pasirinkimas"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Numatytasis"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Žaidimų tvarkyklė"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Žaidimų tvarkyklė"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Kūrėjo tvarkyklė"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Sistemos grafikos tvarkyklė"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4881,6 +4851,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Nepavyko rasti tinklų. Bandykite dar kartą."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(uždrausta)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Nėra SIM kortelės"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Nėra SIM kortelės"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Nėra"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Kad būtų galima prisijungti, reikia SIM kortelės"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Kad būtų galima prisijungti, reikia „<xliff:g id="WIRELESS_CARRIER">%s</xliff:g>“ SIM kortelės"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Pageidaujamas tinklo režimas: pageidautina WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Pageidaujamas tinklo režimas: tik GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Pageidaujamas tinklo režimas: tik WCDMA"</string>
@@ -4934,6 +4909,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobilieji duomenys"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Prieiga prie duomenų naudojant mobiliojo ryšio tinklą"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Telefone bus automatiškai perjungtos šio operatoriaus paslaugos, kai bus pasiekiamos"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Nepasiekiama jokia SIM kortelė"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Skambučių nuostata"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS nuostata"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Klausti kaskart"</string>
@@ -5122,10 +5098,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Leisti ekranų perdangas skiltyje „Nustatymai“"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Leiskite virš kitų programų rodomoms programoms perdengti skilties „Nustatymai“ ekranus"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Medija"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Slėpti leistuvę pasibaigus medijos seansui"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Naudodami leistuvę galite tęsti seansą iš išskleisto sparčiųjų nustatymų skydelio."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Medijos leistuvė sparčiuosiuose nustatymuose"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Medijos leistuvę rodyti ilgiau, kad būtų paprasta atnaujinti atkūrimą"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Slėpti leistuvę"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Rodyti leistuvę"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Nėra jokių pasiekiamų leistuvių"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Leidžiamos programos"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"medija"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bus įjungtas „Bluetooth“"</string>
 </resources>
diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml
index f3d5006..6be4c8f 100644
--- a/res/values-lv/arrays.xml
+++ b/res/values-lv/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Vidējs"</item>
     <item msgid="6740026006576843477">"Ilgs"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Īsa"</item>
+    <item msgid="7397961711906421599">"Vidēja"</item>
+    <item msgid="4079132024502041928">"Ilga"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Noklusējums"</item>
     <item msgid="4234707448428002595">"Bezserifa"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA un LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Vispārējie"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Tikai TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Vispārīgie"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 5938316..bb26d71 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -298,7 +298,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Rādīt profila informāciju bloķētā ekrānā"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Konti"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Atrašanās vieta"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Izmantot atrašanās vietu"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Izmantot atrašanās vietu"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Izslēgta"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="zero">Ieslēgta — <xliff:g id="COUNT_1">%1$d</xliff:g> lietotnēm ir piekļuve atrašanās vietai</item>
@@ -332,6 +332,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Autentificēšana, izmantojot seju"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Sākt"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Ja pieejamības autorizācija pēc sejas ir izslēgta, noteiktas iestatīšanas darbības var nedarboties pareizi ar TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Atpakaļ"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Turpināt iestatīšanu"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Izmantot pieejamības iestatīšanu"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -627,7 +630,6 @@
       <item quantity="other">Ir jābūt mazāk par <xliff:g id="NUMBER_1">%d</xliff:g> cipariem.</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Ierīces administrators neļauj izmantot nesen izveidotu PIN."</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Jūsu IT administrators ir bloķējis pārāk vienkāršus PIN kodus. Izmēģiniet sarežģītāku PIN kodu."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Nedrīkst ietvert nederīgu rakstzīmi."</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Ir jāietver vismaz viens burts."</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Ir jāietver vismaz viens cipars."</string>
@@ -668,7 +670,6 @@
       <item quantity="other">Ir jāietver vismaz <xliff:g id="COUNT">%d</xliff:g> rakstzīmes, kas nav cipari</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Ierīces administrators neļauj izmantot nesen izveidotu paroli."</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Jūsu IT administrators ir bloķējis pārāk vienkāršas paroles. Izmēģiniet sarežģītāku paroli."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Augoša, dilstoša vai atkārtota ciparu secība nav atļauta."</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Apstiprināt"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Atcelt"</string>
@@ -812,7 +813,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Ieslēgt Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Izmantot Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Izmantot Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wi-Fi iestatījumi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Bezvadu piekļuves punktu iestatīšana un pārvaldība"</string>
@@ -920,7 +921,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Lai izveidotu savienojumu ar <xliff:g id="SSID">%1$s</xliff:g>, centrējiet tālāk norādīto QR kodu."</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Lai pievienotos Wi-Fi tīklam, skenējiet ātrās atbildes kodu."</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Wi‑Fi tīkla koplietošana"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Lai izveidotu savienojumu ar tīklu “<xliff:g id="SSID">%1$s</xliff:g>” un kopīgotu paroli, skenējiet šo QR kodu"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Lai pievienotos tīklam “<xliff:g id="SSID">%1$s</xliff:g>”, skenējiet šo ātrās atbildes kodu, izmantojot citu ierīci."</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Lai izveidotu savienojumu ar tīklu <xliff:g id="SSID">%1$s</xliff:g>, skenējiet šo QR kodu"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Mēģiniet vēlreiz. Ja problēma joprojām pastāv, sazinieties ar ierīces ražotāju."</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Radās problēma"</string>
@@ -946,8 +947,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi-Fi tīkla parole: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Tīklāja parole: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Automātiski izveidot savienojumu"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Ļaut tālrunim automātiski izveidot savienojumu šī tīkla tuvumā"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Ļaut planšetdatoram automātiski izveidot savienojumu šī tīkla tuvumā"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Atļaujiet savienojuma izveidi ar šo tīklu, kad tas ir pieejams"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Pievienot ierīci"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Izmantojiet ātrās atbildes kodu, lai pievienotu ierīci šim tīklam"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"Ātrās atbildes koda formāts nav derīgs."</string>
@@ -959,7 +959,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Izmantot sistēmas sertifikātus"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Nenorādīt"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Neapstiprināt"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Sertifikāts nav norādīts. Savienojums nebūs privāts."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Tīkla nosaukums ir pārāk garš."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Norādiet domēnu."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Nepieciešams sertifikāts."</string>
@@ -986,6 +985,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Izveidot savienojumu"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi ir ieslēgts"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Izveidots savienojums ar tīklu “<xliff:g id="NETWORK_NAME">%1$s</xliff:g>”"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Notiek savienojuma izveide ar tīklu <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Veido savienojumu…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Neizdevās izveidot savienojumu ar tīklu."</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Neesat tīkla sasniedzamības zonā"</string>
@@ -1060,7 +1060,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Lietotne kopīgo saturu. Lai koplietotu interneta savienojumu, izslēdziet un ieslēdziet tīklāju."</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Nav iestatīta parole"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Tīklāja nosaukums"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Notiek tīklāja <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ieslēgšana..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Notiek tīklāja <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ieslēgšana…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Citas ierīces var savienot ar tīklāju <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Tīklāja parole"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Piekļuves punkta josla"</string>
@@ -1210,7 +1210,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Noteikta satura atsvaidzināšanas biežums tiek automātiski palielināts no 60 līdz 90 Hz. Tas palielina akumulatora lietojumu."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Piespiedu 90 Hz atsvaidzināšanas biežums"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Augstākais atsvaidzināšanas biežums uzlabotai reakcijai uz pieskārienu un labākai animācijas kvalitātei. Tas palielina akumulatora lietojumu."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Atpazīšana ekrānā"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Ieslēgts/ekrāns netiks izslēgts, ja uz to skatīsieties"</string>
@@ -1350,7 +1350,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android versija"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android drošības atjauninājums"</string>
     <string name="model_info" msgid="8997566254717810904">"Modelis"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Modelis: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Modelis un aparatūra"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Aparatūras versija"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Iekārtas ID"</string>
@@ -1625,31 +1624,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Tīklu iestatījumi ir atiestatīti."</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Nevar izdzēst SIM kartes"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Nevar izdzēst lejupielādētās SIM kartes, jo radās kļūda.\n\nRestartējiet ierīci un mēģiniet vēlreiz."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Notīrīt visus datus (atiestatīt rūpnīcas datus)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Atiestatīt rūpnīcas datus"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Tādējādi tiks izdzēsti visi planšetdatora "<b>"iekšējā atmiņā"</b>" esošie dati, tostarp:\n\n"<li>"Google konta dati;"</li>\n<li>"sistēmas un lietotņu dati un iestatījumi;"</li>\n<li>"lejupielādētās lietotnes."</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Tādējādi tiks izdzēsti visi tālruņa "<b>"iekšējā atmiņā"</b>" esošie dati, tostarp:\n\n"<li>"Google konta dati;"</li>\n<li>"sistēmas un lietotņu dati un iestatījumi;"</li>\n<li>"lejupielādētās lietotnes."</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Pašlaik esat pierakstījies šādos kontos:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Šo ierīci izmanto vēl citi lietotāji.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Mūzika"</li>\n<li>"Fotoattēli"</li>\n<li>"Citi lietotāja dati"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM kartes"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Veicot šo darbību, netiks atcelts jūsu mobilo pakalpojumu plāns."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Lai dzēstu mūziku, attēlus un citus lietotāja datus, ir jāizdzēš "<b>"USB atmiņas"</b>" saturs."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Lai dzēstu mūziku, attēlus un citus lietotāja datus, ir jādzēš "<b>"SD kartes"</b>" saturs."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Dzēst visus datus (atiestatīt rūpnīcas datus)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Atiestatīt rūpnīcas datus"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Tādējādi tiks izdzēsti visi planšetdatora "<b>"iekšējā atmiņā"</b>" esošie dati, tostarp:\n\n"<li>"Google konta dati;"</li>\n<li>"sistēmas un lietotņu dati un iestatījumi;"</li>\n<li>"lejupielādētās lietotnes."</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Tādējādi tiks izdzēsti visi tālruņa "<b>"iekšējā atmiņā"</b>" esošie dati, tostarp:\n\n"<li>"Google konta dati;"</li>\n<li>"sistēmas un lietotņu dati un iestatījumi;"</li>\n<li>"lejupielādētās lietotnes."</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Jūs pašlaik esat pierakstījies tālāk norādītajos kontos.\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Šo ierīci izmanto vēl citi lietotāji.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Mūzika"</li>\n<li>"Fotoattēli"</li>\n<li>"Citi lietotāja dati"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM kartes"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Veicot šo darbību, netiks atcelts jūsu mobilo pakalpojumu plāns."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Lai dzēstu mūziku, attēlus un citus lietotāja datus, ir jāizdzēš "<b>"USB atmiņas"</b>" saturs."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Lai dzēstu mūziku, attēlus un citus lietotāja datus, ir jāizdzēš "<b>"SD kartes"</b>" saturs."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Dzēst USB krātuvi"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Dzēst SD karti"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Dzēst visus iekšējā USB atmiņā saglabātos datus, piemēram, mūziku vai fotoattēlus"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Izdzēst visus SD kartē saglabātos datus, piemēram, mūziku vai fotoattēlus"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Dzēst visus datus"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Dzēst visus datus"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Tiks izdzēsta visa jūsu personas informācija un lejupielādētās lietotnes. Šo darbību nevar atsaukt."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Tiks izdzēsta visa jūsu personas informācija, tostarp lejupielādētās lietotnes un SIM kartes. Šo darbību nevar atsaukt."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Dzēst visu"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Atiestatīšana netika veikta, jo nav pieejams pakalpojums Sistēmas tīrīšana."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Vai dzēst visus datus?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Šim lietotājam nav pieejama rūpnīcas datu atiestatīšana."</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Notiek dzēšana"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Lūdzu, uzgaidiet…"</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Dzēst visus datus"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Dzēst visus datus"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Tiks izdzēsta visa jūsu personas informācija un lejupielādētās lietotnes. Šo darbību nevar atsaukt."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Tiks izdzēsta visa jūsu personas informācija, tostarp lejupielādētās lietotnes un SIM kartes. Šo darbību nevar atsaukt."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Vai dzēst visus datus?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Šim lietotājam nav pieejama rūpnīcas datu atiestatīšana."</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Notiek dzēšana"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Lūdzu, uzgaidiet…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Zvanu iestatījumi"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Balss pasta, zvanu pāradresācijas, zvana gaidīšanas, zvanītāja ID iestatīšana"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB saistīšana"</string>
@@ -1697,7 +1694,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Nevar izveidot piesaisti vairāk nekā <xliff:g id="MAXCONNECTION">%1$d</xliff:g> ierīcēm."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Ierīce <xliff:g id="DEVICE_NAME">%1$s</xliff:g> tiks atsaistīta."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ethernet piesaiste"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Koplietojiet tālruņa interneta savienojumu, izmantojot USB Ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Koplietojiet tālruņa interneta savienojumu, izmantojot tīklu Ethernet."</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Izmantojiet tīklāju un piesaisti, lai varētu lietot internetu citās ierīcēs, izveidojot mobilo datu savienojumu. Lietotnes var arī izveidot tīklāju satura kopīgošanai ar tuvumā esošajām ierīcēm."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Izmantojot tīklāju un piesaisti, jūsu ierīces Wi-Fi vai mobilo datu savienojums var nodrošināt interneta savienojumu citām ierīcēm. Lietotnes var arī izveidot tīklāju satura kopīgošanai ar tuvumā esošajām ierīcēm."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Palīdzība"</string>
@@ -2141,13 +2138,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Subtitru preferences"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Palielinājums"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Palielināšanas apgabals"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Palielināšanas iespējošana"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Izvēlieties vienu vai vairākus palielināmos apgabalus ekrāna palielināšanai"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Pilnekrāna režīms"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Ekrāna daļa"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Pilnekrāna režīms un ekrāna daļas palielināšana"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Palielināt visu ekrānu"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Palielināt ekrāna daļu"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Vai pārslēgties uz pieejamības pogu?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Izmantojot trīskāršo skārienu, lai palielinātu daļu ekrāna, tiks aizkavēta ievade un citas darbības.\n\nVai vēlaties pārslēgties uz pieejamības pogas izmantošanu palielināšanai?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Pārslēgties uz pieejamības pogu"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Turpināt izmantot trīskāršo skārienu palielināšanai"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Palielināšanas iestatījumi"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Palielināt, trīsreiz pieskaroties"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Palielināšana ar saīsni"</string>
@@ -2201,11 +2201,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Barošanas poga beidz zvanu"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Liela rādītāja ikona"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Noņemt animācijas"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Mono audio"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Apvienot kanālus, atskaņojot audio"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Audio balanss"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Pa kreisi"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Pa labi"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Mono audio"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Apvienot kanālus, ja tiek atskaņots audio"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Audio balanss"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Pa kreisi"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Pa labi"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Noklusējums"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 sekundes"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 sekundes"</string>
@@ -2235,11 +2235,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Paziņojuma vibrācija"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Zvana vibrācija"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Pieskarieties vienumam Atsauksmes"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Izmantot lietotni <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Atvērt lietotni <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Izmantot krāsu korekciju"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Rādīt parakstus"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Tikai atbalstītai lietotnei"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Izmantot lietotni <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Atvērt lietotni <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Izmantot krāsu korekciju"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Subtitru rādīšana"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Tikai atbalstītai lietotnei"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Subtitru lielums un stils"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> teksta lielums"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Citas iespējas"</string>
@@ -2270,6 +2270,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deiteranomālija"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomālija"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomālija"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Pelēktoņu iestatījums"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Sarkana/zaļa krāsa"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Sarkana/zaļa krāsa"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Zila/dzeltena krāsa"</string>
@@ -2405,7 +2406,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Lietošanas fonā ierobežošana"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Atļaut lietotnei darboties fonā"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Lietotnes darbība fonā nav atļauta."</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Lietošanu fonā nevar ierobežot"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Lietošanu fonā nevar ierobežot."</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Vai ierobežot darbību fonā?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Ierobežojot lietotnes darbību fonā, var rasties šīs lietotnes darbības traucējumi."</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Lietotnei nav iestatīta akumulatora optimizācija, tāpēc to nevar ierobežot.\n\nVispirms iestatiet akumulatora optimizāciju."</string>
@@ -2629,9 +2630,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Iestatīt grafiku"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Akumulatora darbības laika paildzināšana"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Izslēgt, kad uzlādējies"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Akumulatora enerģijas taupīšanas režīms tiek izslēgts, kad tālruņa uzlādes līmenis ir <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Akumulatora enerģijas taupīšanas režīms tiek izslēgts, kad planšetdatora uzlādes līmenis ir <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Akumulatora enerģijas taupīšanas režīms tiek izslēgts, kad ierīces uzlādes līmenis ir <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Akumulatora enerģijas taupīšanas režīms tiek izslēgts, kad tālruņa uzlādes līmenis pārsniedz <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Akumulatora enerģijas taupīšanas režīms tiek izslēgts, kad planšetdatora uzlādes līmenis pārsniedz <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Akumulatora enerģijas taupīšanas režīms tiek izslēgts, kad ierīces uzlādes līmenis pārsniedz <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Ieslēgt"</string>
@@ -2696,6 +2697,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Atiestatīt"</string>
     <string name="tts_play" msgid="2945513377250757221">"Atskaņot"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Adaptīvā savienojamība"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Tiek paildzināts akumulatora darbības ilgums un uzlabota ierīces veiktspēja, automātiski pārvaldot jūsu tīkla savienojumus."</string>
     <string name="credentials_title" msgid="7535942196886123656">"Akreditācijas datu krātuve"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Sertifikāta instalēšana"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Instalēt sertifikātus no atmiņas"</string>
@@ -2707,9 +2710,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Lietotāja akreditācijas dati"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Saglabāto akreditācijas datu skatīšana un pārvaldīšana"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Papildu"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Krātuves tips"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Krātuve aparatūrā"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Tikai programmatūrā"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Šim lietotājam nav pieejami akreditācijas dati."</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Instalēts VPN konfigurācijai un lietotnēm"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Instalēts Wi-Fi konfigurācijai"</string>
@@ -3103,7 +3103,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Maksāšana, izmantojot termināli"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Iestatiet maksājumu lietotni. Pēc tam pietuviniet tālruņa aizmuguri jebkuram terminālim, uz kura redzams bezvadu maksājumu simbols."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Labi"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Vairāk…"</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Vairāk…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Iestatiet noklusējuma maksājumu lietotni"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Atjauniniet noklusējuma maksājumu lietotni"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Bezkontakta terminālī maksājiet, izmantojot lietotni <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3187,7 +3187,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Vienmēr izmantot šo iestatījumu zvaniem"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Atlasīt SIM karti datu pārraidei"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Atlasiet SIM karti, ko izmantot īsziņām"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Notiek datu SIM kartes mainīšana. Tas neaizņems vairāk par minūti..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Notiek datu SIM kartes mainīšana. Tas var ilgt kādu minūti…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Izmantot zvaniem"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"SIM kartes atlasīšana"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM karte <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3331,6 +3331,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"darbību secība, grafiks, akumulatora enerģijas taupīšanas režīms, enerģijas taupīšanas režīms, akumulators, automātiski, procenti"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"VoLTE, paplašinātas zvanu iespējas, 4G zvani"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"pievienot valodu, valodas pievienošana"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"teksta lielums"</string>
     <string name="default_sound" msgid="6604374495015245195">"Noklusējuma skaņa"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Zvanu un paziņojumu signāla skaļums: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Skaļums, vibrācija, režīms “Netraucēt”"</string>
@@ -3370,12 +3371,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Ieslēgšanas skaņas"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Subtitri reāllaikā"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Automātiskie paraksti multividei"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Nav"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="zero">Iestatīti <xliff:g id="ON_COUNT">%d</xliff:g> grafiki</item>
-      <item quantity="one">Iestatīts <xliff:g id="ON_COUNT">%d</xliff:g> grafiks</item>
-      <item quantity="other">Iestatīti <xliff:g id="ON_COUNT">%d</xliff:g> grafiki</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Nav}=1{Iestatīts viens grafiks}zero{Iestatīti # grafiki}one{Iestatīts # grafiks}other{Iestatīti # grafiki}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Netraucēt"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Saņemt paziņojumus tikai no svarīgām personām un lietotnēm"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Traucējumu ierobežošana"</string>
@@ -3443,22 +3439,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Tikai prioritārie pārtraukumi"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Ieslēgts / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Izslēgts / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Izslēgts"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Ieslēgts"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Vaicāt katru reizi"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Līdz brīdim, kad izslēgsiet"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="zero"><xliff:g id="NUM_HOURS">%d</xliff:g> stundu</item>
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> stunda</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> stundas</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> min"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="zero"><xliff:g id="ON_COUNT">%d</xliff:g> grafiki var tikt ieslēgti automātiski</item>
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> grafiks var tikt ieslēgts automātiski</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> grafiki var tikt ieslēgti automātiski</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{Viena stunda}zero{# stundu}one{# stunda}other{# stundas}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{Viena minūte}zero{# minūšu}one{# minūte}other{# minūtes}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Izslēgts}=1{Izslēgts; viens grafiks var tikt ieslēgts automātiski}zero{Izslēgts; # grafiki var tikt ieslēgti automātiski}one{Izslēgts; # grafiks var tikt ieslēgts automātiski}other{Izslēgts; # grafiki var tikt ieslēgti automātiski}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Atļauts pārtraukt režīmā Netraucēt"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Personas"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Lietotnes"</string>
@@ -3504,6 +3490,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Automātiski iestatīt zemākas prioritātes paziņojumus kā neuzkrītošus"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Adaptīvo paziņojumu ranžēšana"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Automātiski ranžēt paziņojumus pēc atbilstības"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Atsauksmes par adaptīvajiem paziņojumiem"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Norādīt korekcijas, kas veiktas paziņojumiem, un rādīt opciju iesniegt sistēmā atsauksmes"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Darbību un atbilžu ieteikumi"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Automātiski rādīt ieteicamās darbības un atbildes"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Rādīt jaunākos un atliktos paziņojumus"</string>
@@ -3705,7 +3693,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Piekļuve pie “Netraucēt”"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Atļaut režīmu “Netraucēt”"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Nevienā instalētajā lietotnē nav pieprasīta piekļuve režīmam “Netraucēt”."</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Notiek lietotņu ielāde..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Notiek lietotņu ielāde…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Pēc jūsu pieprasījuma Android neatļauj šīs lietotnes paziņojumu rādīšanu šajā ierīcē."</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Pēc jūsu pieprasījuma Android neatļauj šīs kategorijas paziņojumu rādīšanu šajā ierīcē."</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Pēc jūsu pieprasījuma Android neatļauj šīs grupas paziņojumu rādīšanu šajā ierīcē."</string>
@@ -3800,12 +3788,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Visas sarunas"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Prioritāras sarunas"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Nav"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="zero"><xliff:g id="CONVERSATIONS">%d</xliff:g> sarunu</item>
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> saruna</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> sarunas</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Nav"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Nav}=1{Viena saruna}zero{# sarunu}one{# saruna}other{# sarunas}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Kas var pārtraukt"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Zvani"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Zvani"</string>
@@ -3814,12 +3797,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Lai dzirdētu atļauto zvanu signālus, pārbaudiet, vai ierīcē ir iestatīts zvanīšanas režīms"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Grafikam <xliff:g id="SCHEDULE_NAME">%1$s</xliff:g> ienākošie zvani ir bloķēti. Varat pielāgot iestatījumus, lai draugi, ģimene vai citas kontaktpersonas varētu ar jums sazināties."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Ar zvaigznīti atzīmētas kontaktpersonas"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="zero">Vēl <xliff:g id="NUM_PEOPLE">%d</xliff:g> kontaktpersonu</item>
-      <item quantity="one">Vēl <xliff:g id="NUM_PEOPLE">%d</xliff:g> kontaktpersona</item>
-      <item quantity="other">Vēl <xliff:g id="NUM_PEOPLE">%d</xliff:g> kontaktpersonas</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Nav"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Nav}=1{{contact_1}}=2{{contact_1} un {contact_2}}=3{{contact_1}, {contact_2} un {contact_3}}zero{{contact_1}, {contact_2} un vēl # kontaktpersonu}one{{contact_1}, {contact_2} un vēl # kontaktpersona}other{{contact_1}, {contact_2} un vēl # kontaktpersonas}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Ziņojumi"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"ziņojumi"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Ziņojumi"</string>
@@ -3828,12 +3806,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Grafikam “<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>” ienākošie ziņojumi ir bloķēti. Varat pielāgot iestatījumus, lai draugi, ģimene vai citas kontaktpersonas varētu ar jums sazināties."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Jūs saņemsiet visus ziņojumus"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Jūs saņemsiet visus zvanus"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Nav"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="zero"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontaktpersonu</item>
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontaktpersona</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontaktpersonas</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Nav}=1{Viena kontaktpersona}zero{# kontaktpersonu}one{# kontaktpersona}other{# kontaktpersonas}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Ikviens"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Kontaktpersonas"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Ar zvaigznīti atzīmētas kontaktpersonas"</string>
@@ -3871,24 +3844,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Visi paziņojumi"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Daži paziņojumi"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Atlasītie lietotāji joprojām var sazināties ar jums, pat ja neatļaujat lietotnēm traucēt jūs."</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="zero"><xliff:g id="APP_NAMES">%s</xliff:g> atļauts pārtraukt</item>
-      <item quantity="one"><xliff:g id="APP_NAMES">%s</xliff:g> atļauts pārtraukt</item>
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> atļauts pārtraukt</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"Vēl <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Nevienai lietotnei nav atļauts pārtraukt}=1{Lietotnei {app_1} ir atļauts pārtraukt}=2{Lietotnei {app_1} un {app_2} ir atļauts pārtraukt}=3{Lietotnei {app_1}, {app_2} un {app_3} ir atļauts pārtraukt}zero{Lietotnei {app_1} un {app_2} un vēl # lietotnēm ir atļauts pārtraukt}one{Lietotnei {app_1} un {app_2} un vēl # lietotnei ir atļauts pārtraukt}other{Lietotnei {app_1} un {app_2} un vēl # lietotnēm ir atļauts pārtraukt}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Lietotnes"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Visi paziņojumi"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Daži paziņojumi"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Paziņojumi, kas var traucēt"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Atļaut visus paziņojumus"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="zero"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> atļauts pārtraukt</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> atļauts pārtraukt</item>
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> atļauts pārtraukt</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Nekam nav atļauts pārtraukt"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"Vēl <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Nekam nav atļauts pārtraukt}=1{Šādiem signāliem ir atļauts pārtraukt: {sound_category_1}}=2{Šādiem signāliem ir atļauts pārtraukt: {sound_category_1} un {sound_category_2}}=3{Šādiem signāliem ir atļauts pārtraukt: {sound_category_1}, {sound_category_2} un {sound_category_3}}zero{Šādiem signāliem ir atļauts pārtraukt: {sound_category_1}, {sound_category_2} un vēl #}one{Šādiem signāliem ir atļauts pārtraukt: {sound_category_1}, {sound_category_2} un vēl #}other{Šādiem signāliem ir atļauts pārtraukt: {sound_category_1}, {sound_category_2} un vēl #}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Nekam nav atļauts pārtraukt"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Nevienai personai nav atļauts pārtraukt"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Dažām personām ir atļauts pārtraukt"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Visām personām ir atļauts pārtraukt"</string>
@@ -4142,7 +4105,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB, ko pārvalda:"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Pievienotā ierīce"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Šī ierīce"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Notiek pārslēgšana."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Notiek pārslēgšana…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Pārslēgšana neizdevās"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Šīs ierīces uzlāde"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Pievienotās ierīces uzlāde"</string>
@@ -4396,7 +4359,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Skatīt detalizētu informāciju"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Datu lietojuma samazinātājs"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Neierobežoti dati"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Fona dati ir izslēgti."</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Fona dati ir izslēgti."</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Ieslēgts"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Izslēgts"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Izmantot datu lietojuma samazinātāju"</string>
@@ -4419,7 +4382,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Ja ierīce ir bloķēta, neļaut paziņojumos rakstīt atbildes vai citu tekstu"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Nokl. pareizrakstības pārbaude"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Pareizrakst. pārb. atlasīšana"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Pareizrakstības pārbaudītāja izmantošana"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Izmantot pareizrakstības pārbaudītāju"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Nav atlasīta"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(nav)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4513,7 +4476,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Lai atbrīvotu vietu krātuvē, krātuves pārvaldnieks noņem no jūsu ierīces dublētos fotoattēlus un videoklipus."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Fotoattēlu un videoklipu noņemšana"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Krātuves pārvaldnieks"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Izmantot krātuves pārvaldnieku"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Izmantot krātuves pārvaldnieku"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automātiski"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Manuāli"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Atbrīvot vietu"</string>
@@ -4551,6 +4514,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Dubultskāriens, lai skatītu tālruņa paziņojumus"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Dubultskāriens, lai skatītu planšetdatora paziņojumus"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Dubultskāriens, lai skatītu ierīces paziņojumus"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Vilkšana paziņojumiem"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Ekrāna apakšējā malā velciet lejup, lai tiktu rādīti paziņojumi."</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Vienas rokas režīms"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Izmantot vienas rokas režīmu"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Iziet, pārslēdzot lietotnes"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Noildze"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 sekundes"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 sekundes"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 sekundes"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"sasniedzamība"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Lai skatītu laiku, paziņojumus un citu informāciju, divreiz pieskarieties ekrānam."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Tālruņa pārbaude paceļot"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Planšetdatora pacelšana, lai skatītu paziņojumus"</string>
@@ -4563,6 +4536,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Planšetdatora paziņojumu pārbaude pieskaroties"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Ierīces paziņojumu pārbaude pieskaroties"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Lai skatītu laiku, paziņojumus un citu informāciju, pieskarieties ekrānam."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Trauksmes poga"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Sākt ārkārtas palīdzības darbības, ja piecreiz strauji nospiežat barošanas pogu."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Brīdinājuma signāls"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Brīdināt pirms darbību sākšanas."</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Ārkārtas kontaktpersonas"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Ziņu skatīšana ar pirksta nospiedumu"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Nospiedumu skeneris"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Lai skatītu paziņojumus, velciet uz leju pār pirksta nospieduma sensoru tālruņa aizmugurē."</string>
@@ -4724,7 +4702,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Iespējot visām lietotnēm"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Grafikas dziņa atlase"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Noklusējums"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Spēles dzinis"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Spēles dzinis"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Grafikas dzinis izstrādātājiem"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Sistēmas grafikas dzinis"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4793,6 +4771,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Neizdevās atrast tīklus. Mēģiniet vēlreiz."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(aizliegts)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Nav SIM kartes"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM karte"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Nav SIM kartes"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Nav"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Lai izveidotu savienojumu, nepieciešama SIM karte"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Lai izveidotu savienojumu, nepieciešama <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> SIM karte"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Ieteicamais tīkla režīms: WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Ieteicamais tīkla režīms: tikai GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Ieteicamais tīkla režīms: tikai WCDMA"</string>
@@ -4846,6 +4829,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobilie dati"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Piekļuve datiem, izmantojot mobilo tīklu"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Tālrunis tiks automātiski pārslēgts uz šo mobilo sakaru operatoru, ja būs sasniedzamības zonā"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Nav pieejama neviena SIM karte."</string>
     <string name="calls_preference" msgid="2166481296066890129">"Vēlamais abonements zvaniem"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Vēlamais tīkls īsziņām"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Vaicāt katru reizi"</string>
@@ -5031,10 +5015,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Atļaut ekrānu pārklāšanu iestatījumos"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Atļaut lietotnēm, ko var rādīt pāri citām lietotnēm, pārklāt iestatījumu ekrānus"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Multivide"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Paslēpiet atskaņotāju, multivides sesijai beidzoties"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Atskaņotāja sesiju varat atsākt izvērstajā ātro iestatījumu panelī."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Multivides atskaņotājs ātrajos iestatījumos"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Rādīt multivides atskaņotāju ilgāku laika periodu, lai varētu ērti atsākt atskaņošanu"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Paslēpt atskaņotāju"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Rādīt atskaņotāju"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Nav pieejams neviens atskaņotājs"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Atļautās lietotnes"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"multivide"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Tiks ieslēgts Bluetooth savienojums."</string>
 </resources>
diff --git a/res/values-mk/arrays.xml b/res/values-mk/arrays.xml
index 1517863..f43fb8f 100644
--- a/res/values-mk/arrays.xml
+++ b/res/values-mk/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Средно"</item>
     <item msgid="6740026006576843477">"Долго"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Кратко"</item>
+    <item msgid="7397961711906421599">"Средно"</item>
+    <item msgid="4079132024502041928">"Долго"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Стандардни"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Глобален"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Само TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Глобален"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index cc80291..0f5fe62 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Прикажи информ. за профил при заклучување екран"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Сметки"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Локација"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Користи ја локацијата"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Користи ја локацијата"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Исклучено"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">Вклучено - <xliff:g id="COUNT_1">%1$d</xliff:g> апликација има пристап до локацијата</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Користење на лицето за проверка"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Започни"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Ако функцијата за пристапност „Отклучување со лик“ е исклучена, некои чекори за поставување можеби нема да работат правилно со TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Назад"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Продолжи"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Поставување на пристапноста"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="other">Мора да има помалку од <xliff:g id="NUMBER_1">%d</xliff:g> цифри</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Администраторот на уредот не дозволува користење на неодамнешен PIN"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Обичните PIN-кодови се блокирани од вашиот IT-администратор. Обидете се со друг PIN."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Ова не може да вклучува неважечки знак"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Мора да содржи најмалку една буква"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Мора да содржи најмалку една цифра"</string>
@@ -653,7 +655,6 @@
       <item quantity="other">Мора да содржи најмалку <xliff:g id="COUNT">%d</xliff:g> знаци што не се букви</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Администраторот на уредот не дозволува користење на неодамнешна лозинка"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Обичните лозинки се блокирани од вашиот IT-администратор. Обидете се со друга лозинка."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Не е дозволена нагорна, надолна или повторлива секвенца на цифри"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Потврди"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Откажи"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Вклучи Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Користи Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Користи Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Поставки за Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Постави и управувај со безжични пристапни точки"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Наместете го QR-кодот во средината на подолниот прозорец за да се поврзете со „<xliff:g id="SSID">%1$s</xliff:g>“"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Скенирајте го QR-кодот за да се поврзете на Wi‑Fi"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Споделете Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Скенирајте го овој QR-код за да се поврзете со „<xliff:g id="SSID">%1$s</xliff:g>“ и да ја споделите лозинката"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Скенирајте го овој QR-код со друг уред за да се придружите на „<xliff:g id="SSID">%1$s</xliff:g>“"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Скенирајте го овој QR-код за да се поврзете со „<xliff:g id="SSID">%1$s</xliff:g>“"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Обидете се повторно. Ако проблемот продолжи, контактирајте со производителот на уредот"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Нешто тргна наопаку"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Лозинка за Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Лозинка за точката на пристап: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Автоматско поврзување"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Дозволи телефонот автоматски да се поврзува во близина на мрежава"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Дозволи таблетот автоматски да се поврзува во близина на мрежава"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Дозволете поврзување на мрежава кога ќе биде во опсег"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Додајте уред"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Користете QR-код за да додадете уред на мрежава"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR-кодот не е во важечки формат"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Користи системски сертификати"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Не обезбедувај"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Не потврдувај"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Нема назначено сертификат. Вашата врска нема да биде приватна."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Името на мрежата е премногу долго."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Мора да се наведе домен."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Потребен е сертификат."</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Поврзи се"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi мрежата е вклучена"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Поврзано со <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Поврзување со <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Се поврзува…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Не успеа да се поврзе со мрежата"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Мрежата не е во опсег"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Апликацијата споделува содржини. За споделување на интернет-врската, исклучете ја, а потоа вклучете ја точката на пристап"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Не е поставена лозинка"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Име на точката на пристап"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Се вклучува <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Се вклучува <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Другите уреди може да се поврзат на <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Лозинка за точката на пристап"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Опсег на точката на пристап"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Течен приказ"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Автоматски ја зголемува зачестеноста на освежување од 60 на 90 Hz за некои содржини. Го зголемува користењето на батеријата."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Течен приказ"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Наметни стапка на освежување од 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Највисока стапка на освежување за подобрена реакција на допир и квалитет на анимацијата. Го зголемува користењето на батеријата."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Вклучен екран"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Вклучено/Екранот нема да се исклучи додека гледате во него"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Верзија на Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Безбедносно ажурирање на Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Модел"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Модел: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Модел и хардвер"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Верзија на хардвер"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ID на опрема"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Мрежните поставки се ресетирани"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Не може да се избришат SIM-картичките"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Преземените SIM-картички не може да се избришат поради грешка.\n\nРестартирајте го уредот и обидете се повторно."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Избриши ги сите податоци (фабричко ресетирање)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Избриши ги сите податоци"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Ова ќе ги избрише сите податоци од "<b>"внатрешната меморија"</b>"на таблетот, заедно со:\n\n"<li>"вашата сметка на Google"</li>\n<li>"податоците и поставките на системот и апликациите"</li>\n<li>"преземените апликации"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Ова ќе ги избрише сите податоци од "<b>"внатрешната меморија"</b>" на телефонот, заедно со:\n\n"<li>"вашата сметка на Google"</li>\n<li>"податоците и поставките на системот и апликациите"</li>\n<li>"преземените апликации"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Моментално сте најавени на следниве сметки:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Присутни се и други корисници на уредот.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"музиката"</li>\n<li>"фотографиите"</li>\n<li>"другите кориснички податоци"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM-картичките"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Со ова нема да се откаже вашиот пакет за мобилни услуги."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"За да исчистите музика, слики и други податоци на корисникот, "<b>"меморијата"</b>" треба да се избрише."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"За да исчистите музика, слики и други податоци на корисникот, "<b>"СД картичката"</b>" треба да се избрише."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Избриши ги сите податоци"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Избриши ги сите податоци"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Ова ќе ги избрише сите податоци од "<b>"внатрешната меморија"</b>"на таблетот, заедно со:\n\n"<li>"вашата сметка на Google"</li>\n<li>"податоците и поставките на системот и апликациите"</li>\n<li>"преземените апликации"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Ова ќе ги избрише сите податоци од "<b>"внатрешната меморија"</b>" на телефонот, заедно со:\n\n"<li>"вашата сметка на Google"</li>\n<li>"податоците и поставките на системот и апликациите"</li>\n<li>"преземените апликации"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Моментално сте најавени на следниве сметки:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Присутни се и други корисници на уредот.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Музика"</li>\n<li>"Фотографии"</li>\n<li>"Други податоци за корисникот"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM-картичките"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Со ова нема да се откаже вашиот пакет за мобилни услуги."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"За да исчистите музика, слики и други податоци на корисникот, "<b>"меморијата"</b>" треба да се избрише."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"За да исчистите музика, слики и други податоци на корисникот, "<b>"СД картичката"</b>" треба да се избрише."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Избриши USB меморија"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Избриши СД картичка"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Избриши ги сите податоци во внатрешната USB меморија, како што се музика или фотографии"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Избриши ги сите податоци на СД картичката, како што се музика или фотографии"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Избриши ги сите податоци"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Избриши ги сите податоци"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Сите ваши лични информации и преземени апликации ќе се избришат. Ова дејство не може да се врати."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Ќе се избришат сите ваши лични информации, заедно со преземените апликации и SIM-картички. Ова дејство не може да се врати."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Избриши сè"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Не се изврши ресетирање зашто услугата за чистење на системот не е достапна."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Да се избришат сите податоци?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Фабричкото ресетирање не е достапно за овој корисник"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Се брише"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Почекајте..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Избриши ги сите податоци"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Избриши ги сите податоци"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Сите ваши лични информации и преземени апликации ќе се избришат. Ова дејство не може да се врати."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Ќе се избришат сите ваши лични информации, заедно со преземените апликации и SIM-картички. Ова дејство не може да се врати."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Да се избришат сите податоци?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Фабричкото ресетирање не е достапно за овој корисник"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Се брише"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Почекајте…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Поставки за повици"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Постави говорна пошта, проследување на повик, повик на чекање, ID на повикувач"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Интернет преку USB"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Не може да се поврзе со повеќе од <xliff:g id="MAXCONNECTION">%1$d</xliff:g> уреди."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ќе се исклучи."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Интернет преку етернет"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Споделете ја интернет-врската на телефонот преку USB-етернет"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Споделете ја интернет-врската на телефонот преку етернет"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Користете точка на пристап и врзување за да овозможите интернет за другите уреди преку вашата мобилна интернет-врска. И апликациите може да создадат точка на пристап за споделување содржини со уредите во близина."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Користете точка на пристап и врзување за да им обезбедите пристап до интернет на други уреди преку Wi‑Fi врската или врската за мобилен интернет. Апликациите исто така може да создаваат точки на пристап за да споделуваат содржини со уредите во близина."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Помош"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Поставки за титлови"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Зголемување"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Област на зголемување"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Овозможи зголемување"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Изберете ја областа на зголемување што сакате да ја користите кога се зголемува екранот"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Цел екран"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Дел од екранот"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Цел екран и дел од екран"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Зголеми цел екран"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Зголеми дел од екранот"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Сакате ли да префрлите на копче за пристапност?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Ако зголемувате дел од екранот со троен допир, пишувањето и другите дејства може да доцнат.\n\nДали сакате да користите копче за пристапност за да зголемувате?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Префрли на копче за пристапност"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Продолжи со зголемување со троен допир"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Поставки за зголемување"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Зголеми со троен допир"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Зголемување со кратенка"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Прекини повик со копче за вклучување"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Голем покажувач на глувчето"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Отстранување анимации"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Моно аудио"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Комбинирај канали кога се пушта аудио"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Баланс на аудио"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Лево"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Десно"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Моно аудио"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Комбинирај канали кога се пушта аудио"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Баланс на аудио"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Лево"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Десно"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Стандардно"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 секунди"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 секунди"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Вибрации при известување"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Вибрации при ѕвонење"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Вибрации при допир"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Користете <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Отвори <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Користи корекција на бои"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Прикажувај титлови"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Само за поддржани апликации"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Користи <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Отворете ја апликацијата <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Користи корекција на боите"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Прикажувај титлови"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Само за поддржани апликации"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Големина и стил на титловите"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Големина на текст: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Повеќе опции"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Девтераномалија"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Протаномалија"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Тританомалија"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Сиви тонови"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Црвена и зелена"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Црвена и зелена"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Сина и жолта"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Ограничување во заднината"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Дозволете апликацијата да работи во заднина"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"На апликациите не им е дозволено да се извршуваат во заднина"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Користењето во заднина не може да се ограничи"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Користењето во заднина не може да се ограничи"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Да се ограничи активноста во заднина?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Апликацијата може да се однесува необично ако ја ограничите нејзината активност во заднина"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Апликацијава не е оптимизирана и не може да се ограничи.\n\nЗа да ја ограничите, прво вклучете оптимизација на батеријата."</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Поставете распоред"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Продолжете го траењето на батеријата"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Исклучи кога ќе се наполни"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"„Штедачот на батерија“ ќе се исклучи кога нивото на батеријата на телефонот ќе биде <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"„Штедачот на батерија“ ќе се исклучи кога нивото на батеријата на таблетот ќе биде на <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"„Штедачот на батерија“ ќе се исклучи кога нивото на батеријата на уредот ќе биде на <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"„Штедачот на батерија“ ќе се исклучи кога телефонот е наполнет над <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"„Штедачот на батерија“ ќе се исклучи кога таблетот е наполнет над <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"„Штедачот на батерија“ ќе се исклучи кога уредот е наполнет над <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Вклучи"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Ресетирај"</string>
     <string name="tts_play" msgid="2945513377250757221">"Пушти"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Паметно поврзување"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Го продолжува траењето на батеријата и ја подобрува изведбата на уредот со автоматско управување со вашите мрежни врски"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Складирање акредитиви"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Инсталирајте сертификат"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Инсталирај сертификати од меморија"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Кориснички акредитиви"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Прегледајте и изменете ги зачуваните акредитиви"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Напредни"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Тип меморија"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Хардверска"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Само софтвер"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Акредитивите не се достапни за овој корисник"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Инсталиран за VPN и апликации"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Инсталиран за Wi-Fi"</string>
@@ -3059,8 +3059,8 @@
     <string name="nfc_payment_pay_with" msgid="3001320460566523453">"Кај бесконтактен терминал, плаќајте со:"</string>
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Плаќање на терминалот"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Поставете апликација за плаќање. Потоа само задржете ја задната страна на телефонот до кој било терминал означен со симболот за плаќање без контакт."</string>
-    <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Разбрав"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Повеќе..."</string>
+    <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Сфатив"</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Повеќе…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Поставете стандардна апликација за плаќање"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Ажурирајте ја стандардната апликација за плаќање"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Кај бесконтактен терминал, плаќајте со <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Секогаш користи го ова за повици"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Изберете SIM за податоци"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Изберете SIM за SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Се префрла SIM-картичката за податоци, ова може да потрае до една минута..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Се префрла SIM-картичката за податоци, ова може да потрае до една минута…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Повикајте со"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Избери SIM-картичка"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"рутина, распоред, штедач на батерија, штедач на енергија, батерија, автоматски, процент"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, напредно повикување, повикување преку 4G"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"додај јазик, додај некој јазик"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"големина на текст"</string>
     <string name="default_sound" msgid="6604374495015245195">"Стандарден звук"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Јачината на звук при ѕвонење и известувања е <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Јачина на звук, вибрации и „Не вознемирувај“"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Вклучете ги звуците"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Автоматски титлови"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Автоматски титлови за аудиовизуелни содржини"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Нема"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one">Поставен е <xliff:g id="ON_COUNT">%d</xliff:g> распоред</item>
-      <item quantity="other">Поставени се <xliff:g id="ON_COUNT">%d</xliff:g> распореди</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Ниеден}=1{Поставен е 1 распоред}one{Поставен е # распоред}other{Поставени се # распореди}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Не вознемирувај"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Добивајте известувања само од важни луѓе и апликации"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Ограничете ги прекините"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Само приоритетно"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Вклучено / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Исклучено / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Исклучено"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Вклучено"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Секогаш прашувај"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Додека не го исклучите"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> час</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> часа</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> минути"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> распоред може да се вклучи автоматски</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> распореди може да се вклучат автоматски</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 час}one{# час}other{# часа}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 минута}one{# минута}other{# минути}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Исклучено}=1{Исклучено / 1 распоред може да се вклучи автоматски}one{Исклучено / # распоред може да се вклучи автоматски}other{Исклучено / # распореди може да се вклучат автоматски}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Што може да го прекинува „Не вознемирувај“"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Луѓе"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Апликации"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Автоматски поставувај ги известувањата со понизок приоритет на „Тивко“"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Приспособливо рангирање известувања"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Автоматски рангирај ги известувањата според важност"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Повратни информации за приспособливи известувања"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Означувај ги приспособувањата извршени на известувањата и прикажувај ја опцијата за обезбедување повратни информации на системот"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Предложени дејства и одговори"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Автоматски прикажувај предложени дејства и одговори"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Прикажувај неодамнешни и одложени известувања"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Пристап до „Не вознемирувај“"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Дозволи „Не вознемирувај“"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Ниту една од инсталираните апликации не побарала пристап до „Не вознемирувај“"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Вчитување апликации…"</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Се вчитуваат апликации…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"На ваше барање, Android го блокира појавувањето на известувањата за апликацијава на уредов"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"На ваше барање, Android го блокира појавувањето на оваа категорија известувања на уредов"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"На ваше барање, Android го блокира појавувањето на оваа група известувања на уредов"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Сите разговори"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Приоритетни разговори"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Нема"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> разговор</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> разговори</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Ниеден"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Ниеден}=1{1 разговор}one{# разговор}other{# разговори}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Кој може да го прекинува"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Повици"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Повици"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"За да проверите дали дозволените повици пуштаат звук, видете дали уредот е поставен да ѕвони"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"За „<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>“, дојдовните повици се блокирани. Може да ги приспособите поставките за да им дозволите на пријателите, семејството или другите контакти да ве добијат."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Контакти означени со ѕвезда"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one"><xliff:g id="NUM_PEOPLE">%d</xliff:g> друг</item>
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> други</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Нема"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Ниеден}=1{{contact_1}}=2{{contact_1} и {contact_2}}=3{{contact_1}, {contact_2} и {contact_3}}one{{contact_1}, {contact_2} и уште #}other{{contact_1}, {contact_2} и уште #}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Пораки"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"пораки"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Пораки"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"За „<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>“, дојдовните пораки се блокирани. Може да ги приспособите поставките за да им дозволите на пријателите, семејството или другите контакти да ве добијат."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Сите пораки може да стигнат до вас"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Сите повици може да стигнат до вас"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Ниеден"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> контакт</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> контакти</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Ниеден}=1{1 контакт}one{# контакт}other{# контакти}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Секој"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Контакти"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Контакти означени со ѕвезда"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Сите известувања"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Некои известувања"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Избраните луѓе ќе може да стапат во контакт со вас, дури и ако не дозволувате апликациите да ве прекинуваат"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one"><xliff:g id="APP_NAMES">%s</xliff:g> може да го прекинуваат</item>
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> може да го прекинуваат</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"уште <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Ниедна апликација не може да го прекинува}=1{{app_1} може да го прекинува}=2{{app_1} и {app_2} може да го прекинуваат}=3{{app_1}, {app_2} и {app_3} може да го прекинуваат}one{{app_1}, {app_2} и уште # може да го прекинуваат}other{{app_1}, {app_2} и уште # може да го прекинуваат}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Апликации"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Сите известувања"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Некои известувања"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Известувања што може да прекинуваат"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Дозволи ги сите известувања"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> може да го прекинуваат</item>
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> може да го прекинуваат</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Ништо не може да го прекинува"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"уште <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Ништо не може да го прекинува}=1{{sound_category_1} може да го прекинува}=2{{sound_category_1} и {sound_category_2} може да го прекинуваат}=3{{sound_category_1}, {sound_category_2} и{sound_category_3} може да го прекинуваат}one{{sound_category_1}, {sound_category_2} и уште # може да го прекинуваат}other{{sound_category_1}, {sound_category_2} и уште # може да го прекинуваат}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Ништо не може да го прекинува"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Никој не може да го прекинува"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Некои луѓе може да го прекинуваат"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Сите луѓе може да го прекинуваат"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB контролирано од"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Поврзан уред"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Овој уред"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Префрлање…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Префрлање…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Не можеше да се префрли"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Полнење на уредот"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Се полни поврзаниот уред"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Прикажи ги деталите"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Штедач на интернет"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Неограничен мобилен интернет"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Исклучен сообраќај во заднина"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Интернетот во заднина е исклучен"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Вклучено"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Исклучено"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Користи „Штедач на интернет“"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Ако уредот е заклучен, спречете внесување одговори или друг текст во известувања"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Стандард. проверка на правопис"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Избери проверка на правопис"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Користење проверка на правопис"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Користи проверка на правопис"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Не е избран"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(нема)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"За помош при ослободувањето простор за меморијата, управникот со меморијата ги отстранува резервните копии од фотографиите и видеата од уредот."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Отстранете фотографии и видеа"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Управник со меморија"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Користи го управникот со меморија"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Користи го управувачот со простор"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Автоматски"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Рачни"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Ослободете простор сега"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Допрете двапати за проверка на телефонот"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Допрете двапати за проверка на таблетот"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Допрете двапати за проверка на уредот"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Повлечете за известувања"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Повлечете надолу на долниот раб на екранот за да ги видите известувањата"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Режим со една рака"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Користи режи со една рака"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Излези при префрлување меѓу апликации"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Време на истекување"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 секунди"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 секунди"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 секунди"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"дофатливост"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"За да ги проверите времето, известувањата и другите информации, допрете двапати на екранот."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Подигни за проверка на телефонот"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Подигнете за да го проверите таблетот"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Допрете за да го проверите таблетот"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Допрете за да го проверите уредот"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"За да ги проверите времето, известувањата и другите информации, допрете го екранот."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Копче за паника"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Започнете ги SOS-дејствата за итни случаи со брзо притискање на копчето за вклучување 5 пати."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Предупредувачки звук"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Предупреди пред да ги започнеш дејствата"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Контакти за итни случаи"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Повлечете отпечаток за известувања"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Повлечете отпечаток"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"За да ги проверите известувањата, повлечете надолу на сензорот за отпечатоци на задната страна на телефонот."</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Овозможи за сите апликации"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Изберете драјвер за графика"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Стандарден"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Драјвер за игри"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Драјвер за игри"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Драјвер за програмери"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Системски драјвер за графика"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Не најдовме мрежи. Обидете се повторно."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(забранета)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Нема SIM-картичка"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Нема SIM"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Нема"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Потребна е SIM за поврзување"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Потребна е SIM од <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> за поврзување"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Претпочитан режим на мрежа: претпочитан е WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Претпочитан режим на мрежа: само GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Претпочитан режим на мрежа: само WCDMA"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Мобилен интернет"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Пристап на интернет преку мобилната мрежа"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Телефонот автоматски ќе се префли на овој оператор кога ќе биде во опсег"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Нема SIM-картичка"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Претпочитана претплата за повици"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Претпочитана претплата за SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Секогаш прашувај"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Дозволи преклопување на екраните на Поставки"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Дозволи апликации што може да прикажуваат врз други апликации да ги преклопуваат екраните на Поставки"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Аудиовизуелни содржини"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Сокриј го плеерот кога сесијата ќе заврши"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Плеерот ви овозможува да ја продолжите сесијата од проширената табла „Брзи поставки“."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Плеер во „Брзи поставки“"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Прикажувај го плеерот подолг период за полесно продолжување на репродукцијата"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Сокриј го плеерот"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Прикажи го плеерот"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Нема достапни плеери"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Дозволени апликации"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"аудиовизуелни содржини"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth ќе се вклучи"</string>
 </resources>
diff --git a/res/values-ml/arrays.xml b/res/values-ml/arrays.xml
index 2edb09e..144fc67 100644
--- a/res/values-ml/arrays.xml
+++ b/res/values-ml/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"ഇടത്തരം"</item>
     <item msgid="6740026006576843477">"ദൈർഘ്യമുള്ളത്"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"കുറഞ്ഞത്"</item>
+    <item msgid="7397961711906421599">"ഇടത്തരം"</item>
+    <item msgid="4079132024502041928">"കൂടിയത്"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"സ്ഥിരമായത്"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"ആഗോളം"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA മാത്രം"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"ആഗോളം"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 337ba5d..2b5b601 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"ലോക്ക് സ്‌ക്രീനിൽ പ്രൊഫൈൽ വിവരം ദൃശ്യമാക്കുക"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"അക്കൗണ്ടുകൾ"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"ലൊക്കേഷൻ"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"ലൊക്കേഷൻ ഉപയോഗിക്കുക"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"ലൊക്കേഷൻ ഉപയോഗിക്കുക"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"ഓഫാക്കുക"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">ഓണാണ് - <xliff:g id="COUNT_1">%1$d</xliff:g> ആപ്പുകൾക്ക് ലൊക്കേഷനിലേക്ക് ആക്‌സ‌സ് ഉണ്ട്</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"പരിശോധിച്ചുറപ്പിക്കാൻ നിങ്ങളുടെ മുഖം ഉപയോഗിക്കൂ"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"ആരംഭിക്കുക"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"മുഖം തിരിച്ചറിഞ്ഞുള്ള അൺലോക്ക് ഉപയോഗസഹായി ഓഫാക്കുകയാണെങ്കിൽ, ചില സജ്ജീകരണ ഘട്ടങ്ങൾ TalkBack-ന് ഒപ്പം ശരിയായി പ്രവർത്തിച്ചേക്കില്ല."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"മടങ്ങുക"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"സജ്ജമാക്കൽ തുടരുക"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"ഉപയോഗസഹായി സജ്ജീകരണം ഉപയോഗിക്കുക"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="one"><xliff:g id="NUMBER_0">%d</xliff:g> അക്കത്തിനേക്കാൾ കുറവായിരിക്കണം</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"ഉപകരണ അഡ്‌മിൻ സമീപകാലത്തുള്ള പിൻ ഉപയോഗിക്കുന്നത് അനുവദിക്കുന്നില്ല"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"നിങ്ങളുടെ ഐടി അഡ്‌മിൻ സാധാരണ പിന്നുകൾ ബ്ലോക്ക് ചെയ്‌തിട്ടുണ്ട്. മറ്റൊരു പിൻ പരീക്ഷിക്കുക."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"ഇതിൽ അസാധുവായൊരു പ്രതീകം ഉണ്ടായിരിക്കാൻ പാടില്ല"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"കുറഞ്ഞത് ഒരു അക്ഷരമെങ്കിലും അടങ്ങിയിരിക്കണം"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"കുറഞ്ഞത് ഒരു അക്കമെങ്കിലും അടങ്ങിയിരിക്കണം"</string>
@@ -653,7 +655,6 @@
       <item quantity="one">കുറഞ്ഞത് സംഖ്യയല്ലാത്ത ഒരു പ്രതീകമെങ്കിലും അടങ്ങിയിരിക്കണം</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"ഒരു സമീപകാല പാസ്‌വേഡ് ഉപയോഗിക്കാൻ ഉപകരണ അഡ്‌മിൻ അനുവദിക്കുന്നില്ല"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"നിങ്ങളുടെ IT അഡ്‌മിൻ സാധാരണ പാസ്‍വേഡുകൾ ബ്ലോക്ക് ചെയ്‌തിട്ടുണ്ട്. മറ്റൊരു പാസ്‍വേഡ് പരീക്ഷിക്കുക."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"അക്കങ്ങൾ ആരോഹണ ക്രമത്തിലോ അവരോഹണ ക്രമത്തിലോ അനുക്രമമായോ നൽകുന്നത് അനുവദനീയമല്ല"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"സ്ഥിരീകരിക്കുക"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"റദ്ദാക്കുക"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"വൈഫൈ"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"വൈഫൈ ഓണാക്കുക"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"വൈഫൈ"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"വൈഫൈ ഉപയോഗിക്കുക"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"വൈഫൈ ഉപയോഗിക്കുക"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"വൈഫൈ ക്രമീകരണങ്ങൾ"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"വൈഫൈ"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"വയർലെസ് ആക്‌സസ് പോയിന്റുകൾ സജ്ജീകരിക്കുക, നിയന്ത്രിക്കുക"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"“<xliff:g id="SSID">%1$s</xliff:g>” എന്നതിലേക്ക് കണക്‌റ്റ് ചെയ്യാൻ,  ചുവടെയുള്ള QR കോഡിലേക്ക് കേന്ദ്രീകരിക്കുക"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"QR കോഡ് സ്‍കാൻ ചെയ്ത് വൈഫൈയിൽ ചേരുക"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"വൈഫൈ പങ്കിടുക"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"“<xliff:g id="SSID">%1$s</xliff:g>” എന്നതിലേക്ക് കണക്‌റ്റ് ചെയ്യാൻ ഈ QR കോഡ് സ്‌കാൻ ചെയ്യുകയും പാസ്‌വേഡ് പങ്കിടുകയും ചെയ്യുക"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"“<xliff:g id="SSID">%1$s</xliff:g>” എന്നതിൽ ചേരാൻ, മറ്റൊരു ഉപകരണം ഉപയോഗിച്ച് ഈ QR കോഡ് സ്‌കാൻ ചെയ്യുക"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"“<xliff:g id="SSID">%1$s</xliff:g>\" എന്നതിലേക്ക് കണക്‌റ്റ് ചെയ്യാൻ ഈ QR കോഡ് സ്‌കാൻ ചെയ്യുക"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"വീണ്ടും ശ്രമിക്കുക. പ്രശ്‌നം തുടരുകയാണെങ്കിൽ, ഉപകരണ നിർമ്മാതാവിനെ ബന്ധപ്പെടുക"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"എന്തോ കുഴപ്പമുണ്ടായി"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"വൈഫൈ പാസ്‌വേഡ്: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"ഹോട്ട്‌സ്‌പോട്ടിന്റെ പാസ്‌വേഡ്: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"സ്വയമേവ കണ‌ക്റ്റ് ചെയ്യുക"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"ഈ നെറ്റ്‌വർക്കിന് സമീപമെത്തുമ്പോൾ സ്വയമേവ കണക്‌റ്റ് ചെയ്യാൻ ഫോണിനെ അനുവദിക്കുക"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"ഈ നെറ്റ്‌വർക്കിന് സമീപമെത്തുമ്പോൾ സ്വയമേവ കണക്‌റ്റ് ചെയ്യാൻ ടാബ്‌ലെറ്റിനെ അനുവദിക്കുക"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"പരിധിയിൽ വരുമ്പോൾ ഈ നെറ്റവർക്കിലേക്ക് കണക്ഷൻ അനുവദിക്കുക"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"ഉപകരണം ചേർക്കുക"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"ഈ നെറ്റ്‌വർക്കിലേക്ക് ഒരു ഉപകരണം ചേർക്കാൻ ഒരു QR കോഡ് ഉപയോഗിക്കൂ"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR കോഡ് സാധുവായ ഫോർമാറ്റിലല്ല"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"സിസ്റ്റം സർട്ടിഫിക്കറ്റുകൾ ഉപയോഗിക്കുക"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"നൽകരുത്"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"സാധൂകരിക്കരുത്"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"സർട്ടിഫിക്കറ്റൊന്നും വ്യക്തമാക്കിയിട്ടില്ല. നിങ്ങളുടെ കണക്ഷൻ സ്വകാര്യമായിരിക്കുകയില്ല."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"നെറ്റ്‌വർക്കിന്റെ പേര് ദൈർഘ്യമേറിയതാണ്."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"ഒരു ഡൊമെയ്ൻ വ്യക്തമാക്കിയിരിക്കണം."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"സർട്ടിഫിക്കറ്റ് ആവശ്യമാണ്."</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"കണക്റ്റ് ചെയ്യുക"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"വൈഫൈ ഓണാക്കി"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> എന്നതിലേക്ക് കണക്റ്റ് ചെയ്‌തു"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> എന്നതിലേക്ക് കണക്‌റ്റ് ചെയ്യുന്നു"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"കണക്റ്റ് ചെയ്യുന്നു…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"നെറ്റ്‌വർക്കിൽ കണക്റ്റുചെയ്യുന്നതിൽ പരാജയപ്പെട്ടു"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"നെറ്റ്‌വർക്ക് പരിധിയിലില്ല"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"ആപ്പ് ഉള്ളടക്കം പങ്കിടുന്നു. ഇന്‍റർനെറ്റ് കണക്ഷൻ പങ്കിടാൻ, ഹോട്ട്‌സ്പോട്ട് ഓഫാക്കുക, തുടർന്ന് ഓണാക്കുക:"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"പാസ്‍വേഡ് സജ്ജീകരിച്ചിട്ടില്ല"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"ഹോട്ട്‌സ്‌പോട്ടിന്റെ പേര്"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ഓണാക്കുന്നു..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ഓണാക്കുന്നു…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ഹോട്ട്‌സ്പോട്ടിലേക്ക് മറ്റ് ഉപകരണങ്ങൾക്ക് കണക്റ്റുചെയ്യാൻ കഴിയും"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"ഹോട്ട്‌സ്‌പോട്ടിന്റെ പാസ്‌വേഡ്"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP ബാൻഡ്"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"സ്‌മൂത്ത് ഡിസ്പ്ലേ"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"ചില ഉള്ളടക്കങ്ങളുടെ പുതുക്കൽ നിരക്ക് 60 Hz-ൽ നിന്നും 90 Hz-ലേക്ക് സ്വയമേവ ഉയർത്തുന്നു. ബാറ്ററി ഉപയോഗം വർദ്ധിപ്പിക്കുന്നു."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"സ്‌മൂത്ത് ഡിസ്പ്ലേ"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"ഫോഴ്‌സ് 90 Hz പുതുക്കൽ നിരക്ക്"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"മെച്ചപ്പെട്ട സ്‌പർശന പ്രതികരണശേഷി, ആനിമേഷൻ നിലവാരം എന്നിവയ്‌ക്കുള്ള ഉയർന്ന പുതുക്കൽ നിരക്ക്. ബാറ്ററി ഉപയോഗം വർദ്ധിപ്പിക്കുന്നു."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"സ്ക്രീൻ ശ്രദ്ധ"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"ഓണാണ് / നിങ്ങൾ അതിൽ നോക്കുന്നുണ്ടെങ്കിൽ സ്ക്രീൻ ഓഫാക്കില്ല"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android പതിപ്പ്"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android സുരക്ഷാ അപ്ഡേറ്റ്"</string>
     <string name="model_info" msgid="8997566254717810904">"മോഡല്‍"</string>
-    <string name="model_summary" msgid="2246651782442466213">"മോഡൽ: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"മോഡലും ഹാർഡ്‌വെയറും"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"ഹാർഡ്‌വെയർ പതിപ്പ്"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ഉപകരണ ഐഡി"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"നെറ്റ്‌വർക്ക് ക്രമീകരണം റീസെറ്റുചെയ്‌തു"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"SIM-കൾ മായ്ക്കാനാവില്ല"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"പിശക് കാരണം ഡൗൺലോഡ് ചെയ്‌ത ഈ SIM-കൾ മായ്ക്കാനാവില്ല.\n\nനിങ്ങളുടെ ഉപകരണം റീസ്‌റ്റാർട്ട് ചെയ്‌ത് വീണ്ടും ശ്രമിക്കുക."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"എല്ലാ ഡാറ്റയും മായ്‌ക്കുക (ഫാക്‌ടറി റീസെറ്റ്)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"എല്ലാ ഡാറ്റയും മായ്‌ക്കുക (ഫാക്‌ടറി റീസെറ്റ്)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"ഇത് നിങ്ങളുടെ ടാബ്‌ലെറ്റിന്റെ "<b>"ഉള്ളിലെ മെമ്മറിയിൽ"</b>" നിന്നും ഇനിപ്പറയുന്നവയുൾപ്പെടെ എല്ലാ ഡാറ്റയും മായ്ക്കും:\n\n"<li>"നിങ്ങളുടെ Google അക്കൗണ്ട്"</li>\n<li>"സിസ്‌റ്റത്തിന്റെയും ആപ്പിന്റെയും, ഡാറ്റയും ക്രമീകരണവും"</li>\n<li>"ഡൗൺലോഡ് ചെയ്‌ത ആപ്പുകൾ"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"ഇത് നിങ്ങളുടെ ഫോണിന്‍റെ "<b>"ഉള്ളിലെ മെമ്മറിയിലുള്ള"</b>" എല്ലാ ഡാറ്റയും മായ്ക്കും, അതിൽ ഇവയുൾപ്പെടുന്നു:\n\n"<li>"നിങ്ങളുടെ Google അക്കൗണ്ട്"</li>\n<li>"സിസ്‌റ്റത്തിന്റെയും ആപ്പിന്റെയും, ഡാറ്റയും ക്രമീകരണവും"</li>\n<li>"ഡൗൺലോഡ് ചെയ്‌ത ആപ്പുകൾ"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n" നിലവിൽ, നിങ്ങൾ ഇനിപ്പറയുന്ന അക്കൗണ്ടുകളിലേക്ക് സൈൻ ഇൻ ചെ‌യ്തിരിക്കുന്നു:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"ഈ ഉപകരണത്തിൽ മറ്റ് ഉപയോക്താക്കളുണ്ട്.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"സംഗീതം"</li>\n<li>"ഫോട്ടോകൾ"</li>\n<li>"മറ്റ് ഉപയോക്തൃ ഡാറ്റ"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"ഇ-സിമ്മുകൾ"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"നിങ്ങളുടെ മൊബൈൽ സർവീസ് പ്ലാൻ ഇത് റദ്ദാക്കില്ല."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"സംഗീതം, ചിത്രങ്ങൾ, മറ്റ് ഉപയോക്തൃ ഡാറ്റ എന്നിവ മായ്ക്കുന്നതിന്, "<b>"USB സ്റ്റോറേജ് "</b>" മായ്ക്കേണ്ടതുണ്ട്."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"സംഗീതം, ചിത്രങ്ങൾ, മറ്റ് ഉപയോക്തൃ ഡാറ്റ എന്നിവ മായ്ക്കുന്നതിന്, "<b>"SD കാർഡ്"</b>" മായ്ക്കേണ്ടതുണ്ട്."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"എല്ലാ ഡാറ്റയും മായ്‌ക്കുക (ഫാക്‌ടറി റീസെറ്റ്)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"എല്ലാ ഡാറ്റയും മായ്‌ക്കുക (ഫാക്‌ടറി റീസെറ്റ്)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"ഇത് നിങ്ങളുടെ ടാബ്‌ലെറ്റിന്റെ "<b>"ഉള്ളിലെ മെമ്മറിയിൽ"</b>" നിന്നും ഇനിപ്പറയുന്നവ ഉൾപ്പെടെയുള്ള എല്ലാ ഡാറ്റയും മായ്ക്കും:\n\n"<li>"നിങ്ങളുടെ Google അക്കൗണ്ട്"</li>\n<li>"സിസ്‌റ്റം, ആപ്പ് ഡാറ്റയും ക്രമീകരണവും"</li>\n<li>"ഡൗൺലോഡ് ചെയ്‌ത ആപ്പുകൾ"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"ഇത് നിങ്ങളുടെ ഫോണിന്‍റെ "<b>"ഉള്ളിലെ മെമ്മറിയിൽ"</b>" നിന്നും ഇനിപ്പറയുന്നവ ഉൾപ്പെയുള്ള എല്ലാ ഡാറ്റയും മായ്ക്കും:\n\n"<li>"നിങ്ങളുടെ Google അക്കൗണ്ട്"</li>\n<li>"സിസ്‌റ്റം, ആപ്പ് ഡാറ്റയും ക്രമീകരണവും"</li>\n<li>"ഡൗൺലോഡ് ചെയ്‌ത ആപ്പുകൾ"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n" ഇനിപ്പറയുന്ന അക്കൗണ്ടുകളിൽ നിങ്ങൾ നിലവിൽ സൈൻ ഇൻ ചെയ്‌തിരിക്കുന്നു:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"ഈ ഉപകരണത്തിൽ മറ്റ് ഉപയോക്താക്കളുണ്ട്.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"സംഗീതം"</li>\n<li>"ഫോട്ടോകൾ"</li>\n<li>"മറ്റ് ഉപയോക്തൃ ഡാറ്റ"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM-കൾ"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"നിങ്ങളുടെ മൊബൈൽ സർവീസ് പ്ലാൻ ഇത് റദ്ദാക്കില്ല."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"സംഗീതം, ചിത്രങ്ങൾ, മറ്റ് ഉപയോക്തൃ ഡാറ്റ എന്നിവ മായ്ക്കുന്നതിന്, "<b>"USB സ്‌റ്റോറേജ് "</b>" മായ്ക്കേണ്ടതുണ്ട്."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"സംഗീതം, ചിത്രങ്ങൾ, മറ്റ് ഉപയോക്തൃ ഡാറ്റ എന്നിവ മായ്ക്കുന്നതിന്, "<b>"SD കാർഡ്"</b>" മായ്‌ക്കേണ്ടതുണ്ട്."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USB സ്റ്റോറേജ്  മായ്ക്കുക"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SD കാർഡ് മായ്ക്കുക"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"ആന്തരിക USB സംഭരണത്തിലെ സംഗീതമോ ഫോട്ടോകളോ പോലുള്ള എല്ലാ ഡാറ്റയും മായ്ക്കുക"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"സംഗീതമോ ഫോട്ടോകളോ പോലുള്ള, SD കാർഡിലെ എല്ലാ ഡാറ്റയും മായ്ക്കുക"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"എല്ലാ ഡാറ്റയും മായ്ക്കുക"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"എല്ലാ ഡാറ്റയും മായ്ക്കുക"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"നിങ്ങളുടെ എല്ലാ വ്യക്തിഗത വിവരവും ഡൗൺലോഡ് ചെയ്‌ത ആപ്പുകളും ഇല്ലാതാക്കപ്പെടും. ഈ പ്രവർത്തനം പഴയപടിയാക്കാനാകില്ല."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"ഡൗൺലോഡ് ചെയ്‌ത ആപ്പുകളും SIM-കളും ഉൾപ്പെടെ നിങ്ങളുടെ എല്ലാ വ്യക്തിഗത വിവരവും ഇല്ലാതാക്കപ്പെടും. ഈ പ്രവർത്തനം പഴയപടിയാക്കാനാകില്ല."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"എല്ലാം മായ്ക്കുക"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"സി‌സ്റ്റം മായ്ക്കുക സേവനം ലഭ്യമല്ലാത്തതിനാൽ പുനഃസജ്ജീകരണമൊന്നും നടത്തിയില്ല."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"എല്ലാ ഡാറ്റയും മായ്‌ക്കണോ?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"ഈ ഉപയോക്താവിനായി ഫാക്‌ടറി പുനഃസജ്ജമാക്കൽ ലഭ്യമല്ല"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"മായ്‌ക്കുന്നു"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"കാത്തിരിക്കുക..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"എല്ലാ ഡാറ്റയും മായ്ക്കുക"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"എല്ലാ ഡാറ്റയും മായ്ക്കുക"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"നിങ്ങളുടെ എല്ലാ വ്യക്തിപര വിവരവും ഡൗൺലോഡ് ചെയ്‌ത ആപ്പുകളും ഇല്ലാതാക്കപ്പെടും. ഈ പ്രവർത്തനം പഴയപടിയാക്കാനാകില്ല."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"ഡൗൺലോഡ് ചെയ്‌ത ആപ്പുകളും SIM-കളും ഉൾപ്പെടെ നിങ്ങളുടെ എല്ലാ വ്യക്തിപര വിവരവും ഇല്ലാതാക്കപ്പെടും. ഈ പ്രവർത്തനം പഴയപടിയാക്കാനാകില്ല."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"എല്ലാ ഡാറ്റയും മായ്‌ക്കണോ?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"ഈ ഉപയോക്താവിനായി ഫാക്‌ടറി റീസെറ്റ് ലഭ്യമല്ല"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"മായ്‌ക്കുന്നു"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"കാത്തിരിക്കുക…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"കോൾ ക്രമീകരണങ്ങൾ"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"വോയ്‌സ് മെയിൽ, കോൾ കൈമാറ്റം, കോൾ വെയ്‌റ്റിംഗ്, വിളിച്ച നമ്പർ എന്നിവ സജ്ജീകരിക്കുക"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB ടെതറിംഗ്"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g>-ൽ കൂടുതൽ ഉപകരണങ്ങളിൽ ടെതർ ചെയ്യാനായില്ല."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ടെതർ ചെയ്‌തത് മാറ്റും."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"ഇതർനെറ്റ് ടെതറിംഗ്"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"USB ഇതർനെറ്റ് വഴി ഫോണിന്റെ ഇന്റർനെറ്റ് കണക്ഷൻ പങ്കിടുക"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"ഇതർനെറ്റ് വഴി ഫോണിന്റെ ഇന്റർനെറ്റ് കണക്ഷൻ പങ്കിടുക"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"നിങ്ങളുടെ മൊബൈൽ ഡാറ്റാ കണക്ഷനിലൂടെ മറ്റ് ഉപകരണങ്ങളിലേക്ക് ഇന്‍റർനെറ്റ് നൽകാൻ ഹോട്ട്‌സ്പോട്ടും ‌ടെതറിംഗും ഉപയോഗിക്കുക. ചുറ്റുവട്ടത്തുള്ള ഉപകരണങ്ങളുമായി ഉള്ളടക്കം പങ്കിടാൻ ആപ്പുകൾക്കും ഹോട്ട്‌സ്പോട്ട് സൃഷ്ടിക്കാൻ കഴിയും."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"നിങ്ങളുടെ വൈഫൈ വഴിയോ മൊബൈൽ ഡാറ്റാ കണക്ഷൻ വഴിയോ മറ്റ് ഉപകരണങ്ങളിലേക്ക് ഇന്റർനെറ്റ് നൽകാൻ ഹോട്ട്‌സ്പോട്ടും ടെതറിംഗും ഉപയോഗിക്കുക. സമീപമുള്ള ഉപകരണങ്ങളുമായി ഉള്ളടക്കം പങ്കിടാൻ ആപ്പുകൾക്ക് ഹോട്ട്‌സ്പോട്ട് സൃഷ്‌ടിക്കാനുമാവും."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"സഹായം"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"അടിക്കുറിപ്പ് മുൻഗണനകൾ"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"മാഗ്നിഫിക്കേഷൻ"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"മാഗ്നിഫിക്കേഷൻ ഏരിയ"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"മാഗ്നിഫിക്കേഷൻ പ്രവർത്തനക്ഷമമാക്കൽ"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"സ്‌ക്രീൻ മാഗ്നിഫൈ ചെയ്യാൻ, മാഗ്നിഫിക്കേഷൻ ഏരിയ(കൾ) തിരഞ്ഞെടുക്കുക"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"പൂര്‍ണ്ണ സ്ക്രീന്‍"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"സ്‌ക്രീനിന്റെ ഭാഗം"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"പൂർണ്ണ സ്‌ക്രീനും സ്‌ക്രീനിന്റെ ഭാഗവും"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"മുഴുവൻ സ്‌ക്രീനും മാഗ്നിഫൈ ചെയ്യുക"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"സ്‌ക്രീനിന്റെ ഭാഗം മാഗ്നിഫൈ ചെയ്യുക"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"ഉപയോഗസഹായി ബട്ടണിലേക്ക് മാറണോ?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"സ്ക്രീനിലൊരു ഭാഗം മാഗ്നിഫൈ ചെയ്യാൻ മൂന്ന് തവണ ടാപ്പ് ചെയ്യൽ ഉപയോഗിക്കുന്നത് ടൈപ്പിംഗും മറ്റ് പ്രവർത്തനങ്ങളും വൈകുന്നതിന് കാരണമാകും.\n\nഉപയോഗസഹായി ബട്ടൺ ഉപയോഗിച്ച് മാഗ്നിഫൈ ചെയ്യുന്നതിലേക്ക് മാറണമെന്നുണ്ടോ?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"ഉപയോഗസഹായി ബട്ടണിലേക്ക് മാറുക"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"മൂന്ന് തവണ ടാപ്പ് ചെയ്‌ത് മാഗ്നിഫൈ ചെയ്യൽ തുടരുക"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"മാഗ്നിഫിക്കേഷൻ ക്രമീകരണം"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"3 തവണ ടാപ്പ് ചെയ്‌ത് മാഗ്നിഫൈചെയ്യൂ"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"കുറുക്കുവഴിയിലൂടെ മാഗ്നിഫൈ ചെയ്യൂ"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"പവർബട്ടൺ കോൾ നിർത്തുന്നു"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"വലിയ മൗസ് പോയിന്റർ"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"ആനിമേഷനുകൾ നീക്കം ചെയ്യുക"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"മോണോ ഓഡിയോ"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"ഓഡിയോ പ്ലേ ചെയ്യുമ്പോൾ ചാനലുകൾ സംയോജിപ്പിക്കുക"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"ഓഡിയോ ബാലൻസ്"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"ഇടത്"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"വലത്"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"മോണോ ഓഡിയോ"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"ഓഡിയോ പ്ലേ ചെയ്യുമ്പോൾ ചാനലുകൾ സംയോജിപ്പിക്കുക"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"ഓഡിയോ ബാലൻസ്"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"ഇടത്"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"വലത്"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"ഡിഫോൾട്ട്"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 സെക്കൻഡ്"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 സെക്കൻഡ്"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"അറിയിപ്പ് വൈബ്രേഷൻ"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"റിംഗ് വൈബ്രേഷൻ"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"സ്‌പർശന ഫീഡ്ബാക്ക്"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ഉപയോഗിക്കുക"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> തുറക്കുക"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"നിറം ക്രമീകരിക്കൽ ഉപയോഗിക്കുക"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"അടിക്കുറിപ്പുകൾ കാണിക്കുക"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"പിന്തുണയുള്ള ആപ്പിന് മാത്രം"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ഉപയോഗിക്കുക"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> തുറക്കുക"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"നിറം ശരിയാക്കൽ ഉപയോഗിക്കുക"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"അടിക്കുറിപ്പുകൾ കാണിക്കുക"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"പിന്തുണയുള്ള ആപ്പിന് മാത്രം"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"അടിക്കുറിപ്പിന്റെ വലുപ്പവും സ്‌റ്റെെലും"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> ടെക്‌സ്‌റ്റ് വലുപ്പം"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"കൂടുതൽ‍ ഓപ്ഷനുകൾ"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"ചുവപ്പ്, പച്ച നിറങ്ങളോടുള്ള വർണ്ണാന്ധത"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"ചുവപ്പ്, പച്ച നിറങ്ങളോടുള്ള വർണ്ണാന്ധത"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"നീല, മഞ്ഞ നിറങ്ങളോടുള്ള വർണ്ണാന്ധത"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"ഗ്രേസ്‌കെയിൽ"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"ചുവപ്പ്-പച്ച"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"ചുവപ്പ്-പച്ച"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"നീല-മഞ്ഞ"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"പശ്ചാത്തല നിയന്ത്രണം"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"പശ്ചാത്തലത്തിൽ റൺ ചെയ്യുന്നതിന് ആപ്പിനെ അനുവദിക്കുക"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"പശ്ചാത്തലത്തിൽ റൺ ചെയ്യാൻ ആപ്പിനെ അനുവദിച്ചിട്ടില്ല"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"പശ്ചാത്തലം ഉപയോഗം നിയന്ത്രിക്കാനാവില്ല"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"പശ്ചാത്തല ഉപയോഗം നിയന്ത്രിക്കാനാകില്ല"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"പശ്ചാത്തല പ്രവർത്തനം പരിമിതപ്പെടുത്തണോ?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"നിങ്ങൾ ഒരു ആപ്പിനായി പശ്ചാത്തല പ്രവർത്തനം പരിമിതപ്പെടുത്തുകയാണെങ്കിൽ, അത് ശരിയായി പ്രവർത്തിക്കാനിടയില്ല."</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"ബാറ്ററി ഓപ്‌റ്റിമൈസ് ചെയ്യാൻ ഈ ആപ്പ് സജ്ജീകരിക്കാത്തതിനാൽ, നിങ്ങൾക്ക് ഇത് നിയന്ത്രിക്കാനാവില്ല.\n\nആപ്പ് നിയന്ത്രിക്കാൻ, ആദ്യം ബാറ്ററി ഓപ്‌റ്റിമൈസേഷൻ ഓണാക്കുക."</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"ഷെഡ്യൂള്‍‌ സജ്ജീകരിക്കൂ"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"ബാറ്ററി ലൈഫ് നീട്ടുക"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"ചാർജായാൽ ഓഫാക്കുക"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"നിങ്ങളുടെ ഫോൺ <xliff:g id="PERCENT">%1$s</xliff:g>-ത്തിൽ എത്തുമ്പോൾ ബാറ്ററി ലാഭിക്കൽ ഓഫാകും"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"നിങ്ങളുടെ ടാബ്‌ലെറ്റ് <xliff:g id="PERCENT">%1$s</xliff:g> എത്തുമ്പോൾ ബാറ്ററി ലാഭിക്കൽ ഓഫാവും"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"നിങ്ങളുടെ ഉപകരണം <xliff:g id="PERCENT">%1$s</xliff:g> എത്തുമ്പോൾ ബാറ്ററി ലാഭിക്കൽ ഓഫാവും"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"നിങ്ങളുടെ ഫോണിന്റെ ചാർജ് <xliff:g id="PERCENT">%1$s</xliff:g>-ത്തിന് മുകളിലാകുമ്പോൾ ബാറ്ററി ലാഭിക്കൽ ഓഫാകും"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"നിങ്ങളുടെ ടാബ്‌ലെറ്റിന്റെ ചാർജ് <xliff:g id="PERCENT">%1$s</xliff:g>-ത്തിന് മുകളിലാകുമ്പോൾ ബാറ്ററി ലാഭിക്കൽ ഓഫാകും"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"നിങ്ങളുടെ ഉപകരണത്തിന്റെ ചാർജ് <xliff:g id="PERCENT">%1$s</xliff:g>-ത്തിന് മുകളിലാകുമ്പോൾ ബാറ്ററി ലാഭിക്കൽ ഓഫാകും"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"ഓണാക്കുക"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"റീസെറ്റ് ചെയ്യുക"</string>
     <string name="tts_play" msgid="2945513377250757221">"പ്ലേ ചെയ്യുക"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"അഡാപ്റ്റീവ് കണക്റ്റിവിറ്റി"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"നിങ്ങളുടെ നെറ്റ്‌വർക്ക് കണക്ഷൻ സ്വയമേവ മാനേജ് ചെയ്യുന്നതിലൂടെ ബാറ്ററി ലൈഫ് വർദ്ധിപ്പിക്കുകയും ഉപകരണത്തിന്റെ പ്രകടനം മെച്ചപ്പെടുത്തുകയും ചെയ്യുന്നു"</string>
     <string name="credentials_title" msgid="7535942196886123656">"ക്രെഡൻഷ്യൽ സ്റ്റോറേജ്"</string>
     <string name="credentials_install" msgid="3933218407598415827">"സർട്ടിഫിക്കറ്റ് ഇൻസ്റ്റാൾ ചെയ്യൂ"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"സ്റ്റോറേജിൽനിന്ന് സർട്ടിഫിക്കറ്റുകൾ ഇൻസ്റ്റാൾ ചെയ്യുക"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"ഉപയോക്തൃ ക്രെഡന്‍ഷ്യലുകൾ"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"സംഭരിച്ച ക്രെഡന്‍ഷ്യലുകൾ കാണുക, പരിഷ്ക്കരിക്കുക"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"വിപുലമായത്"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"സ്‌റ്റോറേജ് തരം"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"ഹാർഡ്‌വെയറിൽ സംഭരിച്ചത്"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"സോഫ്‌റ്റ്‌വെയറിൽ മാത്രം"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"ഈ ഉപയോക്താവിന് ക്രെഡൻഷ്യലുകളൊന്നും ലഭ്യമല്ല"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN, ആപ്‌സ് എന്നിവയ്ക്കായി ഇൻസ്റ്റാൾ ചെയ്തു"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"വൈഫൈ ഇൻസ്റ്റാൾ ചെയ്തു"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"പേയ്മെന്റ് മെഷീനിൽ പണമടയ്ക്കൽ"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"ഒരു പേയ്മെന്റ് ആപ്പ് സജ്ജീകരിക്കുക. തുടർന്ന് കോണ്ടാക്റ്റ്‍ലെസ് ചിഹ്നമുള്ള ഏത് പേയ്മെന്റ് മെഷീനിലും നിങ്ങളുടെ ഫോണിന്റെ പിൻവശം കാണിക്കുക."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"മനസ്സിലായി"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"കൂടുതൽ‍..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"കൂടുതൽ…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"ഡിഫോൾട്ട് പണം നൽകിയുള്ള ആപ്പ് സജ്ജീകരിക്കൂ"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"ഡിഫോൾട്ട് പണം നൽകിയുള്ള ആപ്പ് അപ്ഡേറ്റ് ചെയ്യുക"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"കോൺടാക്റ്റ്‌ലെസ് ടെർമിനലിൽ, <xliff:g id="APP">%1$s</xliff:g> ഉപയോഗിച്ച് പണമടയ്ക്കുക"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"ഇത് എല്ലായ്‌പ്പോഴും കോളുകൾക്കായി ഉപയോഗിക്കുക"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"ഡാറ്റയ്‌ക്കായി ഒരു SIM തിരഞ്ഞെടുക്കുക"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"SMS-നായി ഒരു SIM തിരഞ്ഞെടുക്കുക"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"ഡാറ്റാ SIM മാറുന്നു, ഇതിന് കുറച്ച് സമയടുത്തേക്കാം..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"ഡാറ്റാ SIM മാറുന്നു, ഇതിന് ഒരു മിനിറ്റ് വരെ സമയമെടുത്തേക്കാം…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"ഇത് ഉപയോഗിച്ച് വിളിക്കുക"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"ഒരു സിം കാർഡ് തിരഞ്ഞെടുക്കുക"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"സിം <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"ദിനചര്യ, ഷെഡ്യൂൾ, ബാറ്ററി ലാഭിക്കൽ, പവർ സേവർ, ബാറ്ററി, സ്വയമേവ, ശതമാനം"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, വിപുലമായ കോളിംഗ്, 4g കോളിംഗ്"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"ഭാഷ ചേർക്കുക, ഒരു ഭാഷ ചേർക്കുക"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"ടെക്‌സ്‌റ്റ് വലുപ്പം"</string>
     <string name="default_sound" msgid="6604374495015245195">"സ്ഥിര ശബ്‌ദം"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"റിംഗ് ചെയ്യുന്നതിന്റെയും അറിയിപ്പിന്റെയും ശബ്‌ദം <xliff:g id="PERCENTAGE">%1$s</xliff:g> ആണ്"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"ശബ്ദം, വൈബ്രേഷൻ, ശല്യപ്പെടുത്തരുത്"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"ശബ്ദങ്ങൾ ഓണാക്കുക"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"തത്സമയ ക്യാപ്‌ഷനുകൾ"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"മീഡിയയ്ക്ക് സ്വയമേവ അടിക്കുറിപ്പ് നൽകുക"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"ഒന്നുമില്ല"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ഷെഡ്യൂളുകൾ സജ്ജീകരിച്ചു</item>
-      <item quantity="one">ഒരു ഷെഡ്യൂൾ സജ്ജീകരിച്ചു</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{ഒന്നുമില്ല}=1{ഒരു ഷെഡ്യൂൾ സജ്ജീകരിച്ചു}other{# ഷെഡ്യൂളുകൾ സജ്ജീകരിച്ചു}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"ശല്യപ്പെടുത്തരുത്"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"പ്രധാനപ്പെട്ട ആളുകളിൽ നിന്നും ആപ്പുകളിൽ നിന്നുമുള്ള അറിയിപ്പ് മാത്രം നേടുക"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"തടസ്സങ്ങൾ പരിമിതപ്പെടുത്തുക"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"മുൻഗണന മാത്രം"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"ഓൺ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"ഓഫ് / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"ഓഫ്"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"ഓൺ"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"എപ്പോഴും ചോദിക്കൂ"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"നിങ്ങൾ ഓഫാക്കുന്നത് വരെ"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> മണിക്കൂർ</item>
-      <item quantity="one">1 മണിക്കൂർ</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> മിനിറ്റ്"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ഷെഡ്യൂളുകൾ സ്വമേധയാ ഓണാക്കാനാവും</item>
-      <item quantity="one">ഒരു ഷെഡ്യൂള്‍‌ സ്വമേധയാ ഓണാക്കാനാവും</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 മണിക്കൂർ}other{# മണിക്കൂർ}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 മിനിറ്റ്}other{# മിനിറ്റ്}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{ഓഫാണ്}=1{ഓഫാണ് / ഒരു ഷെഡ്യൂൾ സ്വയമേവ ഓണാകും}other{ഓഫാണ് / # ഷെഡ്യൂളുകൾ സ്വയമേവ ഓണാകും}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"\'ശല്യപ്പെടുത്തരുത്\' എന്നതിനെ തടസ്സപ്പെടുത്താൻ കഴിയുന്നവ"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"ആളുകൾ"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"ആപ്പുകൾ"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"മുൻഗണന കുറഞ്ഞ അറിയിപ്പുകളെ സ്വയമേവ സൗമ്യം എന്ന് സജ്ജീകരിക്കുക"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"അനുയോജ്യമായ അറിയിപ്പുകളുടെ റാങ്കിംഗ്"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"അറിയിപ്പുകൾ പ്രസക്‌തി അനുസരിച്ച് സ്വയമേവ റാങ്ക് ചെയ്യൂ"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"അനുയോജ്യമായ അറിയിപ്പുകൾക്കുള്ള ഫീഡ്ബാക്ക്"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"അറിയിപ്പുകളിൽ വരുത്തിയ അഡ്‌ജസ്റ്റുമെന്റുകൾ സൂചിപ്പിക്കുകയും സിസ്റ്റത്തിലേക്ക് ഫീഡ്‌ബാക്ക് നൽകാനുള്ള ഓപ്ഷൻ കാണിക്കുകയും ചെയ്യുക"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"നിർദ്ദേശിച്ച പ്രവർത്തനങ്ങളും മറുപടികളും"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"നിർദ്ദേശിച്ച പ്രവർത്തനങ്ങളും മറുപടികളും സ്വയമേവ കാണിക്കൂ"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"സമീപകാലത്തുള്ളതും സ്‌നൂസ് ചെയ്‌തതുമായ അറിയിപ്പുകൾ കാണിക്കുക"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"\'ശല്യപ്പെടുത്തരുത്\' ആക്‌സസ്"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"\'ശല്യപ്പെടുത്തരുത്\' അനുവദിക്കുക"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"ഇൻസ്റ്റാളുചെയ്‌തവയൊന്നും \'ശല്യപ്പെടുത്തരുത്\' മോഡിൽ പ്രവേശിക്കാൻ അഭ്യർത്ഥിച്ചിട്ടില്ല"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"അപ്ലിക്കേഷനുകൾ ലോഡുചെയ്യുന്നു..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"ആപ്പുകൾ ലോഡ് ചെയ്യുന്നു…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"നിങ്ങളുടെ അഭ്യർത്ഥനപ്രകാരം, ഈ ഉപകരണത്തിൽ ഈ ആപ്പിന്‍റെ അറിയിപ്പുകൾ ദൃശ്യമാകുന്നത് Android ബ്ലോക്ക് ചെയ്യുന്നു"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"നിങ്ങളുടെ അഭ്യർത്ഥനപ്രകാരം, ഈ ഉപകരണത്തിൽ ഈ വിഭാഗത്തിൽപ്പെട്ട അറിയിപ്പുകൾ ദൃശ്യമാകുന്നത് Android ബ്ലോക്ക് ചെയ്യുന്നു"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"നിങ്ങളുടെ അഭ്യർത്ഥനപ്രകാരം, ഈ ഗ്രൂപ്പിൽപ്പെട്ട അറിയിപ്പുകൾ ഈ ഉപകരണത്തിൽ ദൃശ്യമാകുന്നത് Android ബ്ലോക്ക് ചെയ്യുന്നു"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"എല്ലാ സംഭാഷണങ്ങളും"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"മുൻഗണനാ സംഭാഷണങ്ങൾ"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"ഒന്നും വേണ്ട"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> സംഭാഷണങ്ങൾ</item>
-      <item quantity="one">ഒരു സംഭാഷണം</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"ഒന്നും വേണ്ട"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{ഒന്നുമില്ല}=1{ഒരു സംഭാഷണം}other{# സംഭാഷണങ്ങൾ}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"തടസ്സപ്പെടുത്താൻ കഴിയുന്നത് ആർക്ക്"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"കോളുകൾ"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"കോളുകൾ"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"അനുവദനീയമായ കോളുകൾക്ക് ശബ്‌ദം വരുന്നുണ്ടെന്ന് ഉറപ്പാക്കാൻ, റിംഗ് ചെയ്യുക എന്നതിലേക്ക് ഉപകരണം സജ്ജീകരിച്ചിട്ടുണ്ടോയെന്ന് പരിശോധിക്കുക"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ എന്നതിനായുള്ള ഇന്‍‌കമിംഗ് കോളുകള്‍ ബ്ലോക്ക് ചെയ്‌തിരിക്കുന്നു. സുഹൃത്തുക്കളേയും കുടുംബാംഗങ്ങളേയും മറ്റ് കോണ്‍‌ടാക്‌റ്റുകളേയും നിങ്ങളിലേക്ക് എത്തിച്ചേരാന്‍ അനുവദിക്കുന്നതിന്‌ ക്രമീകരണങ്ങളിൽ മാറ്റം വരുത്താനാവും."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"നക്ഷത്രചിഹ്നമിട്ട കോൺടാക്‌റ്റുകൾ"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other">മറ്റ് <xliff:g id="NUM_PEOPLE">%d</xliff:g> പേർ</item>
-      <item quantity="one">മറ്റൊരാൾ</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"ഒന്നുമില്ല"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{ഒന്നുമില്ല}=1{{contact_1}}=2{{contact_1}, {contact_2} എന്നിവർ}=3{{contact_1}, {contact_2}, {contact_3} എന്നിവർ}other{{contact_1}, {contact_2} എന്നിവരും മറ്റ് # പേരും}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"സന്ദേശങ്ങള്‍"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"സന്ദേശങ്ങൾ"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"സന്ദേശങ്ങൾ"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ എന്നതിനുള്ള ഇന്‍‌കമിംഗ് സന്ദേശങ്ങൾ ബ്ലോക്ക് ചെയ്‌തിരിക്കുന്നു. സുഹൃത്തുക്കളേയും കുടുംബാംഗങ്ങളേയും മറ്റ് കോണ്‍‌ടാക്‌റ്റുകളേയും നിങ്ങളിലേക്ക് എത്തിച്ചേരാന്‍ അനുവദിക്കുന്നതിന്‌ ക്രമീകരണങ്ങളിൽ മാറ്റം വരുത്താനാവും."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"എല്ലാ സന്ദേശങ്ങളും നിങ്ങൾക്ക് ലഭിക്കും"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"എല്ലാ കോളുകളും നിങ്ങൾക്ക് ലഭിക്കും"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"ഒന്നുമില്ല"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> കോൺടാക്റ്റുകൾ</item>
-      <item quantity="one">ഒരു കോൺടാക്റ്റ്</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{ഒന്നുമില്ല}=1{ഒരു കോൺടാക്റ്റ്}other{# കോൺ‍ടാക്റ്റുകൾ}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"ആർക്കും വിളിക്കാം"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"കോൺടാക്റ്റുകൾ"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"നക്ഷത്രചിഹ്നമിട്ട കോൺടാക്‌റ്റുകൾ"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"എല്ലാ അറിയിപ്പുകളും"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"ചില അറിയിപ്പുകൾ"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"തടസ്സപ്പെടുത്തുന്നതിന് ആപ്പുകളെ നിങ്ങൾ അനുവദിക്കുന്നില്ലെങ്കിലും, തിരഞ്ഞെടുത്ത ആളുകൾക്ക് ഇപ്പോഴും നിങ്ങളിലേക്ക് എത്തിച്ചേരാനാകും"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> എന്നിവയ്‌ക്ക് തടസ്സപ്പെടുത്താൻ കഴിയും</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> എന്നതിന് തടസ്സപ്പെടുത്താൻ കഴിയും</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> എണ്ണം കൂടി"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{ആപ്പിനൊന്നും തടസ്സപ്പെടുത്താൻ കഴിയില്ല}=1{{app_1} എന്നതിന് തടസ്സപ്പെടുത്താൻ കഴിയും}=2{{app_1}, {app_2} എന്നിവയ്ക്ക് തടസ്സപ്പെടുത്താൻ കഴിയും}=3{{app_1}, {app_2}, {app_3} എന്നിവയ്ക്ക് തടസ്സപ്പെടുത്താൻ കഴിയും}other{{app_1}, {app_2} എന്നിവയ്ക്കും മറ്റ് # എണ്ണത്തിനും തടസ്സപ്പെടുത്താൻ കഴിയും}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"ആപ്പുകൾ"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"എല്ലാ അറിയിപ്പുകളും"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"ചില അറിയിപ്പുകൾ"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"തടസ്സപ്പെടുത്താൻ കഴിയുന്ന അറിയിപ്പുകൾ"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"എല്ലാ അറിയിപ്പുകളും അനുവദിക്കുക"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> എന്നിവയ്‌ക്ക് തടസ്സപ്പെടുത്താൻ കഴിയും</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> എന്നതിന് തടസ്സപ്പെടുത്താൻ കഴിയും</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"ഒന്നിനും തടസ്സപ്പെടുത്താൻ കഴിയില്ല"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> എണ്ണം കൂടി"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{ഒന്നിനും തടസ്സപ്പെടുത്താൻ കഴിയില്ല}=1{{sound_category_1} എന്നതിന് തടസ്സപ്പെടുത്താൻ കഴിയും}=2{{sound_category_1}, {sound_category_2} എന്നിവയ്ക്ക് തടസ്സപ്പെടുത്താൻ കഴിയും}=3{{sound_category_1}, {sound_category_2}, {sound_category_3} എന്നിവയ്ക്ക് തടസ്സപ്പെടുത്താൻ കഴിയും}other{{sound_category_1}, {sound_category_2} എന്നിവയ്ക്കും മറ്റ് # എണ്ണത്തിനും തടസ്സപ്പെടുത്താൻ കഴിയും}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"ഒന്നിനും തടസ്സപ്പെടുത്താൻ കഴിയില്ല"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"ഒരാൾക്കും തടസ്സപ്പെടുത്താൻ കഴിയില്ല"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"ചില ആളുകൾക്ക് തടസ്സപ്പെടുത്താൻ കഴിയും"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"എല്ലാ ആളുകൾക്കും തടസ്സപ്പെടുത്താൻ കഴിയും"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB നിയന്ത്രിക്കുന്നത്"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"കണക്റ്റ് ചെയ്‌തിരിക്കുന്ന ഉപകരണം"</string>
     <string name="usb_control_device" msgid="527916783743021577">"ഈ ഉപകരണം"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"സ്വിച്ച് ചെയ്യുന്നു..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"മാറുന്നു…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"സ്വിച്ച് ചെയ്യാനായില്ല"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"ഈ ഉപകരണം ചാർജ് ചെയ്യൽ"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"കണക്‌റ്റ് ചെയ്‌ത ഉപകരണം ചാർജ് ചെയ്യുന്നു"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"വിശദാംശങ്ങൾ കാണുക"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"ഡാറ്റാ സേവർ"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"നിയന്ത്രണമില്ലാത്ത ഡാറ്റ"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"പശ്ചാത്തല ഡാറ്റ ഓഫാക്കി"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"പശ്ചാത്തല ഡാറ്റ ഓഫാക്കി"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"ഓൺ"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"ഓഫ്"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"ഡാറ്റാ സേവർ ഉപയോഗിക്കുക"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"ഉപകരണം ലോക്കുചെയ്തിരിക്കുകയാണെങ്കിൽ അറിയിപ്പുകൾക്ക് മറുപടികളോ മറ്റ് ടെക്സ്റ്റുകളോ ടൈപ്പുചെയ്യുന്നത് തടയുക"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"ഡിഫോൾട്ട് സ്പെൽ ചെക്കർ"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"സ്പെൽ ചെക്കർ തിരഞ്ഞെടുക്കുക"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"സ്പെൽ ചെക്കര്‍ ഉപയോഗിക്കുക"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"സ്പെൽ ചെക്കർ ഉപയോഗിക്കുക"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"തിരഞ്ഞെടുത്തില്ല"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(ഒന്നുമില്ല)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"സ്റ്റോറേജ് ഇടം സൃഷ്ടിക്കുന്നതിന്, ബാക്കപ്പെടുത്ത ഫോട്ടോകളും വീഡിയോകളും നിങ്ങളുടെ ഉപകരണത്തിൽ നിന്ന് സ്റ്റോറേജ് മാനേജർ നീക്കംചെയ്യുന്നു."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"ഫോട്ടോകളും വീഡിയോകളും നീക്കംചെയ്യുക"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"സ്റ്റോറേജ് മാനേജർ"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"സ്‌റ്റോറേജ് മാനേജർ ഉപയോഗിക്കുക"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"സ്‌റ്റോറേജ് മാനേജർ ഉപയോഗിക്കുക"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"സ്വയമേവ"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"മാനുവൽ"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"ഇപ്പോൾ ഇടം സൃഷ്ടിക്കുക"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"ഫോൺ പരിശോധിക്കുന്നതിന്, ഡബിൾ ടാപ്പ് ചെയ്യുക"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"ടാബ്‌ലെറ്റ് പരിശോധിക്കുന്നതിന്, രണ്ടുതവണ ടാപ്പുചെയ്യുക"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"ഉപകരണം പരിശോധിക്കുന്നതിന്, രണ്ടുതവണ ടാപ്പുചെയ്യുക"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"അറിയിപ്പുകൾ കാണാൻ സ്വൈപ്പ് ചെയ്യുക"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"അറിയിപ്പുകൾ കാണാൻ സ്ക്രീനിന്റെ താഴത്തെ അരികിൽ നിന്ന് താഴേക്ക് സ്വൈപ്പ് ചെയ്യുക"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"ഒറ്റക്കൈ മോഡ്"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"ഒറ്റക്കൈ മോഡ് ഉപയോഗിക്കുക"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"ആപ്പുകൾ മാറുമ്പോൾ ഒറ്റക്കൈ മോഡിൽ നിന്ന് പുറത്ത് കടക്കുക"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"ടൈംഔട്ട്"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 സെക്കൻഡ്"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 സെക്കൻഡ്"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 സെക്കൻഡ്"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"റീച്ചബിളിറ്റി"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"സമയവും അറിയിപ്പുകളും മറ്റ് വിവരങ്ങളും പരിശോധിക്കുന്നതിന്, നിങ്ങളുടെ സ്ക്രീനിൽ രണ്ട് തവണ ടാപ്പ് ചെയ്യുക."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"പരിശോധിക്കാൻ ഫോണെടുക്കുക"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"പരിശോധിക്കുന്നതിന് ടാബ്‌ലെറ്റ് എടുത്തുയർത്തുക"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"ടാബ്‌ലെറ്റ് പരിശോധിക്കാൻ, ടാപ്പ് ചെയ്യുക"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"ഉപകരണം പരിശോധിക്കാൻ, ടാപ്പ് ചെയ്യുക"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"സമയവും അറിയിപ്പുകളും മറ്റ് വിവരങ്ങളും പരിശോധിക്കാൻ, നിങ്ങളുടെ സ്ക്രീനിൽ ടാപ്പ് ചെയ്യുക."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"പാനിക് ബട്ടൺ"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"പവർ ബട്ടൺ വേഗത്തിൽ 5 പ്രാവശ്യം അമർത്തുന്നതിലൂടെ അടിയന്തര SOS പ്രവർത്തനങ്ങൾ ആരംഭിക്കുക."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"മുന്നറിയിപ്പ് ശബ്‌ദം"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"പ്രവർത്തനങ്ങൾ ആരംഭിക്കുന്നതിന് മുമ്പ് അറിയിക്കുക"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"അടിയന്തര കോൺടാക്റ്റുകൾ"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"അറിയിപ്പുകൾക്ക് ഫിംഗർപ്രിന്റ് സ്വൈപ്പ് ചെയ്യുക"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"ഫിംഗർപ്രിന്റ് സ്വൈപ്പ്"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"അറിയിപ്പുകൾ പരിശോധിക്കാൻ ഫോണിന്‍റെ പിൻവശത്തുള്ള ഫിംഗർപ്രിന്റ് സെൻസറിൽ താഴേക്ക് സ്വൈപ്പ് ചെയ്യുക."</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"എല്ലാ ആപ്പുകൾക്കും പ്രവർത്തനക്ഷമമാക്കുക"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"ഗ്രാഫിക്‌സ് ഡ്രൈവർ തിരഞ്ഞെടുക്കുക"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"ഡിഫോൾട്ട്"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"ഗെയിം ഡ്രൈവർ"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"ഗെയിം ഡ്രൈവർ"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"ഡെവലപ്പർ ഡ്രൈവർ"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"സിസ്‌റ്റം ഗ്രാഫിക്‌സ് ഡ്രൈവർ"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"നെറ്റ്‌വർക്കുകൾ കണ്ടെത്താനായില്ല. വീണ്ടും ശ്രമിക്കുക."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(നിരോധിക്കപ്പെട്ടത്)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"സിം കാർഡില്ല"</string>
+    <string name="sim_card" msgid="6381158752066377709">"സിം"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"സിം ഇല്ല"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"ഒന്നുമില്ല"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"കണക്റ്റ് ചെയ്യാൻ സിം ആവശ്യമാണ്"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"കണക്റ്റ് ചെയ്യാൻ <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> സിം ആവശ്യമാണ്"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"മുൻഗണന നൽകുന്ന നെറ്റ്‌വർക്ക് മോഡ്: WCDMA-യ്ക്ക് മുൻഗണന"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"മുൻഗണന നൽകുന്ന നെറ്റ്‌വർക്ക് മോഡ്: GSM മാത്രം"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"മുൻഗണന നൽകുന്ന നെറ്റ്‌വർക്ക് മോഡ്: WCDMA മാത്രം"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"മൊബൈൽ ഡാറ്റ"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"മൊബൈൽ നെറ്റ്‌വർക്ക് ഉപയോഗിച്ച് ഡാറ്റ ആക്‌സസ് ചെയ്യുക"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"പരിധിയിൽ വരുമ്പോൾ ഫോൺ ഈ സേവനദാതാവിലേക്ക് സ്വയമേവ മാറും"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"സിം കാർഡ് ലഭ്യമല്ല"</string>
     <string name="calls_preference" msgid="2166481296066890129">"കോൾ മുൻഗണന"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS മുൻഗണന"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"എപ്പോഴും ചോദിക്കുക"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Settings ആപ്പിൽ സ്‌ക്രീൻ ഓവർലേ അനുവദിക്കുക"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Settings സ്‌ക്രീനുകളിൽ ഓവർലേ ചെയ്യാൻ മറ്റ് ആപ്പുകൾക്ക് മുകളിൽ കാണിക്കാനാകുന്ന ആപ്പുകളെ അനുവദിക്കുക"</string>
     <string name="media_controls_title" msgid="403271085636252597">"മീഡിയ"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"മീഡിയ സെഷൻ അവസാനിക്കുമ്പോൾ പ്ലേയർ മറയ്‌ക്കുക"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"വികസിപ്പിച്ച ദ്രുത ക്രമീകരണ പാനലിൽ നിന്ന് സെഷൻ പുനരാരംഭിക്കാൻ പ്ലേയർ നിങ്ങളെ അനുവദിക്കുന്നു."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"ദ്രുത ക്രമീകരണത്തിൽ മീഡിയ പ്ലേയർ"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"പ്ലേബാക്ക് എളുപ്പത്തിൽ പുനരാരംഭിക്കാൻ വിപുലീകരിച്ച കാലയളവിലേക്ക് മീഡിയ പ്ലേയർ കാണിക്കുക"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"പ്ലേയർ മറയ്‌ക്കുക"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"പ്ലേയർ കാണിക്കുക"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"പ്ലേയറുകളൊന്നും ലഭ്യമല്ല"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"അനുവദിച്ച ആപ്പുകൾ"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"മീഡിയ"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth ഓണാകും"</string>
 </resources>
diff --git a/res/values-mn/arrays.xml b/res/values-mn/arrays.xml
index 33349a5..56574c7 100644
--- a/res/values-mn/arrays.xml
+++ b/res/values-mn/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Дундаж"</item>
     <item msgid="6740026006576843477">"Урт"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Богино"</item>
+    <item msgid="7397961711906421599">"Дунд"</item>
+    <item msgid="4079132024502041928">"Урт"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Үндсэн"</item>
     <item msgid="4234707448428002595">"Sans Serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Глобал"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"Зөвхөн TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Глобал"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 8cef144..30e33c6 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Дэлгэц түгжигдэхэд профайлын мэдээллийг харуулах"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Бүртгэл"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Байршил"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Байршлыг ашиглах"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Байршлыг ашиглах"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Унтраалттай"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">Асаалттай үед <xliff:g id="COUNT_1">%1$d</xliff:g> апп байршилд хандах боломжтой</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Баталгаажуулахын тулд царайгаа ашиглах"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Эхлэх"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Хандалтын царайгаар тайлах онцлог унтарсан тохиолдолд тохиргооны зарим алхам TalkBack-тай хэвийн ажиллахгүй байж болзошгүй."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Буцах"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Тохируулгыг үргэлжлүүлэх"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Хүртээмжийн тохируулгыг ашиглах"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="one"><xliff:g id="NUMBER_0">%d</xliff:g>-с цөөн цифртэй байх ёстой</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Төхөөрөмжийн админ саяхны ПИН-г ашиглахыг зөвшөөрдөггүй"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Таны IT админ түгээмэл ПИН-г блоклосон байна. Өөр ПИН оруулна уу."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Үүнд хүчингүй тэмдэгт агуулах боломжгүй"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Хамгийн багадаа нэг үсэг агуулах шаардлагатай"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Хамгийн багадаа нэг тоо агуулах шаардлагатай"</string>
@@ -653,7 +655,6 @@
       <item quantity="one">Хамгийн багадаа тоон бус 1 тэмдэгт агуулах ёстой</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Төхөөрөмжийн админ саяхны нууц үгийг ашиглахыг зөвшөөрдөггүй"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Таны IT админ түгээмэл нууц үгийг блоклосон байна. Өөр нууц үг оруулна уу."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Цифр өсөх, буурах, давхцахыг зөвшөөрдөггүй"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Баталгаажуулах"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Цуцлах"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Wi‑Fi-г асаах"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Wi-Fi-г ашиглах"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Wi-Fi ашиглах"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wi‑Fi тохиргоо"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Утасгүй хандалтын цэгүүдийг тохируулах &amp; удирдах"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"“<xliff:g id="SSID">%1$s</xliff:g>”-д холбогдохын тулд доорх QR кодыг голлуулна уу"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"QR кодыг скан хийж, Wi‑Fi-д нэгдэнэ үү"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Wi‑Fi-г хуваалцах"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"“<xliff:g id="SSID">%1$s</xliff:g>”-д холбогдохын тулд энэ QR кодыг скан хийж, нууц үгийг хуваалцана уу"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"“<xliff:g id="SSID">%1$s</xliff:g>”-д нэгдэхийн тулд энэ QR кодыг өөр төхөөрөмжөөр скан хийнэ үү"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"“<xliff:g id="SSID">%1$s</xliff:g>”-д холбогдохын тулд энэ QR кодыг скан хийнэ үү"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Дахин оролдоно уу. Хэрэв асуудал үргэлжилсээр байвал төхөөрөмжийн үйлдвэрлэгчтэй холбогдоно уу"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Алдаа гарлаа"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi‑Fi-н нууц үг: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Сүлжээний цэгийн нууц үг: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Автомат холболт"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Утсыг энэ сүлжээний ойролцоо байх үед автоматаар холбогдохыг зөвшөөрөх"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Таблетыг энэ сүлжээний ойролцоо байх үед автоматаар холбогдохыг зөвшөөрөх"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Хүрээнд байгаа үед энэ сүлжээнд холбогдохыг зөвшөөрнө үү"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Төхөөрөмж нэмэх"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Энэ сүлжээнд төхөөрөмж нэмэхийн тулд QR код ашиглах"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR код буруу форматтай байна"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Системийн гэрчилгээ ашигла"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"\"Бүү олго\""</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Бүү хүчин төгөлдөр болго"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Ямар ч сертификат заагаагүй байна. Таны холболт хувийн биш байх болно."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Сүлжээний нэр хэтэрхий урт байна."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Домэйн зааж өгөх шаардлагатай."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Сертификат шаардлагатай."</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Холбогдох"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi-г асаасан"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>-д холбогдсон"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>-д холбогдож байна"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Холбогдож байна…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Сүлжээнд холбогдож чадсангүй"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Сүлжээ хүрээнд алга"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Апп агуулга хуваалцаж байна. Интернет холболтыг хуваалцахын тулд сүлжээний цэгийг унтрааж дахин асаана уу"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Тохируулсан нууц үг алга"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Сүлжээний цэгийн нэр"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>-г асааж байна..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>-г асааж байна…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Бусад төхөөрөмж <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>-д холбогдох боломжтой"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Сүлжээний цэгийн нууц үг"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP Зурвас"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Зарим контентын сэргээх хурдыг автоматаар 60-с 90 Гц болгож өсгөнө. Батарей ашиглалтыг нэмэгдүүлнэ."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"90 Гц-н хүчээр сэргээх хурд"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Хүрэлтийн хариу үйлдэл болон анимацийн чанарыг сайжруулахад зориулсан хамгийн өндөр сэргээх үнэлгээ юм. Батарей ашиглалтыг нэмэгдүүлнэ."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Соргог дэлгэц"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Асаалттай / Хэрэв та дэлгэц рүү харж байвал унтрахгүй"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Андройд хувилбар"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android-н аюулгүй байдлын шинэчлэлт"</string>
     <string name="model_info" msgid="8997566254717810904">"Загвар"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Загвар: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Загвар, техник хангамж"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Техник хангамжийн хувилбар"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Төхөөрөмжийн ID"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Сүлжээний тохиргоог дахин тохируулсан байна"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"СИМ-үүдийг устгаж чадсангүй"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Татаж авсан СИМ-үүдийг алдааны улмаас устгах боломжгүй байна.\n\nТөхөөрөмжөө дахин эхлүүлээд дахин оролдоно уу."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Бүх өгөгдлийг устгах (үйлдвэрийн тохиргоогоор шинэчлэх)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Бүх өгөгдлийг устгах (үйлдвэрийн тохиргоо руу шинэчлэх)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Энэ нь таны таблетын "<b>"дотоор сангийн"</b>" бүх өгөгдлийг устгах бөгөөд үүнд:\n\n"<li>"Таны Google Бүртгэл"</li>\n<li>"Систем, аппын өгөгдөл болон тохиргоо"</li>\n<li>"Татсан аппууд"</li>" багтана"</string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Энэ нь таны утасны "<b>"дотоод сангийн"</b>" бүх өгөгдлийг устгах бөгөөд үүнд:\n\n"<li>"Таны Google Бүртгэл"</li>\n<li>"Систем, аппын өгөгдөл болон тохиргоо"</li>\n<li>"Татсан аппууд"</li>" багтана"</string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Та одоогоор дараах бүртгэлүүдээр нэвтэрсэн байна:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Энэ төхөөрөмж дээр өөр хэрэглэгчид байна.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Хөгжим"</li>\n<li>"Зураг"</li>\n<li>"Бусад хэрэглэгчийн өгөгдөл"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM-үүд"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Энэ нь таны мобайл үйлчилгээний багцыг цуцлахгүй."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Хөгжим, зураг болон бусад хэрэглэгчийн өгөгдлийг цэвэрлэхийн тулд "<b>"USB санг"</b>" арилгах шаардлагатай."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Хөгжим, зураг болон бусад хэрэглэгчийн өгөгдлийг цэвэрлэхийн тулд "<b>"SD картыг"</b>" арилгах шаардлагатай."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Бүх өгөгдлийг устгах (үйлдвэрийн тохиргоонд шинэчлэх)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Бүх өгөгдлийг устгах (үйлдвэрийн тохиргоонд шинэчлэх)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Энэ нь таны таблетын "<b>"дотоод сангийн"</b>" бүх өгөгдлийг устгах бөгөөд үүнд:\n\n"<li>"Таны Google Бүртгэл"</li>\n<li>"Систем, аппын өгөгдөл болон тохиргоо"</li>\n<li>"Татсан аппууд"</li>" багтана"</string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Энэ нь таны утасны "<b>"дотоод сангийн"</b>" бүх өгөгдлийг устгах бөгөөд үүнд:\n\n"<li>"Таны Google Бүртгэл"</li>\n<li>"Систем, аппын өгөгдөл болон тохиргоо"</li>\n<li>"Татсан аппууд"</li>" багтана"</string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Та одоогоор дараах бүртгэлд нэвтэрсэн байна:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Энэ төхөөрөмж дээр өөр хэрэглэгч байна.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Хөгжим"</li>\n<li>"Зураг"</li>\n<li>"Бусад хэрэглэгчийн өгөгдөл"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM-үүд"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Энэ нь таны мобайл үйлчилгээний багцыг цуцлахгүй."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Хөгжим, зураг болон бусад хэрэглэгчийн өгөгдлийг цэвэрлэхийн тулд "<b>"USB санг"</b>" устгах хэрэгтэй."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Хөгжим, зураг болон бусад хэрэглэгчийн өгөгдлийг цэвэрлэхийн тулд "<b>"SD картыг"</b>" устгах хэрэгтэй."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USB санг арилгах"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SD картыг арилгах"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Дотоод USB сан дээрх хөгжим буюу зураг гэх мэт бүх өгөгдлийг арилгах"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"SD карт дээрх хөгжим, зураг гэх мэт бүх өгөгдлүүдийг арчих"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Бүх өгөгдлийг устгах"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Бүх өгөгдлийг устгах"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Таны бүх хувийн мэдээлэл болон татсан аппыг устгана. Та энэ үйлдлийг буцаах боломжгүй."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Таны татаж авсан аппууд &amp; СИМ-үүд зэрэг бүх хувийн мэдээллийг устгана. Та энэ үйлдлийг буцаах боломжгүй."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Бүгдийг устгах"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Системийг Цэвэрлэх үйлчилгээг ашиглах боломжгүй байгаа учраас дахин шинэчлэх үйлдлийг гүйцэтгээгүй."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Бүх өгөгдлийг устгах уу?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Энэ хэрэглэгчийн хувьд үйлдвэрээс гарсан төлөв рүү шинэчлэх боломжгүй"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Арилгаж байна"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Түр хүлээнэ үү..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Бүх өгөгдлийг устгах"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Бүх өгөгдлийг устгах"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Таны бүх хувийн мэдээлэл болон татсан аппыг устгана. Та энэ үйлдлийг болих боломжгүй."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Таны татаж авсан аппууд болон СИМ-үүд зэрэг бүх хувийн мэдээллийг устгана. Та энэ үйлдлийг болих боломжгүй."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Бүх өгөгдлийг устгах уу?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Энэ хэрэглэгчийн хувьд үйлдвэрийн тохиргоонд шинэчлэх боломжгүй"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Устгаж байна"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Түр хүлээнэ үү…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Дуудлагын тохиргоо"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Дуут шуудан, дуудлага дамжуулах, дуудлага хүлээлгэх, залгагчий ID тохируулах"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB модем болгох"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g>-с олон төхөөрөмжид модем болгох боломжгүй."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> модем болгохыг болиулах болно."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ethernet модем болгох"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Утасны интернет холболтыг USB Ethernet-р хуваалцах"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Утасны интернет холболтыг Ethernet-р хуваалцах"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Мобайл дата холболтоороо бусад төхөөрөмжид интернет холболт цацахын тулд сүлжээний цэг, модем болгохыг ашиглана уу. Апп ойролцоох төхөөрөмжид агуулга хуваалцахын тулд сүлжээний цэг үүсгэх боломжтой."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Wi-Fi эсвэл мобайл дата холболтоороо бусад төхөөрөмжид интернэт цацахын тулд сүлжээний цэг болон модем болгохыг ашиглана уу. Түүнчлэн, аппууд ойролцоох төхөөрөмжүүдтэй контент хуваалцахын тулд сүлжээний цэг үүсгэх боломжтой."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Тусламж"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Тайлбарын сонголт"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Томруулах"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Томруулалтын хэсэг"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Томруулалтыг идэвхжүүлэх"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Дэлгэцийг томруулах үедээ хэрэглэхийг хүсэж байгаа томруулалтын хэсг(үүд)ээ сонгоно уу"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Бүтэн дэлгэц"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Дэлгэцийн нэг хэсэг"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Бүтэн дэлгэц; дэлгэцийн нэг хэсэг"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Дэлгэцийг бүхэлд нь томруулах"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Дэлгэцийн нэг хэсгийг томруулах"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Хандалтын товчлуур луу сэлгэх үү?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Дэлгэцийн хэсгийг томруулахын тулд гурав товшилтыг ашигласнаар бичих болон бусад үйлдлийг саатуулна.\n\nТа томруулахын тулд хандалтын товчлуур ашиглах сонголт руу сэлгэхийг хүсэж байна уу?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Хандалтын товчлуур луу сэлгэх"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Томруулахын тулд үргэлжлүүлэн гурав товших"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Томруулах тохиргоо"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Гурван удаа товшиж томруулах"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Товчлолоор томруулах"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Асаах товч дуудлагыг таслана"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Том хулгана заагч"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Анимацийг устгах"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Моно аудио"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Аудиог тоглуулж байхад сувгийг нэгтгэх"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Аудионы түвшин"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Зүүн"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Баруун"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Моно аудио"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Аудиог тоглуулах үед сувгуудыг нэгтгэх"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Аудио баланс"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Зүүн"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Баруун"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Өгөгдмөл"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 секунд"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 секунд"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Мэдэгдлийн чичиргээ"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Хонхны чичиргээ"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Санал хүсэлтэд хүрэх"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>-г ашиглах"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>-г нээх"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Өнгө тохируулагчийг ашиглах"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Хадмалыг харуулах"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Зөвхөн дэмжсэн аппад зориулсан"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>-г ашиглах"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>-г нээх"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Өнгөний засварыг ашиглах"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Хадмалыг харуулах"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Зөвхөн дэмждэг аппад"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Хадмалын хэмжээ болон загвар"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> текстийн хэмжээ"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Бусад сонголт"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Дьютераномаль"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Протаномаль"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Тританомаль"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Саарал өнгө"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Улаан-ногоон"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Улаан-ногоон"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Цэнхэр-шар"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Арын ашиглалтын хязгаарлалт"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Аппад цаана ажиллах зөвшөөрөл олгоно уу"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Аппыг цаана ачааллахыг зөвшөөрөөгүй"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Дэвсгэрийн хэрэглээг хязгаарлах боломжгүй"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Арын ашиглалтыг хязгаарлах боломжгүй"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Арын үйл ажиллагааг хязгаарлах уу?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Та арын үйл ажиллагааг аппад хязгаарласан тохиолдолд апп буруу ажиллаж болзошгүй"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Энэ аппыг батарейг оновчлохоор тохируулаагүй тул та үүнийг хязгаарлах боломжгүй.\n\nАппыг хязгаарлахын тулд эхлээд батарейны оновчлолыг асаана уу."</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Хуваарь тохируулах"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Батарейн ажиллах хугацааг сунгах"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Цэнэглэсэн үед унтраах"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Батарей хэмнэгч таны утсыг <xliff:g id="PERCENT">%1$s</xliff:g>-тай болох үед унтарна"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Батарей хэмнэгч таны таблетыг <xliff:g id="PERCENT">%1$s</xliff:g>-тай болох үед унтарна"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Батарей хэмнэгч таны төхөөрөмжийг <xliff:g id="PERCENT">%1$s</xliff:g>-тай болох үед унтарна"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Таны утас <xliff:g id="PERCENT">%1$s</xliff:g>-с дээш цэнэглэгдэхэд Батарей хэмнэгч унтарна"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Таны таблет <xliff:g id="PERCENT">%1$s</xliff:g>-с дээш цэнэглэгдэхэд Батарей хэмнэгч унтарна"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Таны төхөөрөмж <xliff:g id="PERCENT">%1$s</xliff:g>-с дээш цэнэглэгдэхэд Батарей хэмнэгч унтарна"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Асаах"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Шинэчлэх"</string>
     <string name="tts_play" msgid="2945513377250757221">"Тоглуулах"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Холболтыг тохируулах"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Таны сүлжээний холболтыг автоматаар удирдан батарейн ажиллах хугацааг уртасгаж, төхөөрөмжийн гүйцэтгэлийг сайжруулна"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Жуухын сан"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Cертификат суулгах"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Сертификатыг сангаас суулгах"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Хэрэглэгчийн итгэмжлэл"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Хадгалсан өгөгдлийг харах, өөрчлөх"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Дэлгэрэнгүй"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Хадгалах сангийн төрөл"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Техник хангамжаар дэмжигдсэн"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Зөвхөн программ"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Энэ хэрэглэгчид итгэмжлэл байхгүй байна"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN, апп-д суулгасан"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi-д суулгасан"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Tерминалаар тооцоо хийж байна"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Төлбөрийн апп-г тохируулаарай. Зайнаас уншуулах тэмдэг бүхий терминалд утасныхаа ар талыг бариарай."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Ойлголоо"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Илүү..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Бусад…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Төлбөрийн өгөгдмөл аппыг тохируулах"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Төлбөрийн өгөгдмөл аппыг шинэчлэх"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Зайнаас уншуулах терминал дээр <xliff:g id="APP">%1$s</xliff:g>-р төлөх"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Дуудлагад байнга үүнийг ашиглах"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Датанд ашиглах SIM-г сонгоно уу"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"SMS-н SIM сонгох"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Мэдээллийн SIM-ийг сольж байна, энэ нь нэг минут орчим үргэлжилнэ..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Өгөгдлийн SIM-г сэлгэж байна, үүнд хэдэн минут шаардлагатай…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Залгах"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"SIM карт сонгох"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"хэвшил, хуваарь, батарей хэмнэгч, цахилгаан хэмнэгч, батарей, автомат, хувь"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, дэвшилтэт дуудлага, 4g дуудлага"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"хэл нэмэх, хэл нэмэх"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"текстийн хэмжээ"</string>
     <string name="default_sound" msgid="6604374495015245195">"Үндсэн дуу"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Хонх ба мэдэгдлийн дууны түвшин <xliff:g id="PERCENTAGE">%1$s</xliff:g> байна"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Түвшин, чичиргээ, Бүү саад бол"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Дууны чадал"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Шууд тайлбар"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Медиад автоматаар тайлбар нэмэх"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Байхгүй"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> хуваарийг тохируулсан</item>
-      <item quantity="one">1 хуваарийг тохируулсан</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Байхгүй}=1{1 хуваарийг тохируулсан}other{# хуваарийг тохируулсан}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Бүү саад бол"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Зөвхөн чухал хүмүүс болон аппуудаас мэдэгдэл авах"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Саад болох зүйлсийг хязгаарлах"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Зөвхөн чухал зүйлс"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Асаалттай / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Унтраасан / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Унтраасан"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Идэвхтэй"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Тухай бүрд асуух"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Таныг унтраах хүртэл"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> цаг</item>
-      <item quantity="one">1 цаг</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> минут"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g>хуваарийг автоматаар асааж болно</item>
-      <item quantity="one">1 хуваарийг автоматаар асааж болно</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 цаг}other{# цаг}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 минут}other{# минут}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Унтраалттай}=1{Унтраалттай / 1 хуваарийг автоматаар асааж болно}other{Унтраалттай / # хуваарийг автоматаар асааж болно}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Бүү саад бол горимыг тасалдуулж болох зүйлс"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Хүмүүс"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Аппууд"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Ач холбогдол багатай мэдэгдлүүдийг автоматаар Бага ач холбогдолтой гэж тохируулах"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Орчинтой тохирсон мэдэгдлийн зэрэглэл хийх"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Хамаарлын дагуу мэдэгдлийн зэрэглэлийг автоматаар хийх"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Орчинтой тохирсон мэдэгдлийн санал хүсэлт"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Мэдэгдэлд хийсэн тохируулгыг зааж, системд санал хүсэлт өгөх сонголтыг харуулах"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Санал болгосон үйлдлүүд болон хариу"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Санал болгосон үйлдлүүд болон хариуг автоматаар харуулах"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Саяхны болон түр хойшлуулсан мэдэгдлүүдийг харуулах"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"\"Бүү саад бол\" хандалт"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Бүү саад бол горимыг зөвшөөрөх"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Суулгасан апп-аас \"Бүү саад бол\" хандалтыг хүссэн апп байхгүй байна."</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Апп-уудыг ачаалж байна..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Аппуудыг ачаалж байна…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Андройд таны хүсэлтээр энэ аппын мэдэгдлийг энэ төхөөрөмжид харуулахыг хориглож байна"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Андройд таны хүсэлтээр энэ ангиллын мэдэгдлийг тус төхөөрөмжид харуулахыг хориглож байна"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Андройд таны хүсэлтээр энэ бүлэг мэдэгдлийг энэ төхөөрөмжид харуулахыг хориглож байна"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Бүх харилцан яриа"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Чухал харилцан яриа"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Байхгүй"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> харилцан яриа</item>
-      <item quantity="one">1 харилцан яриа</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Байхгүй"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Байхгүй}=1{1 харилцан яриа}other{# харилцан яриа}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Хэн тасалдуулж болох вэ"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Дуудлага"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Дуудлага"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Зөвшөөрөгдсөн дуудлагууд дуугарч байгааг шалгахын тулд төхөөрөмжийг дуугаргах дээр нь тохируулсан эсэхийг шалгана уу"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’-д ирэх дуудлагыг хориглосон. Та найзууд, гэр бүлийнхэн болон бусад харилцагчдаа тантай холбоо барихыг зөвшөөрөхийн тулд тохиргоогоо өөрчлөх боломжтой."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Одоор тэмдэглэсэн харилцагчид"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other">бусад <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="one">бусад 1</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Байхгүй"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Байхгүй}=1{{contact_1}}=2{{contact_1} болон {contact_2}}=3{{contact_1}, {contact_2} болон {contact_3}}other{{contact_1}, {contact_2} болон бусад #}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Зурвасууд"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"зурвас"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Зурвас"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’-н ирэх зурвасыг хориглосон. Та найзууд, гэр бүлийнхэн эсвэл бусад харилцагчдаа тантай холбоо барихыг зөвшөөрөхийн тулд тохиргоогоо өөрчлөх боломжтой."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Бүх зурвас танд хүрэх боломжтой"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Бүх дуудлага танд хүрэх боломжтой"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Байхгүй"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> харилцагч</item>
-      <item quantity="one">1 харилцагч</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Байхгүй}=1{1 харилцагч}other{# харилцагч}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Дурын хүн"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Харилцагч"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Одоор тэмдэглэсэн харилцагчид"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Бүх мэдэгдэл"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Зарим мэдэгдэл"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Та аппуудад тасалдуулахыг зөвшөөрөөгүй ч сонгосон хүмүүс тантай холбогдох боломжтой хэвээр байна"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> нь тасалдуулах боломжтой</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> нь тасалдуулах боломжтой</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"Бусад <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Ямар ч апп тасалдуулах боломжгүй}=1{{app_1} нь тасалдуулах боломжтой}=2{{app_1} болон {app_2} нь тасалдуулах боломжтой}=3{{app_1}, {app_2}, болон {app_3} нь тасалдуулах боломжтой}other{{app_1}, {app_2}, болон бусад # нь тасалдуулах боломжтой}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Аппууд"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Бүх мэдэгдэл"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Зарим мэдэгдэл"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Тасалдуулах боломжтой мэдэгдэл"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Бүх мэдэгдлийг зөвшөөрөх"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> нь тасалдуулах боломжтой</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> нь тасалдуулах боломжтой</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Ямар ч ая тасалдуулах боломжгүй"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"Бусад <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Юу ч тасалдуулах боломжгүй}=1{{sound_category_1} нь тасалдуулах боломжтой}=2{{sound_category_1} болон {sound_category_2} нь тасалдуулах боломжтой}=3{{sound_category_1}, {sound_category_2}, болон {sound_category_3} нь тасалдуулах боломжтой}other{{sound_category_1}, {sound_category_2}, болон бусад # нь тасалдуулах боломжтой}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Юу ч тасалдуулах боломжгүй"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Хэн ч тасалдуулах боломжгүй"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Зарим хүн тасалдуулах боломжтой"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Бүх хүн тасалдуулах боломжтой"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB-г дараахаар хянасан"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Холбогдсон төхөөрөмж"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Энэ төхөөрөмж"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Сэлгэж байна..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Сэлгэж байна…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Сэлгэж чадсангүй"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Энэ төхөөрөмжийг цэнэглэж байна"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Холбосон төхөөрөмжийг цэнэглэж байна"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Дэлгэрэнгүй үзэх"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Дата хэмнэгч"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Хязгаарлалтгүй дата"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Арын дата унтарсан байна"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Арын дата унтраалттай байна"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Идэвхтэй"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Идэвхгүй"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Дата хэмнэгчийг ашиглах"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Төхөөрөмж түгжээтэй үед хариу бичих, бусад текстийг мэдэгдлээр ирэх эсэхийг тохируулна уу."</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Өгөгдмөл алдаа шалгагч"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Алдаа шалгагч сонгох"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Зөв бичгийн алдаа шалгагч ашиглах"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Зөв бичгийн алдаа шалгагчийг ашиглах"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Сонгоогүй"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(байхгүй)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Сангийн багтаамжийг нэмэгдүүлэхийн тулд сангийн менежер нөөцөлсөн зураг, видеог таны төхөөрөмжөөс устгах болно."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Зураг, видео устгах"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Сангийн менежер"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Сангийн менежерийг ашиглах"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Хадгалах сангийн менежерийг ашиглах"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Автомат"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Гар ажиллагаатай"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Одоо багтаамжаа нэмэгдүүлнэ үү"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Утсаа шалгахын тулд хоёр товшино уу"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Таблетаа шалгахын тулд хоёр товшино уу"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Төхөөрөмжийг шалгахын тулд хоёр товшино уу"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Мэдэгдлийг харахын тулд шударна уу"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Мэдэгдлээ харуулахын тулд дэлгэцийн доод хэсгээс доош шударна уу"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Нэг гарын горим"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Нэг гарын горимыг ашиглах"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Аппуудыг сэлгэхдээ гарах"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Хугацаа"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 секунд"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 секунд"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 секунд"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"хүрэх боломж"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Цаг, мэдэгдэл болон бусад мэдээллийг шалгахын тулд дэлгэцээ хоёр товшино уу."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Утсаа шалгахын тулд өргөнө үү"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Таблетаа шалгахын тулд өргөнө үү"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Таблетаа шалгахын тулд товшино уу"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Төхөөрөмжийг шалгахын тулд товшино уу"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Цаг, мэдэгдэл болон бусад мэдээллийг шалгахын тулд дэлгэцээ товшино уу."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Түгшүүрийн товчлуур"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Асаах товчыг 5 удаа хурдан дарж, яаралтай тусламжийн SOS үйлдлийг эхлүүлээрэй."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Сануулгын дуу"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Үйлдлийг эхлүүлэхийн өмнө сэрэмжлүүлнэ"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Яаралтай тусламжийн үед холбоо барих харилцагчид"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Мэдэгдэл харах бол хурууны хээгээ шударна уу"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Хурууны хээгээр шудрах"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Мэдэгдлээ шалгахын тулд утасныхаа арын хурууны хээ мэдрэгчийг доош шударна уу."</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Бүх аппад идэвхжүүлэх"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Графикийн драйверыг сонгох"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Өгөгдмөл"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Тоглоомын драйвер"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Тоглоомын драйвер"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Хөгжүүлэгчийн драйвер"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Системийн графикийн драйвер"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Сүлжээ олдсонгүй. Дахин оролдоно уу."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(хориглосон)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"SIM карт алга"</string>
+    <string name="sim_card" msgid="6381158752066377709">"СИМ"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"СИМ алга"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Байхгүй"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Холбогдоход СИМ шаардлагатай"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Холбогдоход <xliff:g id="WIRELESS_CARRIER">%s</xliff:g>-н СИМ шаардлагатай"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Давуу эрхтэй сүлжээний горим: WCDMA давуу эрхтэй"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Давуу эрхтэй сүлжээний горим: зөвхөн GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Давуу эрхтэй сүлжээний горим: зөвхөн WCDMA"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Мобайл дата"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Мобайл сүлжээг ашиглан датад холбогдох"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Утас энэ оператор компанийг хүрээнд байх үед автоматаар сэлгэнэ"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"СИМ карт боломжгүй"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Дуудлагын сонголт"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS-н сонголт"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Тухай бүрд асуух"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Тохиргооны дэлгэцэд давхарлахыг зөвшөөрөх"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Бусад аппын дээр үзүүлэх боломжтой аппуудыг Тохиргооны дэлгэцийг давхарлахыг зөвшөөрөх"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Медиа"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Медиа харилцан үйлдэл дуусахад тоглуулагчийг нуух"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Тоглуулагч нь танд харилцан үйлдлийг дэлгэсэн Шуурхай тохиргооны түр зуурын самбараас үргэлжлүүлэх боломж олгодог."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Шуурхай тохиргоон дахь Медиа тоглуулагч"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Дахин тоглуулахыг хялбар үргэлжлүүлэхийн тулд медиа тоглуулагчийг уртасгасан хугацаагаар үзүүлдэг"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Тоглуулагчийг нуух"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Тоглуулагчийг харуулах"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Боломжтой тоглуулагч алга"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Зөвшөөрсөн аппууд"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"медиа"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth-г асаана"</string>
 </resources>
diff --git a/res/values-mr/arrays.xml b/res/values-mr/arrays.xml
index 290c61f..739b892 100644
--- a/res/values-mr/arrays.xml
+++ b/res/values-mr/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"मध्‍यम"</item>
     <item msgid="6740026006576843477">"दीर्घ"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"लहान"</item>
+    <item msgid="7397961711906421599">"मध्‍यम"</item>
+    <item msgid="4079132024502041928">"दीर्घ"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"डीफॉल्ट"</item>
     <item msgid="4234707448428002595">"Sans Serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"जागतिक"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"केवळ TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"जागतिक"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 5a508b5..bd1a22a 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"लॉक स्क्रीनवर प्रोफाईलची माहिती दर्शवा"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"खाती"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"स्थान"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"स्‍थान वापरा"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"स्थान वापरा"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"बंद"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">सुरू - <xliff:g id="COUNT_1">%1$d</xliff:g> ॲप्सना स्थानाचा अ‍ॅक्सेस आहे</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"ऑथेंटिकेट करण्यासाठी तुमचा चेहरा वापरा"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"सुरू करा"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"अ‍ॅक्सेसिबिलिटी फेस अनलॉक बंद असल्यास, कदाचित सेटअपच्या काही पायऱ्या TalkBack सह योग्यरीत्या काम करणार नाहीत."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"परत जा"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"सेटअप पुढे सुरू ठेवा"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"अ‍ॅक्सेसिबिलिटी सेटअप वापरा"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="one"><xliff:g id="NUMBER_0">%d</xliff:g> अंकापेक्षा कमी असणे आवश्यक आहे</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"डिव्हाइस प्रशासक अलीकडील पिन वापरण्याची अनुमती देत नाही"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"सामान्यत: वापरले जाणारे पिन तुमच्या IT प्रशासनाने ब्लॉक केलेले आहेत. दुसरा एखादा पिन वापरून पाहा."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"यामध्ये अवैध वर्ण समाविष्ट असू शकत नाही"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"कमीत कमी एक अक्षर असणे आवश्यक आहे"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"कमीत कमी एक अंक असणे आवश्यक आहे"</string>
@@ -653,7 +655,6 @@
       <item quantity="one">किमान एक अंक नसलेला वर्ण असणे आवश्यक आहे</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"डिव्हाइस प्रशासक अलीकडील पासवर्ड वापरण्याची अनुमती देत नाही"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"सामान्यत: वापरले जाणारे पासवर्ड तुमच्या IT प्रशासनाने ब्लॉक केलेले आहेत. दुसरा एखादा पासवर्ड वापरून पाहा."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"अंकांच्या चढत्या, उतरत्या किंवा पुनरावृत्त क्रमाला अनुमती नाही"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"खात्री करा"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"रद्द करा"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"वाय-फाय"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"वाय-फाय सुरू करा"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"वाय-फाय"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"वाय-फाय वापरा"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"वाय-फाय वापरा"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"वाय-फाय सेटिंग्ज"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"वाय-फाय"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"वायरलेस प्रवेश बिंदू सेट करा आणि  व्यवस्थापित करा"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"“<xliff:g id="SSID">%1$s</xliff:g>” शी कनेक्ट करण्यासाठी खालील QR कोड मध्यभागी ठेवा"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"QR कोड स्कॅन करून वाय-फाय मध्ये सामील व्हा"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"वाय-फाय शेअर करा"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"“<xliff:g id="SSID">%1$s</xliff:g>” शी कनेक्ट करण्यासाठी हा QR कोड स्कॅन करा आणि पासवर्ड शेअर करा"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"“<xliff:g id="SSID">%1$s</xliff:g>” मध्ये सामील होण्यासाठी हा QR कोड दुसर्‍या डिव्हाइसने स्कॅन करा"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"“<xliff:g id="SSID">%1$s</xliff:g>” शी कनेक्ट करण्यासाठी हा QR कोड स्कॅन करा"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"पुन्हा प्रयत्न करा. समस्या कायम राहिल्यास, डिव्हाइस निर्मात्याशी संपर्क साधा"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"काहीतरी चूक झाली"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"वाय-फाय पासवर्ड: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"हॉटस्पॉट पासवर्ड: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"आपोआप कनेक्‍ट करा"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"या नेटवर्कजवळ फोनला आपोआप कनेक्ट होण्याची अनुमती द्या"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"या नेटवर्कजवळ टॅबलेटला आपोआप कनेक्ट होण्याची अनुमती द्या"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"रेंजमध्ये असताना या नेटवर्कला कनेक्शनची अनुमती द्या"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"डिव्हाइस जोडा"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"या नेटवर्कमध्ये डिव्हाइस जोडण्यासाठी QR कोड वापरा"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR कोडचा फॉरमॅट चुकीचा आहे"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"सिस्टम प्रमाणपत्रे वापरा"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"प्रदान करू नका"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"प्रमाणित करू नका"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"कोणतेही प्रमाणपत्र नमूद केले नाही. तुमचे कनेक्शन खाजगी होणार नाही."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"नेटवर्कचे नाव फार लांबलचक आहे."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"एक डोमेन नमूद करणे आवश्यक आहे."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"प्रमाणपत्र आवश्यक आहे."</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"कनेक्ट करा"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"वाय-फाय सुरू केले आहे"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> शी कनेक्ट केले आहे"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> शी कनेक्ट करत आहे"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"कनेक्ट करत आहे…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"नेटवर्कशी कनेक्‍ट करण्‍यात अयशस्वी"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"नेटवर्क रेंजमध्ये नाही"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"अ‍ॅप आशय शेअर करत आहे. इंटरनेट कनेक्शन शेअर करण्यासाठी, हॉटस्‍पॉट बंद करा, नंतर सुरू करा"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"पासवर्ड सेट केलेला नाही"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"हॉटस्पॉट नाव"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> सुरू करत आहे..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> सुरू करत आहे…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"इतर डिव्हाइस <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>शी कनेक्ट होऊ शकतात"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"हॉटस्पॉट पासवर्ड"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP बॅंड"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"काही आशयासाठी रिफ्रेश रेट ६० ते ९० Hz पर्यंत आपोआप वाढवते. बॅटरी वापर वाढवते."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"फोर्स ९० Hz रिफ्रेश रेट"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"सुधारित स्पर्श प्रतिसाद आणि अ‍ॅनिमेशन गुणवत्तेसाठी उच्चतम रिफ्रेश रेट. बॅटरी वापर वाढवतो."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"स्क्रीन अटेंशन"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"सुरू करा / तुम्ही स्क्रीनकडे पाहत असल्यास स्क्रीन बंद होणार नाही"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android आवृत्ती"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android सुरक्षा अपडेट"</string>
     <string name="model_info" msgid="8997566254717810904">"मॉडेल"</string>
-    <string name="model_summary" msgid="2246651782442466213">"मॉडेल: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"मॉडेल आणि हार्डवेअर"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"हार्डवेअर आवृत्‍ती"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"उपकरण आयडी"</string>
@@ -1605,31 +1604,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"नेटवर्क सेटिंग्ज रीसेट केल्या गेल्या आहेत"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"सिम मिटवू शकत नाही"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"डाउनलोड केलेली सिम एका एररमुळे मिटवता येत नाहीत.\n\nतुमचे डिव्हाइस रीस्टार्ट करा आणि पुन्हा प्रयत्न करा."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"सर्व डेटा मिटवा (फॅक्टरी रीसेट)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"सर्व डेटा मिटवा (फॅक्टरी रीसेट)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"हे तुमच्या टॅबलेटच्या "<b>"अंतर्गत स्टोरेज"</b>" वरील सर्व डेटा मिटवेल, यासह:\n\n"<li>"तुमचे Google खाते"</li>\n<li>"सिस्टम आणि ॲप डेटा आणि सेटिंग्ज"</li>\n<li>"डाउनलोड केलेली अ‍ॅप्स"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"हे तुमच्या फोनच्या "<b>"अंतर्गत स्टोरेज"</b>" वरील सर्व डेटा मिटवेल, यासह:\n\n"<li>"तुमचे Google खाते"</li>\n<li>"सिस्टम आणि अ‍ॅप डेटा सेटिंग्ज"</li>\n<li>"डाउनलोड केलेली अ‍ॅप्स"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"तुम्ही सध्या खालील खात्यांवर साइन इन केले आहे:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"या डिव्‍हाइसवर इतर वापरकर्ते उपस्‍थित आहेत.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"संगीत"</li>\n<li>"फोटो"</li>\n<li>"अन्य वापरकर्ता डेटा"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"हे केल्‍याने तुमचा मोबाइल सेवा प्‍लॅन रद्द होणार नाही."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"संगीत, चित्रे आणि अन्य वापरकर्ता डेटा साफ करण्यासाठी, "<b>"USB स्टोरेज"</b>" मिटविणे आवश्यक आहे."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"संगीत, चित्रे आणि अन्य वापरकर्ता डेटा साफ करण्यासाठी, "<b>"SD कार्ड"</b>" पुसण्याची आवश्यकता आहे."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"सर्व डेटा मिटवा (फॅक्टरी रीसेट)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"सर्व डेटा मिटवा (फॅक्टरी रीसेट)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"हे तुमच्या टॅबलेटच्या "<b>"अंतर्गत स्टोरेज"</b>" वरील सर्व डेटा मिटवेल, पुढील गोष्टींच्या समावेशासह:\n\n"<li>"तुमचे Google खाते"</li>\n<li>"सिस्टम आणि अ‍ॅप डेटा आणि सेटिंग्ज"</li>\n<li>"डाउनलोड केलेली अ‍ॅप्स"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"हे तुमच्या फोनच्या "<b>"अंतर्गत स्टोरेज"</b>" वरील सर्व डेटा मिटवेल, पुढील गोष्टींच्या समावेशासह:\n\n"<li>"तुमचे Google खाते"</li>\n<li>"सिस्टम आणि अ‍ॅप डेटा सेटिंग्ज"</li>\n<li>"डाउनलोड केलेली अ‍ॅप्स"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"तुम्ही सध्या खालील खात्यांमध्ये साइन इन केले आहे:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"या डिव्‍हाइसवर इतर वापरकर्ते उपस्‍थित आहेत.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"संगीत"</li>\n<li>"फोटो"</li>\n<li>"इतर वापरकर्ता डेटा"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIMs"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"यामुळे तुमचा मोबाइल सेवा प्‍लॅन रद्द होणार नाही."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"संगीत, फोटो आणि इतर वापरकर्ता डेटा साफ करण्यासाठी "<b>"USB स्टोरेज"</b>" मिटविणे आवश्यक आहे."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"संगीत, फोटो आणि इतर वापरकर्ता डेटा साफ करण्यासाठी "<b>"SD कार्ड"</b>" मिटवणे आवश्यक आहे."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USB स्टोरेज मिटवा"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SD कार्ड मिटवा"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"अंतर्गत USB संचयनावरील सर्व डेटा मिटवा, जसे की संगीत किंवा फोटो"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"SD कार्डवरील सर्व डेटा मिटवा, जसे की संगीत किंवा फोटो"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"सर्व डेटा मिटवा"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"सर्व डेटा मिटवा"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"तुमची सर्व वैयक्तिक माहिती आणि डाउनलोड केलेली अ‍ॅप्स हटवली जातील. तुम्ही ही कृती पहिल्यासारखी करू शकत नाही."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"डाउनलोड केलेली अ‍ॅप्स आणि सिमसह, तुमची सर्व वैयक्तिक माहिती हटवली जाईल. तुम्ही ही कृती पहिल्यासारखी करू शकत नाही."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"प्रत्येकगोष्ट मिटवा"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"सिस्टम साफ करा सेवा उपलब्ध नसल्यामुळे कोणतेही रीसेट केले नाही."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"सर्व डेटा मिटवायचा?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"या वापरकर्त्यासाठी फॅक्‍टरी रीसेट उपलब्‍ध नाही"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"मिटवत आहे"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"कृपया प्रतीक्षा करा..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"सर्व डेटा मिटवा"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"सर्व डेटा मिटवा"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"तुमची सर्व वैयक्तिक माहिती आणि डाउनलोड केलेली अ‍ॅप्स हटवली जातील. तुम्ही ही कृती पहिल्यासारखी करू शकत नाही."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"डाउनलोड केलेली अ‍ॅप्स आणि सिमसह, तुमची सर्व वैयक्तिक माहिती हटवली जाईल. तुम्ही ही कृती पहिल्यासारखी करू शकत नाही."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"सर्व डेटा मिटवायचा का?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"या वापरकर्त्यासाठी फॅक्‍टरी रीसेट उपलब्‍ध नाही"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"मिटवत आहे"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"कृपया प्रतीक्षा करा…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"कॉल सेटिंग्ज"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"व्हॉइसमेल, कॉल फॉरवर्डिंग, कॉल प्रतीक्षा, कॉलर आयडी सेट करा"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB टेदरिंग"</string>
@@ -1677,7 +1674,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> पेक्षा अधिक डिव्हाइसेसवर टेदर करू शकत नाही."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> टेदर करणे रद्द करेल."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"इथरनेट टेदरिंग"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"फोनचे इंटरनेट कनेक्शन USB इथरनेटमार्फत शेअर करा"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"फोनचे इंटरनेट कनेक्शन इथरनेटमार्फत शेअर करा"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"तुमच्या मोबाइल डेटा कनेक्शनने इतर डिव्हाइसना इंटरनेट देण्यासाठी हॉटस्पॉट आणि टेदरिंगचा वापर करा. जवळपासच्या डिव्हाइससोबत आशय शेअर करण्यासाठी अ‍ॅप्स हॉटस्‍पॉट देखील तयार करू शकतात."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"तुमच्या मोबाइल डेटा कनेक्शन किंवा वाय-फाय द्वारे इतर डिव्हाइसना इंटरनेट पुरवण्यासाठी हॉटस्पॉट आणि टेदरिंगचा वापर करा. जवळपासच्या डिव्हाइससह आशय शेअर करण्यासाठी अ‍ॅप्स हॉटस्पॉटदेखील तयार करू शकतात."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"मदत"</string>
@@ -2118,13 +2115,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"कॅप्शन प्राधान्ये"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"मॅग्निफिकेशन"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"मॅग्निफाय करायचा असलेला भाग"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"मॅग्निफिकेशन सुरू करा"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"तुम्हाला स्क्रीन मॅग्निफाय करताना वापरायचे असलेले मॅग्निफाय करण्याचे भाग निवडा"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"फुल स्क्रीन"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"स्क्रीनचा काही भाग"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"फुल स्क्रीन &amp; स्क्रीनचा काही भाग"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"संपूर्ण स्क्रीन मॅग्निफाय करा"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"स्क्रीनचा काही भाग मॅग्निफाय करा"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"अ‍ॅक्सेसिबिलिटी बटणावर स्विच करायचे आहे का?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"स्क्रीनचा एखादा भाग मॅग्निफाय करण्यासाठी तीनदा टॅप केल्याने टायपिंग आणि इतर कृतींना उशीर होईल. \n\nमॅग्निफाय करण्यासाठी तुम्हाला अ‍ॅक्सेसिबिलिटी बटण वापरून स्विच करायचे आहे का?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"अ‍ॅक्सेसिबिलिटी बटणावर स्विच करा"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"मॅग्निफाय करण्यासाठी तीनदा टॅप करणे सुरू ठेवा"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"मॅग्निफिकेशन सेटिंग्ज"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"तीन वेळा टॅप करून मोठे करा"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"शॉर्टकटद्वारे मॅग्निफाय करा"</string>
@@ -2178,11 +2178,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"पॉवर बटण कॉल समाप्त करते"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"मोठा माउस पॉइंटर"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"अ‍ॅनिमेशन काढा"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"मोनो ऑडिओ"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"ऑडिओ प्ले करताना चॅनेल एकत्र करा"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"ऑडिओ संतुलन"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"डावे"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"उजवे"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"मोनो ऑडिओ"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"ऑडिओ प्ले करताना चॅनल एकत्र करा"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"ऑडिओ संतुलन"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"डावे"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"उजवे"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"डीफॉल्ट"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 सेकंद"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"३० सेकंद"</string>
@@ -2212,11 +2212,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"सूचना कंपन"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"रिंग कंपन"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"स्पर्श फीडबॅक"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> वापरा"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> उघडा"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"रंग सुधारणा वापरा"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"कॅप्शन दाखवा"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"फक्त सपोर्ट असलेल्या ॲपसाठी"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> वापरा"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> उघडा"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"रंग सुधारणा वापरा"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"कॅप्शन दाखवा"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"फक्त सपोर्ट असलेल्या ॲपसाठी"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"कॅप्शनचा आकार आणि शैली"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> मजकूर आकार"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"अधिक पर्याय"</string>
@@ -2246,6 +2246,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"ड्यूटरअनॉमली"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"प्रोटनॉमली"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"ट्रायटनॉमली"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"ग्रेस्केल"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"लाल-हिरवा"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"लाल-हिरवा"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"निळा-पिवळा"</string>
@@ -2375,7 +2376,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"बॅकग्राउंड वापर मर्यादा"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"अ‍ॅपला पार्श्वभूमीत चालण्याची अनुमती द्या"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"ॲपला पार्श्वभूमीमध्ये चालण्याची अनुमती नाही"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"बॅकग्राउंड वापर मर्यादित केला जाऊ शकत नाही"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"बॅकग्राउंडचा वापर मर्यादित केला जाऊ शकत नाही"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"बॅकग्राउंड ॲक्टिव्हिटी मर्यादित ठेवायची?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"तुम्‍ही एखाद्या ॲपसाठी बॅकग्राउंड ॲक्टिव्हिटी मर्यादित ठेवल्‍यास, ते व्‍यवस्थित न चालण्‍याची शक्‍यता आहे"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"हे अ‍ॅप बॅटरी ऑप्टिमाइझ करण्यासाठी सेट केलेले नसल्याने, तुम्ही ते प्रतिबंधित करू शकत नाही.\n\nअ‍ॅप प्रतिबंधित करण्यासाठी, प्रथम बॅटरी ऑप्टिमायझेशन सुरू करा"</string>
@@ -2592,9 +2593,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"शेड्युल सेट करा"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"बॅटरी लाइफ वाढवा"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"चार्ज झाल्यानंतर बंद करा"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"तुमचा फोन <xliff:g id="PERCENT">%1$s</xliff:g> वर असताना बॅटरी सेव्हर बंद होतो"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"तुमचे टॅबलेट <xliff:g id="PERCENT">%1$s</xliff:g> वर असताना बॅटरी सेव्हर बंद होतो"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"तुमचे डिव्हाइस <xliff:g id="PERCENT">%1$s</xliff:g> वर असताना बॅटरी सेव्हर बंद होतो"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"तुमचा फोन <xliff:g id="PERCENT">%1$s</xliff:g> पेक्षा जास्त चार्ज होतो तेव्हा बॅटरी सेव्हर बंद होतो"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"तुमचा टॅबलेट <xliff:g id="PERCENT">%1$s</xliff:g> पेक्षा जास्त चार्ज होतो तेव्हा बॅटरी सेव्हर बंद होतो"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"तुमचे डिव्हाइस <xliff:g id="PERCENT">%1$s</xliff:g> पेक्षा जास्त चार्ज होते तेव्हा बॅटरी सेव्हर बंद होतो"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"सुरू करा"</string>
@@ -2659,6 +2660,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"रीसेट करा"</string>
     <string name="tts_play" msgid="2945513377250757221">"प्ले करा"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"अडॅप्टिव्ह कनेक्टिव्हिटी"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"तुमची नेटवर्क कनेक्शन आपोआप व्यवस्थापित करून बॅटरी लाइफ वाढवते आणि डिव्हाइसचा परफॉर्मन्स सुधारते"</string>
     <string name="credentials_title" msgid="7535942196886123656">"क्रेडेन्शियल स्टोरेज"</string>
     <string name="credentials_install" msgid="3933218407598415827">"एक प्रमाणपत्र इंस्टॉल करा"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"स्टोरेजमधील प्रमाणपत्रे इंस्टॉल करा"</string>
@@ -2670,9 +2673,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"वापरकर्ता क्रेडेंशियल"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"स्टोअर केलेली क्रेडेंशियल पाहा आणि त्यांत सुधारणा करा"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"प्रगत"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"स्टोरेज प्रकार"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"हार्डवेअर बॅकअप घेतला"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"केवळ सॉफ्टवेअर"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"या वापरकर्त्यासाठी क्रेडेंशियल उपलब्ध नाहीत"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN आणि ॲप्ससाठी इंस्टॉल केले"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"वाय-फाय साठी इंस्टॉल केले"</string>
@@ -3061,7 +3061,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"टर्मिनलवर पेमेंट करा"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"पेमेंट अ‍ॅप सेट करा. त्यानंतर संपर्करहित पेमेंटचा आयकन असलेल्या कोणत्याही टर्मिनलवर तुमच्या फोनची मागील बाजू धरा."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"समजले"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"आणखी..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"आणखी…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"डीफॉल्ट पेमेंट अ‍ॅप सेट करा"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"डीफॉल्ट पेमेंट अ‍ॅप अपडेट करा"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"संपर्करहीत टर्मिनलवर <xliff:g id="APP">%1$s</xliff:g> वापरून पैसे द्या"</string>
@@ -3145,7 +3145,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"कॉल साठी हे नेहमी वापरा"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"डेटासाठी एक सिम निवडा"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"एसएमएससाठी एक सिम निवडा"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"डेटा सिम स्‍विच करत आहे, यास सुमारे एक मिनिट लागेल..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"डेटा सिम स्‍विच करत आहे, यास सुमारे एक मिनिट लागेल…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"यासह कॉल करा"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"एक सिम कार्ड निवडा"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"सिम <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3288,6 +3288,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"दिनक्रम, शेड्युल, बॅटरी सेव्हर, पॉवर सेव्हर, बॅटरी, ऑटोमॅटिक, टक्के"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, प्रगत कॉलिंग, 4G कॉलिंग"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"भाषा जोडा, एखादी भाषा जोडा"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"मजकुराचा आकार"</string>
     <string name="default_sound" msgid="6604374495015245195">"डीफॉल्ट ध्‍वनी"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"रिंग आणि सूचनेचा व्हॉल्यूम <xliff:g id="PERCENTAGE">%1$s</xliff:g> वर आहे"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"आवाज, व्हायब्रेट, व्यत्यय आणू नका"</string>
@@ -3327,11 +3328,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"ध्वनी सुरू करा"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"लाइव्ह कॅप्शन"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"मीडियाला आपोआप सबटायटल द्या"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"काहीही नाही"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> शेड्युल सेट केली आहेत</item>
-      <item quantity="one">एक शेड्युल सेट केले आहे</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{None}=1{एक शेड्युल सेट केले}other{# शेड्युल सेट केली}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"व्यत्यय आणू नका"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"फक्त तुम्हाला विश्वास असलेल्या लोकांकडील सूचना मिळवा"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"व्यत्यय मर्यादित करा"</string>
@@ -3399,20 +3396,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"केवळ प्राधान्य"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"सुरू आहे / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"बंद आहे / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"बंद"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"सुरू"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"प्रत्येकवेळी विचारा"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"तुम्ही बंद करेपर्यंत"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> तास</item>
-      <item quantity="one">एक तास</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> मिनिटे"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> शेड्युल आपोआप सुरू केले जाऊ शकतात</item>
-      <item quantity="one">एक शेड्युल आपोआप सुरू केले जाऊ शकते</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{एक तास}other{# तास}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{एक मिनिट}other{# मिनिटे}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Off}=1{बंद आहे / एक शेड्युल आपोआप सुरू होऊ शकते}other{बंद आहे / # शेड्युल आपोआप सुरू होऊ शकतात}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"व्यत्यय आणू नका या सेटिंगमध्ये कशामुळे व्यत्यय येऊ शकतो"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"लोक"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"अ‍ॅप्स"</string>
@@ -3458,6 +3447,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"कमी प्राधान्य असलेल्या सूचना हळू आवाजावर आपोआप सेट करा"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"अ‍ॅडाप्टिव्ह सूचना रॅंकिंग"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"उपयुक्ततेनुसार सूचनांना आपोआप रँक करा"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"अडॅप्टिव्ह सूचना फीडबॅक"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"सूचनांमध्ये केलेल्‍या अ‍ॅडजस्टमेंट दाखवा आणि सिस्‍टममध्ये फीडबॅक देण्याचा पर्याय नमूद करा"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"सुचवलेली कृती आणि उत्तरे"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"सुचवलेली कृती आणि उत्तरे आपोआप दाखवा"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"अलीकडील आणि स्नूझ केलेल्या सूचना दाखवा"</string>
@@ -3654,7 +3645,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"व्यत्यय आणू नका प्रवेश"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"व्यत्यय आणू नका ची अनुमती द्या"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"कोणत्याही इंस्टॉल केलेल्या ॲप्सने व्यत्यय आणू नका प्रवेशाची विनंती केली नाही"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"अ‍ॅप्स लोड करत आहे..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"अ‍ॅप्स लोड होत आहेत…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"तुमच्या विनंतीनुसार Android या अ‍ॅपच्या सूचना, या डिव्हाइसवर दिसणे ब्लॉक करत आहे"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"तुमच्या विनंतीनुसार Android, सूचनांच्या या वर्गवारीचे या डिव्हाइसवर दिसणे ब्लॉक करत आहे"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"तुमच्या विनंतीनुसार Android, सूचनांच्या या समूहाचे या डिव्हाइसवर दिसणे ब्लॉक करत आहे"</string>
@@ -3746,11 +3737,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"सर्व संभाषणे"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"प्राधान्य दिलेली संभाषणे"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"कोणतीही नाहीत"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> संभाषणे</item>
-      <item quantity="one">एक संभाषण</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"कोणतीही नाहीत"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{None}=1{एक संभाषण}other{# संभाषणे}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"कोण व्यत्यय आणू शकतात"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"कॉल"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"कॉल"</string>
@@ -3759,11 +3746,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"अनुमती असलेल्या कॉलचा आवाज होईल याची खात्री करण्यासाठी, डिव्हाइस रिंगवर सेट केले आहे का ते तपासा"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ साठी येणारे कॉल ब्लॉक केले आहेत. तुमच्या मित्रमैत्रिणींना, कुटुंबीयांना किंवा इतर संपर्कांना तुमच्याशी संपर्क साधण्याची अनुमती देण्यासाठी तुम्ही सेटिंग्ज अ‍ॅडजस्ट करू शकता."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"तारांकित संपर्क"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> अन्य</item>
-      <item quantity="one">एक अन्य</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"कोणतेही नाहीत"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{None}=1{{contact_1}}=2{{contact_1} आणि {contact_2}}=3{{contact_1}, {contact_2} आणि {contact_3}}other{{contact_1}, {contact_2} आणि # इतर}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Messages"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"मेसेज"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Messages"</string>
@@ -3772,11 +3755,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ साठी येणारे मेसेज ब्लॉक केले आहेत. तुमच्या मित्रमैत्रिणींना, कुटुंबीयांना किंवा इतर संपर्कांना तुमच्याशी संपर्क साधण्याची अनुमती देण्यासाठी तुम्ही सेटिंग्ज अ‍ॅडजस्ट करू शकता."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"सर्व मेसेज तुमच्यापर्यंत पोहोचू शकतील"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"सर्व कॉल तुमच्यापर्यंत पोहोचू शकतील"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"कोणतेही नाहीत"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> संपर्क</item>
-      <item quantity="one">एक संपर्क</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{None}=1{एक संपर्क}other{# संपर्क}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"कोणीही"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"संपर्क"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"तारांकित संपर्क"</string>
@@ -3814,22 +3793,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"सर्व सूचना"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"काही सूचना"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"तुम्ही अ‍ॅप्‍सना व्यत्यय आणण्याची अनुमती दिली नसली तरीही निवडक लोक तुमच्याशी संपर्क साधू शकतात"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> व्यत्यय आणू शकतात</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> व्यत्यय आणू शकते</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"आणखी <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{No apps can interrupt}=1{{app_1} व्यत्यय आणू शकते}=2{{app_1} आणि {app_2} व्यत्यय आणू शकतात}=3{{app_1}, {app_2}, आणि {app_3} व्यत्यय आणू शकतात}other{{app_1}, {app_2} आणि आणखी # व्यत्यय आणू शकतात}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"अ‍ॅप्स"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"सर्व सूचना"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"काही सूचना"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"व्यत्यय आणणाऱ्या सूचना"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"सर्व सूचनांना अनुमती द्या"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> व्यत्यय आणू शकतात</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> व्यत्यय आणू शकते</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"काहीही व्यत्यय आणू शकत नाही"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"आणखी <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Nothing can interrupt}=1{{sound_category_1} व्यत्यय आणू शकते}=2{{sound_category_1} आणि {sound_category_2} व्यत्यय आणू शकतात}=3{{sound_category_1}, {sound_category_2}, आणि {sound_category_3} व्यत्यय आणू शकतात}other{{sound_category_1}, {sound_category_2} आणि आणखी # व्यत्यय आणू शकते}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"काहीही व्यत्यय आणू शकत नाही"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"कोणीही व्यत्यय आणू शकत नाही"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"काही लोक व्यत्यय आणू शकतात"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"सर्व लोक व्यत्यय आणू शकतात"</string>
@@ -4073,7 +4044,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB वर यांचे नियंत्रण आहे"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"कनेक्ट केलेले डिव्हाइस"</string>
     <string name="usb_control_device" msgid="527916783743021577">"हे डिव्हाइस"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"स्विच करत आहे..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"स्विच करत आहे…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"स्विच करता आले नाही"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"हे डिव्हाइस चार्ज करत आहे"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"कनेक्ट केलेले डिव्हाइस चार्ज करत आहे"</string>
@@ -4320,7 +4291,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"तपशील पहा"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"डेटा सेव्हर"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"अनिर्बंध डेटा"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"पार्श्वभूमीवरील डेटा बंद केला आहे"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"बॅकग्राउंड डेटा बंद केला आहे"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"सुरू"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"बंद"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"डेटा सेव्हर वापरा"</string>
@@ -4343,7 +4314,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"डिव्हाइस लॉक केले असल्यास, प्रत्युत्तरे किंवा सूचनांमध्ये इतर मजकूर टाइप करण्यास प्रतिबंधित करा"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"डीफॉल्ट शब्दलेखन तपासक"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"शब्दलेखन तपासक निवडा"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"स्पेलचेकर वापरा"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"स्पेल चेकर वापरा"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"न निवडलेले"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(काहीही नाही)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4433,7 +4404,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"स्टोरेज स्थान मोकळे करण्यात मदत करण्यासाठी, स्टोरेज व्यवस्थापक तुमच्या डिव्हाइस वरून बॅक अप घेतलेले फोटो आणि व्हिडिओ काढतो."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"फोटो आणि व्हिडिओ काढा"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"स्टोरेज व्यवस्थापक"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"स्टोरेज व्यवस्थापक वापरा"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"स्टोरेज व्यवस्थापक वापरा"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"स्वयंचलित"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"व्यक्तिचलित"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"आता स्थान मोकळे करा"</string>
@@ -4471,6 +4442,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"फोन तपासण्‍यासाठी दोनदा टॅप करा"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"टॅब्लेट तपासण्‍यासाठी दोनदा-टॅप करा"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"डिव्हाइस तपासण्‍यासाठी दोनदा टॅप करा"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"सूचनांसाठी स्वाइप करा"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"तुमच्या सूचना दाखवण्यासाठी स्क्रीनच्या तळाशी कडेला खाली स्वाइप करा"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"एकहाती मोड"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"एकहाती मोड वापरा"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"अ‍ॅप्स स्विच करताना बाहेर पडा"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"टाइमआउट"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"४ सेकंद"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"८ सेकंद"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"१२ सेकंद"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"पोहोच"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"वेळ, सूचना आणि इतर माहिती तपासण्यासाठी, तुमच्या स्क्रीनवर दोनदा टॅप करा."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"फोन तपासण्‍यासाठी तो उचला"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"टॅब्लेट तपासण्‍यासाठी तो उचला"</string>
@@ -4483,6 +4464,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"टॅबलेट तपासण्यासाठी टॅप करा"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"डिव्हाइस तपासण्यासाठी टॅप करा"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"वेळ, सूचना आणि इतर माहिती तपासण्यासाठी तुमच्या स्क्रीनवर टॅप करा."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"पॅनिक बटण"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"पॉवर बटण झटपट पाच वेळा दाबून आणीबाणी SOS क्रिया सुरू करा."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"चेतावणीचा आवाज"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"क्रिया सुरू करण्याआधी सूचित करा"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"आणीबाणी संपर्क"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"सूचनांसाठी फिंगरप्रिंट स्वाइप करा"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"फिंगरप्रिंट स्वाइप करा"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"तुमच्या सूचना तपासण्यासाठी, तुमच्या फोनच्या पाठीमागे फिंगरप्रिंट सेन्सरवर खाली स्वाइप करा."</string>
@@ -4637,7 +4623,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"सर्व अ‍ॅप्ससाठी सुरू करा"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"ग्राफिक ड्रायव्हर निवडा"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"डीफॉल्ट"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"गेम ड्रायव्हर"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"गेम ड्रायव्हर"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"डेव्हलपर ड्रायव्हर"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"सिस्टम ग्राफिक ड्रायव्हर"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4706,6 +4692,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"नेटवर्क मिळू शकले नाहीत. पुन्‍हा प्रयत्‍न करा."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(मनाई केलेले)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"सिम कार्ड नाही"</string>
+    <string name="sim_card" msgid="6381158752066377709">"सिम"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"सिम नाही"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"काहीही नाही"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"कनेक्ट करण्यासाठी सिम आवश्यक आहे"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"कनेक्ट करण्यासाठी <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> चे सिम आवश्यक आहे"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"प्राधान्‍यकृत नेटवर्क मोड: WCDMA प्राधान्‍यकृत"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"प्राधान्‍यकृत नेटवर्क मोड: केवळ GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"प्राधान्‍यकृत नेटवर्क प्रकार: केवळ WCDMA"</string>
@@ -4759,6 +4750,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"मोबाइल डेटा"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"मोबाइल नेटवर्क वापरून डेटा अ‍ॅक्सेस करा"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"रेंजमध्ये असताना फोन आपोआप या वाहकावर स्विच करेल"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"सिम कार्ड उपलब्ध नाही"</string>
     <string name="calls_preference" msgid="2166481296066890129">"कॉल प्राधान्य"</string>
     <string name="sms_preference" msgid="7742964962568219351">"एसएमएस प्राधान्य"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"प्रत्येक वेळी विचारा"</string>
@@ -4941,10 +4933,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Settings यामध्ये स्‍क्रीन ओव्‍हरलेची अनुमती द्या"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Settings स्क्रीनवर ओव्हरले करण्यासाठी इतर अ‍ॅप्सवर प्रदर्शित करू शकणाऱ्या अ‍ॅप्सना अनुमती द्या"</string>
     <string name="media_controls_title" msgid="403271085636252597">"मीडिया"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"मीडिया सेशन संपेल तेव्हा प्‍लेअर लपवा"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"प्‍लेअर तुम्हाला विस्तार केलेल्या क्विक सेटिंग्ज पॅनलमधून सेशन पुन्‍हा सुरू करण्याची अनुमती देतो."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"क्विक सेटिंग्ज मध्ये मीडिया प्लेअर"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"प्लेबॅक सहजरीत्‍या पुन्‍हा सुरू करण्यासाठी मीडिया प्लेअर विस्तारित कालावधीसाठी दाखवा"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"प्‍लेअर लपवा"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"प्‍लेअर दाखवा"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"कोणताही प्‍लेअर उपलब्ध नाही"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"अनुमती असलेली अ‍ॅप्स"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"मीडिया"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"ब्लूटूथ सुरू होईल"</string>
 </resources>
diff --git a/res/values-ms/arrays.xml b/res/values-ms/arrays.xml
index 9a9aadc..117b7aa 100644
--- a/res/values-ms/arrays.xml
+++ b/res/values-ms/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Sederhana"</item>
     <item msgid="6740026006576843477">"Panjang"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Pendek"</item>
+    <item msgid="7397961711906421599">"Sederhana"</item>
+    <item msgid="4079132024502041928">"Panjang"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Lalai"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA sahaja"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Global"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 2486ebf..1d79c74 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Tunjukkan maklumat profil pada skrin kunci"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Akaun"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Lokasi"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Gunakan lokasi"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Gunakan lokasi"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Mati"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">Hidup - <xliff:g id="COUNT_1">%1$d</xliff:g> apl mempunyai akses kepada lokasi</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Gunakan wajah untuk membuat pengesahan"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Mula"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Jika wajah buka kunci kebolehaksesan dimatikan, beberapa langkah persediaan mungkin tidak berfungsi dengan baik dengan TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Kembali"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Teruskan persediaan"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Gunakan persediaan kebolehaksesan"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="one">Mesti kurang daripada <xliff:g id="NUMBER_0">%d</xliff:g> digit</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Pentadbir peranti tidak membenarkan penggunaan PIN terbaharu"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"PIN lazim disekat oleh pentadbir IT anda. Cuba PIN yang lain."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Tidak boleh menyertakan aksara yang tidak sah"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Mesti mengandungi sekurang-kurangnya satu huruf"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Mesti mengandungi sekurang-kurangnya satu digit"</string>
@@ -653,7 +655,6 @@
       <item quantity="one">Mesti mengandungi sekurang-kurangnya 1 aksara bukan angka</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Pentadbir peranti tidak membenarkan penggunaan kata laluan terbaharu"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Kata laluan lazim disekat oleh pentadbir IT anda. Cuba kata laluan yang lain."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Angka menaik, menurun atau jujukan berulang tidak dibenarkan"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Sahkan"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Batal"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Hidupkan Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Gunakan Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Gunakan Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Tetapan Wi‑Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Sediakan &amp; urus titik capaian wayarles"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Tengahkan kod QR di bawah untuk menyambung ke “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Sertai Wi‑Fi dengan mengimbas kod QR"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Kongsi Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Imbas kod QR ini untuk menyambung ke “<xliff:g id="SSID">%1$s</xliff:g>” dan berkongsi kata laluan"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Imbas kod QR ini menggunakan peranti lain untuk menyertai “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Imbas kod QR ini untuk menyambung ke “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Cuba lagi. Jika isu berterusan, hubungi pengilang peranti"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Kesilapan telah berlaku"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Kata laluan Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Kata laluan tempat liputan: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Autosambung"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Benarkan telefon bersambung secara automatik berdekatan rangkaian ini"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Benarkan tablet bersambung secara automatik berdekatan rangkaian ini"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Benarkan sambungan kepada rangkaian ini apabila berada dalam julat"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Tambah peranti"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Gunakan kod QR untuk menambahkan peranti pada rangkaian ini"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"Kod QR bukan dalam format yang sah"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Gunakan sijil sistem"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Jangan berikan"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Jangan sahkan"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Tiada sijil yang ditentukan. Sambungan anda tidak akan menjadi sambungan peribadi."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Nama rangkaian terlalu panjang."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Perlu nyatakan domain."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Sijil diperlukan."</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Sambung"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi dihidupkan"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Disambungkan kepada <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Menyambung ke <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Menyambung…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Gagal menyambung ke rangkaian."</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Rangkaian di luar liputan"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Apl berkongsi kandungan. Untuk berkongsi sambungan Internet, matikan dan hidupkan tempat liputan"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Tiada kata laluan yang ditetapkan"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Nama tempat liputan"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Menghidupkan <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Menghidupkan <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Peranti lain boleh bersambung ke <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Kata laluan tempat liputan"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Jalur AP"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Meningkatkan kadar muat semula daripada 60 kepada 90 Hz untuk sesetengah kandungan secara automatik. Meningkatkan penggunaan bateri."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Paksa kadar muat semula 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Kadar muat semula tertinggi untuk keresponsifan sentuhan &amp; kualiti animasi yang dipertingkat. Meningkatkan penggunaan bateri."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Perhatian skrin"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Hidup / Skrin tidak akan dimatikan jika anda melihat pada skrin"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Versi Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Kemas kini keselamatan Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Model"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Model: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Model &amp; perkakasan"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Versi perkakasan"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ID Peralatan"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Tetapan rangkaian telah ditetapkan semula"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Tidak dapat memadamkan SIM"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"SIM yang dimuat turun tidak dapat dipadamkan disebabkan ralat.\n\nMulakan semula peranti anda, kemudian cuba lagi."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Padamkan semua data (tetapan semula kilang)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Pdm sma dta (ttpn smla kilang)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Tindakan ini akan memadamkan semua data daripada "<b>"storan dalaman"</b>" tablet anda, termasuk:\n\n"<li>"Akaun Google Anda"</li>\n<li>"Data serta tetapan sistem dan apl"</li>\n<li>"Apl yang telah dimuat turun"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Tindakan ini akan memadamkan semua data daripada "<b>"storan dalaman"</b>" telefon anda, termasuk:\n\n"<li>"Akaun Google Anda"</li>\n<li>"Data serta tetapan sistem dan apl"</li>\n<li>"Apl yang dimuat turun"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Anda melog masuk ke dalam akaun berikut buat masa ini:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Terdapat pengguna lain pada peranti ini.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Muzik"</li>\n<li>"Foto"</li>\n<li>"Data pengguna yang lain"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Ini tidak akan membatalkan pelan perkhidmatan mudah alih anda."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Untuk memadam bersih muzik, gambar dan data pengguna lain, "<b>"storan USB"</b>" perlu dipadamkan."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Untuk turut memadam bersih muzik, gambar dan data pengguna lain, "<b>"kad SD"</b>" perlu dipadamkan."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Padamkan semua data (tetapan semula kilang)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Padamkan semua data (tetapan semula kilang)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Tindakan ini akan memadamkan semua data daripada "<b>"storan dalaman"</b>" tablet anda, termasuk:\n\n"<li>"Akaun Google Anda"</li>\n<li>"Sistem dan data serta tetapan apl"</li>\n<li>"Apl yang telah dimuat turun"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Tindakan ini akan memadamkan semua data daripada "<b>"storan dalaman"</b>" telefon anda, termasuk:\n\n"<li>"Akaun Google Anda"</li>\n<li>" Sistem dan data serta tetapan apl"</li>\n<li>"Apl yang dimuat turun"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Anda melog masuk ke dalam akaun berikut buat masa ini:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Terdapat pengguna lain pada peranti ini.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Muzik"</li>\n<li>"Foto"</li>\n<li>"Data pengguna yang lain"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Ini tidak akan membatalkan pelan perkhidmatan mudah alih anda."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Untuk memadam bersih muzik, gambar dan data pengguna lain, "<b>"storan USB"</b>" perlu dipadamkan."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Untuk turut memadam bersih muzik, gambar dan data pengguna lain, "<b>"kad SD"</b>" perlu dipadamkan."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Padamkan storan USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Padam kad SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Padamkan semua data pada storan USB dalaman, seperti muzik atau foto"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Padamkan semua data pada kad SD, seperti muzik atau foto"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Padamkan semua data"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Padamkan semua data"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Semua maklumat peribadi anda dan apl yang dimuat turun akan dipadamkan. Tindakan ini tidak boleh dibuat asal."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Semua maklumat peribadi anda, termasuk apl &amp; SIM yang dimuat turun, akan dipadamkan. Tindakan ini tidak boleh dibuat asal."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Padamkan semua"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Tiada penetapan semula dijalankan kerana perkhidmatan Padam Bersih Sistem tidak tersedia."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Padamkan semua data?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Tetapan semula kilang tidak tersedia untuk pengguna ini"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Memadam"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Sila tunggu..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Padamkan semua data"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Padamkan semua data"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Semua maklumat peribadi anda dan apl yang dimuat turun akan dipadamkan. Tindakan ini tidak boleh dibuat asal."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Semua maklumat peribadi anda, termasuk apl &amp; SIM yang dimuat turun akan dipadamkan. Tindakan ini tidak boleh dibuat asal."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Padamkan semua data?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Tetapan semula kilang tidak tersedia untuk pengguna ini"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Memadam"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Sila tunggu…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Tetapan panggilan"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Tetapkan mel suara, pemajuan panggilan, panggilan menunggu, ID pemanggil"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Penambatan USB"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Tidak boleh menambat pada lebih daripada <xliff:g id="MAXCONNECTION">%1$d</xliff:g> peranti."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan dinyahtambat."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Penambatan Ethernet"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Kongsi sambungan Internet telefon melalui Ethernet USB"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Kongsi sambungan Internet telefon melalui Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Gunakan tempat liputan dan penambatan untuk menyediakan Internet kepada peranti lain melalui sambungan data mudah alih anda. Apl juga boleh membuat tempat liputan untuk berkongsi kandungan dengan peranti berdekatan."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Gunakan tempat liputan dan penambatan untuk menyediakan Internet kepada peranti lain melalui Wi-Fi atau sambungan data mudah alih anda. Apl juga boleh membuat tempat liputan untuk berkongsi kandungan dengan peranti berdekatan."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Bantuan"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Pilihan sari kata"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Pembesaran"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Kawasan pembesaran"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Pembesaran didayakan"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Pilih kawasan pembesaran yang ingin digunakan apabila membesarkan skrin"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Skrin penuh"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Sebahagian skrin"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Skrin penuh &amp; sebahagian skrin"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Besarkan seluruh skrin"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Besarkan sebahagian skrin"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Tukar kepada butang kebolehaksesan?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Tindakan menggunakan tiga ketikan untuk membesarkan sebahagian daripada skrin akan menyebabkan penaipan dan tindakan lain ditangguhkan.\n\nAdakah anda ingin menukar kepada penggunaan butang kebolehaksesan untuk membesarkan item?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Tukar kepada butang kebolehaksesan"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Kekalkan tiga ketikan untuk membesarkan"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Tetapan pembesaran"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Besarkan dengan tiga ketikan"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Besarkan menggunakan pintasan"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Butang kuasa menamatkan panggilan"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Penuding tetikus besar"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Alih keluar animasi"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Audio mono"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Gabungkan saluran semasa memainkan audio"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Keseimbangan audio"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Kiri"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Kanan"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Audio mono"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Gabungkan saluran semasa memainkan audio"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Keseimbangan audio"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Kiri"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Kanan"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Lalai"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 saat"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 saat"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Getaran pemberitahuan"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Getaran deringan"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Maklum balas sentuhan"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Gunakan <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Buka <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Gunakan pembetulan warna"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Tunjukkan kapsyen"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Untuk apl yang disokong sahaja"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Gunakan <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Buka <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Gunakan pembetulan warna"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Tunjukkan kapsyen"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Untuk apl yang disokong sahaja"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Saiz dan gaya kapsyen"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Saiz teks <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Lagi pilihan"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomali"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomali"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomali"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Skala kelabu"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Merah-hijau"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Merah-hijau"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Biru-Kuning"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Pengehadan latar belakang"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Benarkan apl berjalan di latar belakang"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Apl tidak dibenarkan berjalan di latar belakang"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Penggunaan latar belakang tidak boleh dihadkan"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Penggunaan latar belakang tidak boleh dihadkan"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Hadkan aktiviti latar belakang?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Jika anda mengehadkan aktiviti latar belakang untuk apl, fungsi apl itu mungkin terganggu"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Apl ini tidak boleh dihadkan kerana tidak ditetapkan untuk mengoptimumkan bateri.\n\nHidupkan pengoptimuman bateri dahulu."</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Tetapkan jadual"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Panjangkan hayat bateri"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Matikan apabila dicas"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Penjimat Bateri dimatikan apabila telefon anda pada <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Penjimat Bateri dimatikan apabila tablet anda pada <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Penjimat Bateri dimatikan apabila peranti anda pada <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Penjimat Bateri dimatikan apabila telefon anda dicas di atas <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Penjimat Bateri dimatikan apabila tablet anda dicas di atas <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Penjimat Bateri dimatikan apabila peranti anda dicas di atas <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Hidupkan"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Tetapkan semula"</string>
     <string name="tts_play" msgid="2945513377250757221">"Main"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Kesambungan mudah suai"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Melanjutkan hayat bateri dan meningkatkan prestasi peranti dengan mengurus sambungan rangkaian anda secara automatik"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Storan bukti kelayakan"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Pasang sijil"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Pasang sijil daripada storan"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Bukti kelayakan pengguna"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Lihat dan ubah suai bukti kelayakan yang disimpan"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Lanjutan"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Jenis storan"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Bersandarkan perkakasan"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Perisian sahaja"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Bukti kelayakan tidak tersedia untuk pengguna ini"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Dipasang untuk VPN dan apl"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Dipasang untuk Wi-Fi"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Membuat pembayaran di terminal"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Sediakan apl bayaran. Kemudian, pegang telefon anda dengan bahagian belakang dihadapkan ke sebarang terminal yang terdapat simbol tanpa sentuhan."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Faham"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Lagi..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Lagi…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Tetapkan apl pembayaran lalai anda"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Kemas kini apl pembayaran lalai anda"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Pada terminal tanpa sentuhan, bayar dengan <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Sentiasa gunakan ini untuk panggilan"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Pilih SIM untuk data"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Pilih SIM untuk SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Menukar SIM data, proses ini boleh mengambil masa sehingga satu minit…"</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Menukar SIM data, ini boleh mengambil masa sehingga satu minit…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Panggil dengan"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Pilih kad SIM"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"rutin, jadual, penjimat bateri, penjimat kuasa, bateri, automatik, peratus"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, panggilan lanjutan, panggilan 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"tambah bahasa, tambah satu bahasa"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"saiz teks"</string>
     <string name="default_sound" msgid="6604374495015245195">"Bunyi lalai"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Kelantangan dering &amp; pemberitahuan di <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Kelantangan, getaran, Jangan Ganggu"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Bunyi semasa kuasa dihidupkan"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Sari Kata Langsung"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Sari kata media automatik"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Tiada"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> jadual ditetapkan</item>
-      <item quantity="one">1 jadual ditetapkan</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Tiada}=1{1 jadual ditetapkan}other{# jadual ditetapkan}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Jangan Ganggu"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Dapatkan pemberitahuan oleh orang dan apl penting sahaja"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Hadkan gangguan"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Keutamaan sahaja"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Hidup / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Mati / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Mati"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Hidup"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Tanya setiap kali"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Sehingga anda matikan"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> jam</item>
-      <item quantity="one">1 jam</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minit"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> jadual boleh dihidupkan secara automatik</item>
-      <item quantity="one">1 jadual boleh dihidupkan secara automatik</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 jam}other{# jam}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minit}other{# minit}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Mati}=1{Mati / 1 jadual boleh dihidupkan secara automatik}other{Mati / # jadual boleh dihidupkan secara automatik}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Perkara yang boleh mengganggu Jangan Ganggu"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Orang"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Apl"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Tetapkan pemberitahuan berkeutamaan rendah kepada Lembut secara automatik"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Kedudukan pemberitahuan boleh suai"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Atur kedudukan pemberitahuan secara automatik mengikut kaitan"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Maklum balas pemberitahuan mudah suai"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Tunjukkan pelarasan yang dibuat pada pemberitahuan dan tunjukkan pilihan untuk memberikan maklum balas kepada sistem"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Tindakan dan balasan yang dicadangkan"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Tunjukkan tindakan &amp; balasan yang dicadangkan secara automatik"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Tunjukkan pemberitahuan baru-baru ini dan pemberitahuan yang ditunda"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Akses Jangan Ganggu"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Benarkan Jangan Ganggu"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Tiada sebarang apl yang terpasang meminta akses Jangan Ganggu"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Memuatkan apl..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Memuatkan apl…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Atas permintaan anda, Android menyekat pemberitahuan apl ini daripada muncul pada peranti ini"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Atas permintaan anda, Android menyekat kategori pemberitahuan ini daripada muncul pada peranti ini"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Atas permintaan anda, Android menyekat kumpulan pemberitahuan ini daripada muncul pada peranti ini"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Semua perbualan"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Perbualan keutamaan"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Tiada"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> perbualan</item>
-      <item quantity="one">1 perbualan</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Tiada"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Tiada}=1{1 perbualan}other{# perbualan}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Orang yang boleh ganggu"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Panggilan"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Panggilan"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Untuk memastikan panggilan yang dibenarkan berbunyi, periksa bahawa peranti telah ditetapkan supaya berdering"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Panggilan masuk disekat untuk ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’. Anda boleh melaraskan tetapan untuk membenarkan rakan, keluarga atau kenalan lain menghubungi anda."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Kenalan dibintangi"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> yang lain</item>
-      <item quantity="one">seorang lagi</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Tiada"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Tiada}=1{{contact_1}}=2{{contact_1} dan {contact_2}}=3{{contact_1}, {contact_2} dan {contact_3}}other{{contact_1}, {contact_2} dan # yang lain}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Mesej"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"mesej"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Mesej"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Mesej masuk disekat untuk ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’. Anda boleh melaraskan tetapan untuk membenarkan rakan, keluarga atau kenalan lain menghubungi anda."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Anda boleh menerima semua mesej"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Anda boleh dihubungi oleh semua panggilan"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Tiada"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kenalan</item>
-      <item quantity="one">1 kenalan</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Tiada}=1{1 kenalan}other{# kenalan}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Sesiapa sahaja"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Kenalan"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Kenalan dibintangi"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Semua pemberitahuan"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Sesetengah pemberitahuan"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Orang yang dipilih masih dapat menghubungi anda walaupun anda tidak membenarkan apl mengganggu"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> boleh ganggu</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> boleh ganggu</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> lagi"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Tiada apl yang boleh ganggu}=1{{app_1} boleh ganggu}=2{{app_1} dan {app_2} boleh ganggu}=3{{app_1}, {app_2} dan {app_3} boleh ganggu}other{{app_1}, {app_2} dan # lagi boleh ganggu}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Apl"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Semua pemberitahuan"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Sesetengah pemberitahuan"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Pemberitahuan yang boleh ganggu"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Benarkan semua pemberitahuan"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> boleh ganggu</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> boleh ganggu</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Tiada apa-apa yang boleh ganggu"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> lagi"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Tiada apa-apa yang boleh ganggu}=1{{sound_category_1} boleh ganggu}=2{{sound_category_1} dan {sound_category_2} boleh ganggu}=3{{sound_category_1}, {sound_category_2} dan {sound_category_3} boleh ganggu}other{{sound_category_1}, {sound_category_2} dan # lagi boleh ganggu}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Tiada apa-apa yang boleh ganggu"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Tiada seorang pun boleh ganggu"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Sesetengah orang boleh ganggu"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Semua orang boleh ganggu"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB dikawal oleh"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Peranti yang disambungkan"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Peranti ini"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Bertukar…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Bertukar…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Tidak dapat bertukar"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Mengecas peranti ini"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Mengecas peranti tersambung"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Lihat butiran"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Penjimat Data"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Data tanpa had"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Data latar belakang dimatikan"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Data latar belakang dimatikan"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Hidup"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Mati"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Gunakan Penjimat Data"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Jika peranti dikunci, halang penaipan balasan atau teks lain dalam pemberitahuan"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Penyemak ejaan lalai"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Pilih penyemak ejaan"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Gunakan penyemak ejaan"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Gunakan penyemak ejaan"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Tidak dipilih"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(tiada)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Untuk membantu mengosongkan ruang storan, pengurus storan akan mengalih keluar foto dan video sandaran daripada peranti anda."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Alih keluar foto &amp; video"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Pengurus storan"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Gunakan pengurus Storan"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Gunakan Pengurus storan"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automatik"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Kosongkan ruang sekarang"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Ketik dua kali untuk memeriksa telefon"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Ketik dua kali untuk menyemak tablet"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Ketik dua kali untuk menyemak peranti"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Leret untuk mendapatkan pemberitahuan"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Leret ke bawah di sisi bawah skrin untuk menunjukkan pemberitahuan anda"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Mod sebelah tangan"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Gunakan mod sebelah tangan"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Keluar apabila menukar apl"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Tamat masa"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 saat"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 saat"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 saat"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"kebolehjangkauan"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Untuk menyemak masa, pemberitahuan dan maklumat lain, ketik dua kali pada skrin anda."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Angkat untuk memeriksa telefon"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Angkat untuk menyemak tablet"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Ketik untuk memeriksa tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Ketik untuk memeriksa peranti"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Untuk menyemak masa, pemberitahuan dan maklumat lain, ketik skrin anda."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Butang panik"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Mulakan tindakan SOS kecemasan dengan menekan butang kuasa dengan cepat sebanyak 5 kali."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Bunyi amaran"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Beri amaran sebelum memulakan tindakan"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Orang hubungan kecemasan"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Leret cap jari untuk pemberitahuan"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Leret cap jari"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Untuk menyemak pemberitahuan, leret ke bawah pada penderia cap jari di bahagian belakang telefon anda."</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Dayakan untuk semua apl"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Pilih Pemacu Grafik"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Lalai"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Pemacu Permainan"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Pemacu Permainan"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Pemacu Pembangun"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Pemacu Grafik Sistem"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Tidak menemui rangkaian. Cuba lagi."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(dilarang)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Tiada kad SIM"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Tiada SIM"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Tiada"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Memerlukan SIM untuk menyambung"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Memerlukan SIM <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> untuk menyambung"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Mod rangkaian pilihan: WCDMA diutamakan"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Mod rangkaian pilihan: GSM sahaja"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Mod rangkaian pilihan: WCDMA sahaja"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Data mudah alih"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Akses data menggunakan rangkaian mudah alih"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Telefon akan bertukar kepada pembawa ini secara automatik apabila berada dalam liputan"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Tiada kad SIM yang tersedia"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Pilihan panggilan"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Pilihan SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Tanya setiap kali"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Benarkan tindanan skrin pada Tetapan"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Benarkan apl yang boleh dipaparkan di atas apl lain untuk menindan skrin Tetapan"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Media"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Sembunyikan pemain apabila sesi media tamat"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Pemain membolehkan anda menyambung semula sesi daripada panel Tetapan Pantas yang dikembangkan."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Pemain media dalam Tetapan Pantas"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Tunjukkan pemain media untuk tempoh yang lama untuk menyambung semula main balik dengan mudah"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Sembunyikan pemain"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Tunjukkan pemain"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Tiada pemain tersedia"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Apl dibenarkan"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"media"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth akan dihidupkan"</string>
 </resources>
diff --git a/res/values-my/arrays.xml b/res/values-my/arrays.xml
index 60f8af9..893fbb9 100644
--- a/res/values-my/arrays.xml
+++ b/res/values-my/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"အတော်အသင့်"</item>
     <item msgid="6740026006576843477">"အရှည်"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"အတို"</item>
+    <item msgid="7397961711906421599">"အလယ်အလတ်"</item>
+    <item msgid="4079132024502041928">"အရှည်"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"မူလစာလုံး"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"ကမ္ဘာအနှံ့"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA သာ"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"ကမ္ဘာအနှံ့"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index cc6e0d0..dc6a3f5 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"သော့ခတ်ထားသောမျက်နှာပြင်ပေါ်သုံးစွဲသူ၏အကြောင်းပြရန်"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"အကောင့်များ"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"တည်နေရာ"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"တည်နေရာကို သုံးရန်"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"တည်နေရာကို သုံးရန်"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"ပိတ်ထားသည်"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">ဖွင့်ထားသည် - အက်ပ် <xliff:g id="COUNT_1">%1$d</xliff:g> ခုက တည်နေရာ ဝင်သုံးခွင့်ရှိပါသည်</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"အထောက်အထားစိစစ်ရန် သင့်မျက်နှာကို သုံးပါ"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"စတင်ရန်"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"အများသုံးစွဲနိုင်သည့် မျက်နှာမှတ် သော့ဖွင့်ခြင်းကို ပိတ်ထားပါက အချို့သော စနစ်ထည့်သွင်းခြင်းအဆင့်များသည် TalkBack နှင့် အဆင်ပြေစွာအလုပ်မလုပ်နိုင်ပါ။"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"နောက်သို့"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"ဆက်၍စနစ်ထည့်သွင်းရန်"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"အများသုံးစွဲနိုင်မှုကို သုံးရန်"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="one">ဂဏန်း <xliff:g id="NUMBER_0">%d</xliff:g> လုံးထက် နည်းရမည်</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"စက်ပစ္စည်း၏ စီမံခန့်ခွဲသူသည် မကြာသေးမီက အသုံးပြုခဲ့သည့် ပင်နံပါတ်ကို သုံးခွင့်မပြုပါ"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"အသုံးပြုလေ့ရှိသော PIN များကို သင်၏ IT စီမံခန့်ခွဲသူက ပိတ်ထားသည်။ အခြား PIN တစ်ခုဖြင့် စမ်းကြည့်ပါ။"</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"၎င်းတွင် မမှန်ကန်သည့်စကားလုံးများ ပါဝင်၍မရပါ"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"အနည်းဆုံး စာလုံးတစ်လုံး ပါရပါမည်"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"အနည်းဆုံး ဂဏန်းတစ်လုံး ပါရပါမည်"</string>
@@ -653,7 +655,6 @@
       <item quantity="one">ဂဏန်းမဟုတ်သော အက္ခရာ အနည်းဆုံး ၁ လုံးပါရမည်</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"စက်ပစ္စည်းစီမံခန့်ခွဲသူသည် မကြာသေးမီက အသုံးပြုခဲ့သည့် စကားဝှက်ကို သုံးခွင့်မပြုပါ"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"အသုံးပြုလေ့ရှိသော စကားဝှက်များကို သင်၏ IT စီမံခန့်ခွဲသူက ပိတ်ထားသည်။ အခြား စကားဝှက်တစ်ခုဖြင့် စမ်းကြည့်ပါ။"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"အစဉ်လိုက်ဖြစ်နေသော ဂဏန်း အငယ်မှအကြီး၊ အကြီးမှအငယ် သို့မဟုတ် ထပ်နေသည့် နံပါတ်စဉ်များကို ခွင့်မပြုပါ"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"အတည်ပြုရန်"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"မလုပ်တော့"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"ဝိုင်ဖိုင်ဖွင့်ရန်"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Wi-Fi သုံးရန်"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Wi-Fi သုံးပါ"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"ဝိုင်ဖိုင်ဆက်တင်များ"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"ကြိုးမဲ့ချိတ်ဆက်ပွိုင့်များအား သတ်မှတ်ခြင်း &amp;  စီမံခြင်း"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"“<xliff:g id="SSID">%1$s</xliff:g>” သို့ ချိတ်ဆက်ရန် အောက်ရှိ QR ကုဒ်ကို အလယ်တည့်တည့် ထားပါ"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"QR ကုဒ်ကို စကင်ဖတ်၍ Wi‑Fi ကို ချိတ်ဆက်ပါ"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Wi‑Fi မျှဝေပါ"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"“<xliff:g id="SSID">%1$s</xliff:g>” နှင့် ချိတ်ဆက်ရန် ဤ QR ကုဒ်ကို စကင်ဖတ်ပြီး စကားဝှက် မျှဝေပါ"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"“<xliff:g id="SSID">%1$s</xliff:g>” သို့ ဝင်ရန် စက်နောက်တစ်ခုဖြင့် ဤ QR ကုဒ်ကို စကင်ဖတ်ပါ"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"“<xliff:g id="SSID">%1$s</xliff:g>” နှင့်ချိတ်ဆက်ရန် ဤ QR ကုဒ်ကို စကင်ဖတ်ပါ"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"ထပ်စမ်းကြည့်ပါ။ ပြဿနာဆက်ရှိနေလျှင် စက်ပစ္စည်းထုတ်လုပ်သူကို ဆက်သွယ်ပါ"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"တစ်ခုခု မှားသွားသည်"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi-Fi စကားဝှက်− <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"ဟော့စပေါ့စကားဝှက်− <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"အလိုအလျောက် ချိတ်ဆက်မှု"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"ဤကွန်ရက်အနီးတွင် ဖုန်းရှိပါက အလိုအလျောက် ချိတ်ဆက်ခွင့်ပြုပါ"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"ဤကွန်ရက်အနီးတွင် တက်ဘလက်ရှိပါက အလိုအလျောက် ချိတ်ဆက်ခွင့်ပြုပါ"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"ချိတ်ဆက်နိုင်သည့် အကွာအဝေးအတွင်း ရှိပါက ဤကွန်ရက်သို့ ချိတ်ဆက်မှုအား ခွင့်ပြုရန်"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"စက်ပစ္စည်း ထည့်ရန်"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"ဤကွန်ရက်သို့ စက်တစ်ခုထည့်ရန် QR ကုဒ်ကို အသုံးပြုပါ"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR ကုဒ်သည် မှန်ကန်သောဖော်မက် မဟုတ်ပါ"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"စနစ်ပိုင်း အသိအမှတ်ပြုလက်မှတ်များကို သုံးပါ"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"မပေးထားပါ"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"အတည်မပြုပါ"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"အသိမှတ်ပြုလက်မှတ် သတ်မှတ်မထားပါ။ သင့်ချိတ်ဆက်မှု တသီးတသန့်ဖြစ်မည် မဟုတ်ပါ။"</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"ကွန်ရက်အမည် ရှည်လွန်းပါသည်။"</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"ဒိုမိန်းတစ်ခု သတ်မှတ်ပေးရပါမည်။"</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"အသိအမှတ်ပြုလက်မှတ် လိုအပ်သည်။"</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"ချိတ်ဆက်ရန်"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi ဖွင့်ထားသည်"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> သို့ ချိတ်ဆက်ထားသည်"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> သို့ ချိတ်ဆက်နေပါသည်"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"ချိတ်ဆက်နေသည်…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"ကွန်ရက်ကို ချိတ်ဆက်ရန် မအောင်မြင်ခဲ့ပါ"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"ကွန်ရက်သည် ရနိုင်သောအကွာအဝေးတွင် မရှိပါ"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"အက်ပ်သည် ပါဝင်သည့်အကြောင်းအရာများကို မျှဝေနေပါသည်။ အင်တာနက်ကို မျှဝေရန် ဟော့စပေါ့ကို ပိတ်ပြီး ပြန်ဖွင့်ပါ"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"မည်သည့် စကားဝှက်မျှ သတ်မှတ်မထားပါ"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"ဟော့စပေါ့အမည်"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ကို ဖွင့်နေပါသည်..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ဖွင့်နေသည်…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"အခြားစက်ပစ္စည်းများက <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> နှင့် ချိတ်ဆက်နိုင်ပါသည်"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"ဟော့စပေါ့စကားဝှက်"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP လိုင်း"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"အကြောင်းအရာအချို့အတွက် ပြန်လည်စတင်နှုန်းကို ၆၀ မှ ၉၀ Hz သို့ အလိုအလျောက် တိုးပေးသည်။ ဘက်ထရီ အသုံးပြုမှု တိုးလာပါမည်။"</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"ချောမွေ့သော ဖန်သားပြင်ပြသမှု"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"၉၀ Hz ပြန်ဖွင့်မှုနှုန်းကို မဖြစ်မနေအသုံးပြုရန်"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"ထိတွေ့မှု တုံ့ပြန်အားနှင့် ကာတွန်းပုံအရည်အသွေးပိုကောင်းလာရန် အမြင့်ဆုံးပြန်ဖွင့်မှုနှုန်း။ ဘက်ထရီ အသုံးပြုမှု တိုးလာပါမည်။"</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"ဖန်သားပြင်ကို အာရုံစိုက်ခြင်း"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"ဖွင့်ထားသည် / ၎င်းကို သင်ကြည့်နေလျှင် မျက်နှာပြင် ပိတ်မည်မဟုတ်ပါ"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android ဗားရှင်း"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android လုံခြုံရေးအပ်ဒိတ်"</string>
     <string name="model_info" msgid="8997566254717810904">"မော်ဒယ်"</string>
-    <string name="model_summary" msgid="2246651782442466213">"မော်ဒယ်- %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"မော်ဒယ်နှင့် စက်ပစ္စည်း"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"စက်ပစ္စည်းဗားရှင်း"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"စက်ပစ္စည်း အမှတ်"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"ကွန်ရက်ချိန်ညှိချက်များ ပြန်လည်သတ်မှတ်ပြီးပါပြီ"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"ဆင်းမ်ကတ်များ ဖျက်၍မရပါ"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"အမှားဖြစ်သွားသဖြင့် ဒေါင်းလုဒ်လုပ်ထားသော ဆင်းမ်ကတ်များကို ဖျက်၍မရပါ။\n\nသင့်စက်ပစ္စည်းကို ပြန်စတင်ပြီး ထပ်စမ်းကြည့်ပါ။"</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"ဒေတာအားလုံးဖျက်ခြင်း (စက်ရုံထုတ်ဆက်တင် သတ်မှတ်ရန်)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"ဒေတာအားလုံးဖျက်ခြင်း (စက်ရုံထုတ်ဆက်တင် သတ်မှတ်ရန်)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"ဤသို့ပြုလုပ်ခြင်းက သင့်တက်ဘလက်၏ "<b>"စက်အတွင်းသိုလှောင်ခန်း"</b>" အပါအဝင် အောက်ပါဒေတာအားလုံးကို ဖျက်ပါမည်-\n\n"<li>"သင်၏ Google အကောင့်"</li>\n<li>"စနစ်နှင့် အက်ပ်ဒေတာ၊ ဆက်တင်များ၊"</li>\n<li>"ဒေါင်းလုဒ်လုပ်ထားသည့်အက်ပ်များ"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"ဤသို့ပြုလုပ်ခြင်းက သင့်ဖုန်း၏ "<b>"စက်အတွင်းသိုလှောင်ခန်း"</b>" အပါအဝင် အောက်ပါဒေတာအားလုံးကို ဖျက်ပါမည်- \n\n"<li>"သင်၏ Google အကောင့်"</li>\n<li>"စနစ်နှင့် အက်ပ်ဒေတာ၊ ဆက်တင်များ၊"</li>\n<li>"ဒေါင်းလုဒ်လုပ်ထားသည့်အက်ပ်များ"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"သင်သည် လက်ရှိတွင် အောက်ပါအကောင့်များကို ဝင်ရောက်ထားပါသည်\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"ဤစက်ပစ္စည်းပေါ်တွင် အခြားအသုံးပြုသူများလဲ ရှိသည်။\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"သီချင်း"</li>\n<li>"ဓာတ်ပုံများ"</li>\n<li>"အသုံးပြုသူ၏တခြားဒေတာ"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM များ"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"၎င်းက သင်၏ မိုဘိုင်းဝန်ဆောင်မှုအစီအစဉ်ကို ပယ်ဖျက်မည်မဟုတ်ပါ။"</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"သီချင်း၊ ပုံများနှင့် အသုံးပြုသူ၏တခြားဒေတာများကို ရှင်းလင်းရန်အတွက်"<b>"USBသိုလှောင်ကိရိယာ"</b>"အား ဖျက်ရန်လိုအပ်ပါသည်။"</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"သီချင်း၊ ပုံများနှင့် တခြားသောအသုံးပြုသူ၏ဒေတာများကို ရှင်းလင်းရန်အတွက်"<b>"SDကဒ်"</b>"အား ဖျက်ရန်လိုအပ်ပါသည်။"</string>
+    <string name="main_clear_title" msgid="277664302144837723">"ဒေတာအားလုံးဖျက်ခြင်း (စက်ရုံထုတ်ဆက်တင် သတ်မှတ်ရန်)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"ဒေတာအားလုံးဖျက်ခြင်း (စက်ရုံထုတ်ဆက်တင် သတ်မှတ်ရန်)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"ဤသို့ပြုလုပ်ခြင်းက သင့်တက်ဘလက်၏ "<b>"စက်အတွင်းသိုလှောင်ခန်း"</b>" အပါအဝင် အောက်ပါဒေတာအားလုံးကို ဖျက်ပါမည်-\n\n"<li>"သင်၏ Google အကောင့်"</li>\n<li>"စနစ်နှင့် အက်ပ်ဒေတာ၊ ဆက်တင်များ၊"</li>\n<li>"ဒေါင်းလုဒ်လုပ်ထားသည့်အက်ပ်များ"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"ဤသို့ပြုလုပ်ခြင်းက သင့်ဖုန်း၏ "<b>"စက်အတွင်းသိုလှောင်ခန်း"</b>" အပါအဝင် အောက်ပါဒေတာအားလုံးကို ဖျက်ပါမည်- \n\n"<li>"သင်၏ Google အကောင့်"</li>\n<li>"စနစ်နှင့် အက်ပ်ဒေတာ၊ ဆက်တင်များ၊"</li>\n<li>"ဒေါင်းလုဒ်လုပ်ထားသည့်အက်ပ်များ"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"သင်သည် လက်ရှိတွင် အောက်ပါအကောင့်များကို ဝင်ရောက်ထားပါသည်\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"ဤစက်ပစ္စည်းပေါ်တွင် အခြားအသုံးပြုသူများလည်း ရှိသည်။\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"သီချင်း"</li>\n<li>"ဓာတ်ပုံများ"</li>\n<li>"အသုံးပြုသူ၏အခြားဒေတာ"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM များ"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"၎င်းက သင်၏ မိုဘိုင်းဝန်ဆောင်မှုအစီအစဉ်ကို ပယ်ဖျက်မည်မဟုတ်ပါ။"</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"သီချင်း၊ ပုံများနှင့် အသုံးပြုသူ၏အခြားဒေတာများကို ရှင်းလင်းရန်အတွက်"<b>"USB သိုလှောင်ကိရိယာ"</b>"အား ဖျက်ရန်လိုအပ်ပါသည်။"</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"သီချင်း၊ ပုံများနှင့် အခြားာအသုံးပြုသူ၏ဒေတာများကို ရှင်းလင်းရန်အတွက်"<b>"SD ကဒ်"</b>"အား ဖျက်ရန်လိုအပ်ပါသည်။"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USBသိုလှောင်ကိရိယာအား ဖျက်ခြင်း"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SDကတ်အား ဖျက်ရန်"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"USBသိုလှောင်မှုထဲမှ သီချင်းနှင့် ဓါတ်ပုံကဲ့သို့ စက်တွင်းဒေတာအားလုံးအားဖျက်မည်"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"SDကဒ်ထဲရှိ သီချင်းသို့မဟုတ် ဓါတ်ပုံကဲ့သို့ ဒေတာအားလုံးအား ဖျက်ရန်"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"ဒေတာအားလုံး ဖျက်ရန်"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"ဒေတာအားလုံး ဖျက်ရန်"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"သင့်ကိုယ်ရေးကိုယ်တာ အချက်အလက်များနှင့် ဒေါင်းလုဒ်လုပ်ထားသော အက်ပ်အားလုံးကို ဖျက်ပါမည်။ ဤလုပ်ဆောင်ချက်ကို ပြန်ပြင်၍ မရပါ။"</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"ဒေါင်းလုဒ်လုပ်ထားသော အက်ပ်နှင့် ဆင်းမ်ကတ်များ အပါအဝင် သင်၏ ကိုယ်ရေးကိုယ်တာ အချက်အလက်အားလုံးကို ဖျက်ပါမည်။ ဤလုပ်ဆောင်ချက်ကို ပြန်ပြင်၍ မရပါ။"</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"အားလုံးကိုဖျက်ရန်"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"စနစ်အားရှင်းလင်းခြင်းဝန်ဆောင်မှုမရှိသောကြောင့် အစမှပြန်လည်စတင်နိုင်ခြင်းအားမပြုလုပ်နိုင်ပါ"</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"ဒေတာအားလုံးကို ဖျက်မလား။"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"ဤအသုံးပြုသူအတွက် စက်ရုံပြန်လည် သတ်မှတ်မှု မရပါ"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"ဖျက်နေသည်"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"ခဏစောင့်ပါ..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"ဒေတာအားလုံး ဖျက်ရန်"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"ဒေတာအားလုံး ဖျက်ရန်"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"သင့်ကိုယ်ရေးကိုယ်တာအချက်အလက်များနှင့် ဒေါင်းလုဒ်လုပ်ထားသော အက်ပ်အားလုံးကို ဖျက်ပါမည်။ ဤလုပ်ဆောင်ချက်ကို ပြန်ပြင်၍ မရပါ။"</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"ဒေါင်းလုဒ်လုပ်ထားသော အက်ပ်နှင့် ဆင်းမ်ကဒ်များ အပါအဝင် သင်၏ ကိုယ်ရေးကိုယ်တာ အချက်အလက်အားလုံးကို ဖျက်ပါမည်။ ဤလုပ်ဆောင်ချက်ကို ပြန်ပြင်၍ မရပါ။"</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"ဒေတာအားလုံးကို ဖျက်မလား။"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"ဤအသုံးပြုသူအတွက် စက်ရုံထုတ်အတိုင်း ပြန်လည်သတ်မှတ်မှု မရပါ"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"ဖျက်နေသည်"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"ခေတ္တစောင့်ပါ…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"ခေါ်ဆိုမှု ဆက်တင်များ"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"အသံဖြင့်စာတိုပို့ခြင်း၊ အဝင်ခေါ်ဆိုမှုအားထပ်ဆင့်ပို့ခြင်း၊ ခေါ်ဆိုမှုစောင့်ဆိုင်းခြင်း၊ ခေါ်ဆိုသူ၏အမှတ်သညာအား သတ်မှတ်ခြင်း"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB သုံး၍ချိတ်ဆက်ခြင်း"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> စက်လုံးထက် ပို၍တဆင့်ပြန်လည်ချိတ်ဆက်မရပါ"</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> သည် ချိတ်ဆက်မှု ပြတ်တောက်မည်"</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"အီသာနက် ချိတ်၍မျှဝေခြင်း"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"ဖုန်း၏ အင်တာနက်ကို USB အီသာနက်မှတစ်ဆင့် မျှဝေရန်"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"ဖုန်း၏ အင်တာနက်ကို အီသာနက်မှတစ်ဆင့် မျှဝေရန်"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"သင်၏ မိုဘိုင်းဒေတာ ချိတ်ဆက်မှုမှတစ်ဆင့် အခြားစက်များသို့ အင်တာနက် အသုံးပြုခွင့် ပေးလိုလျှင် ဟောစပေါ့နှင့် မိုဘိုင်းဖုန်းကို မိုဒမ်အဖြစ်အသုံးပြုခြင်းစနစ်ကို သုံးပါ။ အနီးတစ်ဝိုက်ရှိ စက်များနှင့် ပါဝင်သည့်အကြောင်းအရာများကို မျှဝေရန်အတွက်လည်း အက်ပ်များက ဟော့စပေါ့တစ်ခု ဖွင့်နိုင်ပါသည်။"</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"ဟော့စပေါ့နှင့် မိုဘိုင်းကို မိုဒမ်အဖြစ်သုံးပြီး သင်၏ Wi-Fi သို့မဟုတ် မိုဘိုင်းဒေတာ ချိတ်ဆက်မှုမှတစ်ဆင့် အခြားစက်ပစ္စည်းများသို့ အင်တာနက်လွှင့်ပေးပါ။ အနီးရှိစက်ပစ္စည်းများသို့ အကြောင်းအရာမျှဝေရန်အတွက် အက်ပ်များသည်လည်း ဟော့စပေါ့ပြုလုပ်နိုင်သည်။"</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"အကူအညီ"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"စာတန်း သတ်မှတ်ချက်များ"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"ပုံကြီးချဲ့ခြင်း"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"ပုံကြီးချဲ့ရန် နေရာ"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"ပုံကြီးချဲ့ခြင်းကို ဖွင့်ထားသည်"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"မျက်နှာပြင်ကိုချဲ့နေစဉ် သင်အသုံးပြုလိုသော ပုံကြီးချဲ့ရန်နေရာ(များ) ကို ရွေးပါ"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"ဖန်သားပြင်အပြည့်"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"ဖန်သားပြင် တစ်စိတ်တစ်ပိုင်း"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"ဖန်သားပြင်အပြည့်နှင့် မျက်နှာပြင် တစ်စိတ်တစ်ပိုင်း"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"ဖန်သားပြင် တစ်ခုလုံးကို ချဲ့ပါ"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"ဖန်သားပြင် တစ်စိတ်တစ်ပိုင်းကို ချဲ့ပါ"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"အများသုံးစွဲနိုင်မှု ခလုတ်သို့ ပြောင်းမလား။"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"ဖန်သားပြင်၏ တစ်စိတ်တစ်ပိုင်းကို ချဲ့ရန် သုံးချက်တို့ခြင်းသည် စာရိုက်ခြင်းနှင့် အခြားလုပ်ဆောင်ချက်များကို နှောင့်နှေးစေမည်။\n\n ချဲ့ရန် အများသုံးစွဲနိုင်မှု ခလုတ်ကို ပြောင်းသုံးမလား။"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"အများသုံးစွဲနိုင်မှု ခလုတ်သို့ ပြောင်းရန်"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"ချဲ့ရန်အတွက် သုံးချက်တို့ရန်"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"ပုံကြီးချဲ့ခြင်း ဆက်တင်များ"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"သုံးချက်တို့၍ အကြီးချဲ့ခြင်း"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"ဖြတ်လမ်းလင့်ခ်ဖြင့် ချဲ့ခြင်း"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"ဖွင့်ပိတ်ခလုတ်ဖြင့် ဖုန်းချရန်"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"မောက်စ်သင်္ကေတအကြီးစား"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"လှုပ်ရှားမှုများ ဖယ်ရှားရန်"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"မိုနိုအသံ"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"အသံဖွင့်နေစဉ် ချန်နယ်များကိုပေါင်းပါ"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"အသံ ချိန်ညှိခြင်း"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"ဘယ်"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"ညာ"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"မိုနိုအသံ"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"အသံဖွင့်နေစဉ် ချန်နယ်များကိုပေါင်းသည်"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"အသံ ချိန်ညှိခြင်း"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"ဘယ်"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"ညာ"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"မူရင်း"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"၁၀ စက္ကန့်"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"စက္ကန့် ၃၀"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"အကြောင်းကြားချက် တုန်ခါမှု"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"ဖုန်းမြည်သံ တုန်ခါမှု"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"ထိတွေ့ တုံ့ပြန်ချက်"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> သုံးရန်"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ကို ဖွင့်ရန်"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"အရောင်ပြင်ဆင်ခြင်းကို သုံးရန်"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"စာတန်းများကို ပြရန်"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"ပံ့ပိုးထားသည့် အက်ပ်အတွက်သာ"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> သုံးရန်"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ကို ဖွင့်ရန်"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"အရောင်ပြင်ဆင်ခြင်းကို သုံးရန်"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"စာတန်းများကို ပြရန်"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"ပံ့ပိုးထားသည့် အက်ပ်အတွက်သာ"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"စာတန်းအရွယ်/ပုံစံ"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> စာသား အရွယ်အစား"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"နောက်ထပ် ရွေးစရာများ"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"အစိမ်း မမြင်ရခြင်း"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"အနီ မမြင်ရခြင်း"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"အပြာ-အဝါ မမြင်ရခြင်း"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"အဖြူအမည်း"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"အနီ-အစိမ်း"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"အနီ-အစိမ်း"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"အပြာ-အဝါ"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"နောက်ခံအသုံးပြုမှု ကန့်သတ်ခြင်း"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"အက်ပ်ကို နောက်ခံတွင် ဖွင့်ခွင့်ပြုပါ"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"အက်ပ်ကို နောက်ခံတွင် ဖွင့်ခွင့်မပြုပါ"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"နောက်ခံအသုံးပြုမှုကို ကန့်သတ်၍မရပါ"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"နောက်ခံအသုံးပြုမှုကို ကန့်သတ်၍မရပါ"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"နောက်ခံလုပ်ဆောင်ချက်ကို ကန့်သတ်လိုပါသလား။"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"အက်ပ်အတွက် နောက်ခံလုပ်ဆောင်ချက်ကို ကန့်သတ်လိုက်ပါက ပုံမှန်အလုပ်လုပ်မည် မဟုတ်ပါ"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"ဤအက်ပ်ကို ဘက်ထရီချိန်ညှိသုံးရန် သတ်မှတ်မထားသဖြင့် ကန့်သတ်၍မရပါ။\n\nအက်ပ်ကိုကန့်သတ်ရန် ဘက်ထရီချိန်ညှိသုံးခြင်း အရင်ဖွင့်ပါ။"</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"အချိန်ဇယား သတ်မှတ်ပါ"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"ဘက်ထရီသက်တမ်းကို တိုးပေးသည်"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"အားသွင်းနေသည့်အခါ ပိတ်ရန်"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"သင်၏ဖုန်း <xliff:g id="PERCENT">%1$s</xliff:g> ဖြစ်သည့်အခါ \'ဘက်ထရီ အားထိန်း\' ကိုပိတ်ပါမည်"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"သင်၏တက်ဘလက် <xliff:g id="PERCENT">%1$s</xliff:g> ဖြစ်နေသည့်အခါ \'ဘက်ထရီ အားထိန်း\' ကိုပိတ်ပါမည်"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"သင့်စက်ပစ္စည်း <xliff:g id="PERCENT">%1$s</xliff:g> ဖြစ်နေသည့်အခါ \'ဘက်ထရီ အားထိန်း\' ကိုပိတ်ပါမည်"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"သင့်ဖုန်းကို <xliff:g id="PERCENT">%1$s</xliff:g> အထက်အားသွင်းပြီးသည့်အခါ \'ဘက်ထရီ အားထိန်း\' ပိတ်သွားမည်"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"သင့်တက်ဘလက်ကို <xliff:g id="PERCENT">%1$s</xliff:g> အထက်အားသွင်းပြီးသည့်အခါ \'ဘက်ထရီ အားထိန်း\' ပိတ်သွားမည်"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"သင့်စက်ကို <xliff:g id="PERCENT">%1$s</xliff:g> အထက်အားသွင်းပြီးသည့်အခါ \'ဘက်ထရီ အားထိန်း\' ပိတ်သွားမည်"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"ဖွင့်ရန်"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"ပြန်သတ်မှတ်ရန်"</string>
     <string name="tts_play" msgid="2945513377250757221">"ဖွင့်ရန်"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"အလိုက်သင့် ချိတ်ဆက်နိုင်မှု"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"သင်၏ ကွန်ရက်ချိတ်ဆက်မှုကို အလိုအလျောက် စီမံခန့်ခွဲခြင်းဖြင့် ဘက်ထရီ သက်တမ်းကို ရှည်စေပြီး စက်၏စွမ်းဆောင်ရည်ကို ပိုမိုကောင်းမွန်စေသည်"</string>
     <string name="credentials_title" msgid="7535942196886123656">"ယုံကြည်စိတ်ချရသောသိုလှောင်နေရာ"</string>
     <string name="credentials_install" msgid="3933218407598415827">"လက်မှတ် ထည့်သွင်းရန်"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"သိုလှောင်နေရာမှ အသိအမှတ်ပြုလက်မှတ်များကို ထည့်သွင်းရန်"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"အသုံးပြုသူ၏ အထောက်အထားများ"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"သိမ်းဆည်းထားသည့် အထောက်အထားများကို ကြည့်ပြီး မွမ်းမံရန်"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"အဆင့်မြင့်"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"သိုလှောင်ခန်း အမျိုးအစား"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"ဟာ့ဒ်ဝဲနှင့် ချိတ်ဆက်ထားသော"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"ဆော့ဖ်ဝဲသပ်သပ်"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"ဒီအသုံးပြုသူ အတွက် စိတ်ချရ အချက်များ မရှိ"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN နှင့် အက်ပ်များအတွက် ထည့်သွင်းထားပါသည်"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi အတွက် ထည့်သွင်းထားပါသည်"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"ငွေချေစက်တွင် ငွေပေးချေခြင်း"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"ငွေပေးချေရေး အက်ပ်ကို သတ်မှတ်ပါ။ ၎င်းနောက် သင့်ဖုန်း၏ ကျောဘက်ကို ချိတ်ဆက်ရန် မလိုသင်္ကေတပါ ငွေချေစက် တစ်ခုဆီသို့ ကပ်လိုက်ပါ။"</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"ရပါပြီ"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"နောက်ထပ်..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"နောက်ထပ်…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"မူရင်း ပေးချေမှုအက်ပ် သတ်မှတ်ရန်"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"မူရင်း ပေးချေမှုအက်ပ် အပ်ဒိတ်လုပ်ရန်"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"ချိတ်ဆက်မှုမဲ့ ပေးချေရန်နေရာတွင် <xliff:g id="APP">%1$s</xliff:g> ဖြင့် ပေးပါ"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"ခေါ်ဆိုမှုများ အတွက် အမြဲတမ်း ဒါကို သုံးရန်"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"ဒေတာ အတွက် SIM ကို ရွေးရန်"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"SMS စာတိုစနစ်အတွက် ဆင်းမ်ကတ် ရွေးပါ"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"ဒေတာ SIM သို့ပြောင်းနေသည်၊ ၎င်းသည် တစ်မိနစ်ခန့်ကြာနိုင်သည်..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"ဒေတာ SIM ပြောင်းနေသည်၊ ၎င်းသည် တစ်မိနစ်ခန့်ကြာနိုင်သည်…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"ဖြင့် ခေါ်ဆိုရန်"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"ဆင်းမ် ကဒ်ကို ရွေးရန်"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"ဆင်းမ် <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"ပုံမှန်အစီအစဉ်၊ အချိန်ဇယား၊ ဘက်ထရီအားထိန်း၊ ပါဝါချွေတာစနစ်၊ ဘက်ထရီ၊ အလိုအလျောက်၊ ရာခိုင်နှုန်း"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte၊ အဆင့်မြင့် ခေါ်ဆိုခြင်း၊ 4g ခေါ်ဆိုခြင်း"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"ဘာသာစကားထည့်ရန်၊ ဘာသာစကားတစ်ခုကို ထည့်ပါ"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"စာလုံးအရွယ်အစား"</string>
     <string name="default_sound" msgid="6604374495015245195">"ပုံသေ အသံ"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"မြည်သံနှင့် အကြောင်းကြားချက် အသံ <xliff:g id="PERCENTAGE">%1$s</xliff:g> ရှိသည်"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"အသံအတိုးအကျယ်၊ တုန်ခါမှု၊ မနှောင့်ယှက်ရ"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"အသံများ ဖွင့်ထားပါ"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"တိုက်ရိုက်စာတန်းထိုး"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"အလိုအလျောက် စာတန်းထိုးရန်"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"မရှိ"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other">အချိန်ဇယား <xliff:g id="ON_COUNT">%d</xliff:g> ခု သတ်မှတ်ထားသည်</item>
-      <item quantity="one">အချိန်ဇယား ၁ ခု သတ်မှတ်ထားသည်</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{မရှိ}=1{အချိန်ဇယား ၁ ခု သတ်မှတ်ထားသည်}other{အချိန်ဇယား # ခု သတ်မှတ်ထားသည်}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"မနှောင့်ယှက်ရ"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"အရေးကြီးပုဂ္ဂိုလ်များနှင့် အက်ပ်များထံမှသာ အကြောင်းကြားချက် ရယူပါ"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"အနှောင့်အယှက်များကို တားဆီးသည်"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"ဦးစားပေးများသာ"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>။ <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"ဖွင့်ရန် / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"ပိတ်ရန် / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"ပိတ်ရန်"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"ဖွင့်ရန်"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"အမြဲမေးပါ"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"သင်ပိတ်လိုက်သည် အထိ"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> နာရီ</item>
-      <item quantity="one">၁ နာရီ</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> မိနစ်"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other">အချိန်ဇယား <xliff:g id="ON_COUNT">%d</xliff:g> ခုကို အလိုအလျောက် ဖွင့်နိုင်သည်</item>
-      <item quantity="one">အချိန်ဇယား ၁ ခုကို အလိုအလျောက် ဖွင့်နိုင်သည်</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{၁ နာရီ}other{# နာရီ}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{၁ မိနစ်}other{# မိနစ်}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{ပိတ်ရန်}=1{ပိတ်ရန် / အချိန်ဇယား ၁ ခုကို အလိုအလျောက် ဖွင့်နိုင်သည်}other{ပိတ်ရန် / အချိန်ဇယား # ခုကို အလိုအလျောက် ဖွင့်နိုင်သည်}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"\'မနှောင့်ယှက်ရ\' ကို ကြားဖြတ်နိုင်သည့်အရာ"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"လူများ"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"အက်ပ်များ"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"ဦးစားပေးမဟုတ်သော အကြောင်းကြားချက်များကို \'မသိမသာပြသမှု\'အဖြစ် အလိုအလျောက် သတ်မှတ်ပါ"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"အလိုက်အထိုက် အဆင့်သတ်မှတ်မှု အကြောင်းကြားချက်"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"သက်ဆိုင်ရာအလိုက် အလိုလို သတ်မှတ်ထားသော အဆင့်သတ်မှတ်မှု အကြောင်းကြားချက်"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"အလိုက်သင့် အကြောင်းကြားချက်ဆိုင်ရာ အကြံပြုချက်"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"အကြောင်းကြားချက်များအပေါ်တွင် ပြုလုပ်ထားသော ပြင်ဆင်ချက်များကို ညွှန်ပြပြီး စနစ်သို့ အကြံပြုချက်ပေးသည့် ရွေးစရာကို ပြသသည်"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"အကြံပြုထားသော လုပ်ဆောင်ချက်နှင့် ပြန်ကြားချက်များ"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"အကြံပြုထားသော လုပ်ဆောင်ချက်များနှင့် ပြန်ကြားချက်များကို အလိုအလျောက်ပြသပါ"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"လတ်တလောနှင့် မှေးထားသည့် အကြောင်းကြားချက်များကို ပြရန်"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"\"မနှောင့်ယှက်ရ\" ကိုအသုံးပြုခြင်း"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"\'မနှောင့်ယှက်ရ\' ကိုခွင့်ပြုရန်"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"မနှောက်ယှက်ရန် အသုံးပြုခြင်းအတွက် မည်သည့်ထည့်သွင်းထားသည့် အပ်ဖ်မှ တောင်းဆိုမှုမရှိပါ"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"အက်ပ်များကို တင်နေ..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"အက်ပ်များကို ဖွင့်နေသည်…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"သင့်တောင်းဆိုချက်အရ Android သည် ဤအက်ပ်၏ အကြောင်းကြားချက်များ ဤစက်ပစ္စည်းပေါ်တွင် ပေါ်မလာအောင် ပိတ်ထားပါသည်"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"သင့်တောင်းဆိုချက်အရ Android သည် ဤအကြောင်းကြားချက်အမျိုးအစားများ ဤစက်ပစ္စည်းပေါ်တွင် ပေါ်မလာအောင် ပိတ်ထားပါသည်"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"သင့်တောင်းဆိုချက်အရ Android သည် ဤအကြောင်းကြားချက်အုပ်စုများ ဤစက်ပစ္စည်းပေါ်တွင် ပေါ်မလာအောင် ပိတ်ထားပါသည်"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"စကားဝိုင်းအားလုံး"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"ဦးစားပေး စကားဝိုင်းများ"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"မရှိ"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other">စကားဝိုင်း <xliff:g id="CONVERSATIONS">%d</xliff:g> ခု</item>
-      <item quantity="one">စကားဝိုင်း ၁ ခု</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"မရှိ"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{မရှိ}=1{စကားဝိုင်း ၁ ခု}other{စကားဝိုင်း # ခု}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"ကြားဖြတ်နိုင်သူ"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"ခေါ်ဆိုမှုများ"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"ခေါ်ဆိုမှုများ"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"ခွင့်ပြုထားသော ဖုန်းများ အသံထွက်ရန် စက်ကို အသံမြည်စေရန် သတ်မှတ်ထားခြင်း ရှိမရှိ စစ်ဆေးပါ"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ အတွက် အဝင်ခေါ်ဆိုမှုများကို ပိတ်ထားသည်။ သင့်မိတ်ဆွေ၊ မိသားစု သို့မဟုတ် အခြားအဆက်အသွယ်များအား သင့်ကို ဆက်သွယ်ခွင့်ပြုရန်အတွက် ဆက်တင်များကို သင်ချိန်ညှိနိုင်သည်။"</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"ကြယ်ပွင့်ပြ အဆက်အသွယ်များ"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other">အခြား <xliff:g id="NUM_PEOPLE">%d</xliff:g> ယောက်</item>
-      <item quantity="one">အခြား ၁ ယောက်</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"မရှိ"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{မရှိ}=1{{contact_1}}=2{{contact_1} နှင့် {contact_2}}=3{{contact_1}၊ {contact_2} နှင့် {contact_3}}other{{contact_1}၊ {contact_2} နှင့် အခြား # ခု}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"မက်ဆေ့ဂျ်များ"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"မက်ဆေ့ဂျ်များ"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"မက်ဆေ့ဂျ်များ"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ အတွက် အဝင်မက်ဆေ့ဂျ်များကို ပိတ်ထားသည်။ သင့်မိတ်ဆွေ၊ မိသားစု သို့မဟုတ် အခြားအဆက်အသွယ်များက သင့်အား ဆက်သွယ်နိုင်ရန် ဆက်တင်များကို ချိန်ညှိနိုင်သည်။"</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"လူတိုင်းက မက်ဆေ့ဂျ်ပို့နိုင်သည်"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"လူတိုင်းက ခေါ်ဆိုနိုင်သည်"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"မရှိ"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other">အဆက်အသွယ် <xliff:g id="NUM_CONTACTS">%d</xliff:g> ဦး</item>
-      <item quantity="one">အဆက်အသွယ် 1 ဦး</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{မရှိ}=1{အဆက်အသွယ် ၁ ဦး}other{အဆက်အသွယ် # ခု}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"မည်သူမဆို"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"အဆက်အသွယ်များ"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"ကြယ်ပွင့်ပြထားသော အဆက်အသွယ်များ"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"အကြောင်းကြားချက် အားလုံး"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"အချို့ အကြောင်းကြားချက်များ"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"အက်ပ်များကို ကြားဖြတ်ခွင့် မပြုသော်လည်း ရွေးထားသူများက သင့်ကိုဆက်သွယ်နိုင်ပါသေးသည်"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> က ကြားဖြတ်နိုင်သည်</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> က ကြားဖြတ်နိုင်သည်</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"နောက်ထပ် <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{မည်သည့်အက်ပ်မျှ ကြားမဖြတ်နိုင်ပါ}=1{{app_1} က ကြားဖြတ်နိုင်သည်}=2{{app_1} နှင့် {app_2} က ကြားဖြတ်နိုင်သည်}=3{{app_1}၊ {app_2} နှင့် {app_3} က ကြားဖြတ်နိုင်သည်}other{{app_1}၊ {app_2} နှင့် အခြားအက်ပ် # ခုက ကြားဖြတ်နိုင်သည်}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"အက်ပ်များ"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"အကြောင်းကြားချက် အားလုံး"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"အချို့ အကြောင်းကြားချက်များ"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"ကြားဖြတ်နိုင်သည့် အကြောင်းကြားချက်များ"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"အကြောင်းကြားချက်များအားလုံးကို ခွင့်ပြုခြင်း"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> က ကြားဖြတ်နိုင်သည်</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> က ကြားဖြတ်နိုင်သည်</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"မည်သည့်အရာကမျှ ကြားဖြတ်နိုင်ခြင်းမရှိပါ"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"နောက်ထပ် <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{မည်သည့်အရာကမျှ ကြားဖြတ်နိုင်ခြင်းမရှိပါ}=1{{sound_category_1} က ကြားဖြတ်နိုင်သည်}=2{{sound_category_1} နှင့် {sound_category_2} က ကြားဖြတ်နိုင်သည်}=3{{sound_category_1}၊ {sound_category_2} နှင့်{sound_category_3} က ကြားဖြတ်နိုင်သည်}other{{sound_category_1}၊ {sound_category_2} နှင့် အခြားအက်ပ် # ခုက ကြားဖြတ်နိုင်သည်}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"မည်သည့်အရာကမျှ ကြားဖြတ်နိုင်ခြင်းမရှိပါ"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"မည်သူမျှ ကြားဖြတ်နိုင်ခြင်းမရှိပါ"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"အချို့သူများ ကြားဖြတ်နိုင်သည်"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"လူတိုင်းက ကြားဖြတ်နိုင်သည်"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB ကို ထိန်းချုပ်သည့်စက်"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"ချိတ်ဆက်ထားသော စက်ပစ္စည်း"</string>
     <string name="usb_control_device" msgid="527916783743021577">"ဤစက်ပစ္စည်း"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"ပြောင်းနေသည်..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"ပြောင်းနေသည်…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"ပြောင်း၍မရပါ"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"ဤစက်ပစ္စည်းကို အားသွင်းနေသည်"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"ချိတ်ဆက်ထားသည့် စက်ကို အားသွင်းခြင်း"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"အသေးစိတ် ကြည့်ရန်"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"ဒေတာချွေတာမှု"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"ကန့်သတ်မဲ့ ဒေတာ"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"နောက်ခံဒေတာကို ပိတ်ထားသည်"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"နောက်ခံဒေတာကို ပိတ်ထားသည်"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"ဖွင့်ပါ"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"ပိတ်ထားသည်"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"\'ဒေတာ ချွေတာမှုစနစ်\' ကို သုံးရန်"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"စက်ပစ္စည်းကိုလော့ခ်ချထားလျှင်၊ သတိပေးချက်များတွင် ပြန်စာရေးခြင်း သို့မဟုတ် အခြားစာရေးခြင်းများ မပြုလုပ်နိုင်ရန် ကာကွယ်ထားပါသည်။"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"မူရင်းစာလုံးပေါင်းသတ်ပုံစစ်စနစ်"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"သတ်ပုံစစ်စနစ် ရွေးချယ်ပါ"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"စာလုံးပေါင်းသတ်ပုံစစ်စနစ် အသုံးပြုပါ"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"စာလုံးပေါင်းသတ်ပုံစစ်စနစ် အသုံးပြုပါ"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"မရွေးထားပါ"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(တစ်ခုမျှမဟုတ်ပါ)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">"− "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"သိုလှောင်ခန်း နေရာလွတ်များ ရှိလာစေရန် သိုလှောင်ခန်းမန်နေဂျာသည် သင့်စက်ပစ္စည်းပေါ်ရှိ မိတ္တူကူးယူထားသည့် ဓာတ်ပုံနှင့် ဗီဒီယိုများကို ဖယ်ရှားလိုက်ပါမည်။"</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"ဓာတ်ပုံနှင့် ဗီဒီယိုများကို ဖယ်ရှားပါ"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"သိုလှောင်ခန်းမန်နေဂျာ"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"သိုလှောင်ခန်း စီမံခန့်ခွဲမှုစနစ်ကို သုံးရန်"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"သိုလှောင်ခန်း စီမံခန့်ခွဲမှုစနစ်ကို သုံးရန်"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"အလိုအလျောက်"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"ကိုယ်တိုင်ထည့်သွင်းခြင်း"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"ယခုနေရာလွတ်ပြုလုပ်ပါ"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"ဖုန်းကိုစစ်ရန် နှစ်ချက်တို့ခြင်း"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"တက်ဘလက်ကို စစ်ဆေးကြည့်ရန် နှစ်ချက်တို့ပါ"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"စက်ပစ္စည်းကို စစ်ဆေးကြည့်ရန် နှစ်ချက်တို့ပါ"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"အကြောင်းကြားချက်များကိုဖွင့်ရန် ပွတ်ဆွဲပါ"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"သင့်အကြောင်းကြားချက်များကို ပြသရန် ဖန်သားပြင်၏အောက်ခြေအစွန်း၌ ပွတ်ဆွဲချပါ။"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"လက်တစ်ဖက်သုံးမုဒ်"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"လက်တစ်ဖက်သုံးမုဒ် သုံးရန်"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"အက်ပ်များ ပြောင်းသည့်အခါ ထွက်ရန်"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"အချိန်ကုန်ပါပြီ"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"၄ စက္ကန့်"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"၈ စက္ကန့်"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"၁၂ စက္ကန့်"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"လက်လှမ်းတမီရှိမှု"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"အချိန်၊ အကြောင်းကြားချက်များနှင့် အခြားအချက်အလက်များကို စစ်ရန် သင့်ဖန်သားပြင်ကို နှစ်ချက်တို့ပါ။"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"ဖုန်းစစ်ရန် ကောက်ယူခြင်း"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"တက်ဘလက်ကို စစ်ဆေးကြည့်ရန် မ လိုက်ပါ"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"တက်ဘလက်ကို စစ်ဆေးရန် တို့ပါ"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"စက်ပစ္စည်းကို စစ်ဆေးရန် တို့ပါ"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"အချိန်၊ အကြောင်းကြားချက်များနှင့် အခြားအချက်အလက်များကို စစ်ဆေးရန် သင့်ဖန်သားပြင်ကို တို့ပါ။"</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"ကြောက်လန့်လျှင်နှိပ်ရန် ခလုတ်"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"\'ဖွင့်ပိတ်ခလုတ်\' ကို ၅ ကြိမ် အမြန်နှိပ်ခြင်းဖြင့် အရေးပေါ် SOS လုပ်ဆောင်ချက်များကို စတင်ပါ။"</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"သတိပေးသံ"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"လုပ်ဆောင်ချက်များ မစတင်မီ သတိပေးသည်"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"အရေးပေါ်အခြေအနေတွင် ဆက်သွယ်ရမည့်သူများ"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"သတိပေးချက်အတွက် လက်ဗွေပွတ်ဆွဲပါ"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"လက်ဗွေပွတ်ဆွဲခြင်း"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"အကြောင်းကြားချက်များကို ကြည့်ရန် ဖုန်း၏ နောက်ကျောဘက်ရှိ လက်ဗွေ အာရုံခံကိရိယာပေါ်တွင် အောက်သို့ ပွတ်ဆွဲပါ။"</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"အက်ပ်အားလုံးအတွက် ဖွင့်ပါ"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"ဂရပ်ဖစ်ဒရိုင်ဗာ ရွေးချယ်ပါ"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"မူလ"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"ဂိမ်းဒရိုင်ဗာ"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"ဂိမ်းဒရိုင်ဗာ"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"ဆော့ဖ်ဝဲရေးသူ ဒရိုင်ဗာ"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"စနစ် ဂရပ်ဖစ်ဒရိုင်ဗာ"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"ကွန်ရက် ရှာမတွေ့ပါ။ ထပ်စမ်းကြည့်ပါ။"</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(တားမြစ်ထားသည်)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"ဆင်းမ်ကတ် မရှိပါ"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"ဆင်းကဒ်မရှိပါ"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"မရှိ"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"ချိတ်ဆက်ရန် SIM ကတ်လိုအပ်သည်"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"ချိတ်ဆက်ရန် <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> SIM ကတ် လိုအပ်သည်"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"အသုံးပြုလိုသော ကွန်ရက်မုဒ်- WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"အသုံးပြုလိုသော ကွန်ရက်မုဒ်- GSM သီးသန့်"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"အသုံးပြုလိုသော ကွန်ရက်မုဒ်- WCDMA သာ"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"မိုဘိုင်းဒေတာ"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"မိုဘိုင်းကွန်ရက်သုံးပြီး ဒေတာကို ဝင်သုံးခွင့်ပေးပါ"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"ဖုန်းသည် ရနိုင်သည့်အကွာအဝေးအတွင်း ရောက်သည့်အခါ ဤဝန်ဆောင်မှုပေးသူသို့ အလိုအလျောက် ပြောင်းသွားပါမည်"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"ဆင်းမ်ကတ် မရနိုင်ပါ"</string>
     <string name="calls_preference" msgid="2166481296066890129">"ခေါ်ဆိုမှု သတ်မှတ်ချက်"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS သတ်မှတ်ချက်"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"အမြဲမေးပါ"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"\'ဆက်တင်များ\' ပေါ် ဖန်သားပြင်ထပ်ဆင့်ပြခွင့်ပြုခြင်း"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"အခြားအက်ပ်များအပေါ်တွင် ပြသနိုင်သည့် အက်ပ်များအား \'ဆက်တင်များ\' မျက်နှာပြင်ကို ထပ်ဆင့်ပြခွင့်ပြုပါ"</string>
     <string name="media_controls_title" msgid="403271085636252597">"မီဒီယာ"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"မီဒီယာစက်ရှင် ပြီးဆုံးသွားလျှင် ပလေယာကိုဖျောက်မည်"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"ချဲ့ထားသော အမြန် ဆက်တင်များအကန့်မှ စက်ရှင်တစ်ခုကို ပလေယာက ဆက်လုပ်ခွင့်ပြုသည်။"</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"\'အမြန် ဆက်တင်များ\' ရှိ မီဒီယာ ပလေယာ"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"အလွယ်တကူပြန်ဖွင့်ရန်အတွက် မီဒီယာ ပလေယာကို အချိန်ကြာမြင့်စွာပြရန်"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"ပလေယာကို ဖျောက်ထားမည်"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"ပလေယာကို ပြရန်"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"မည်သည့်ပလေယာကိုမျှ မရရှိနိုင်ပါ"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"ခွင့်ပြု အက်ပ်များ"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"မီဒီယာ"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"ဘလူးတုသ် ပွင့်ပါမည်"</string>
 </resources>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index 951578c..52a8ef5 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Middels"</item>
     <item msgid="6740026006576843477">"Lang"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Kort"</item>
+    <item msgid="7397961711906421599">"Middels"</item>
+    <item msgid="4079132024502041928">"Lang"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Standard"</item>
     <item msgid="4234707448428002595">"Sans Serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Globalt"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Bare TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Globalt"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 71cd8cc..2c53144 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Vis profilinformasjon på låseskjermen"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Kontoer"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Posisjon"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Bruk posisjon"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Bruk posisjon"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Av"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">På – <xliff:g id="COUNT_1">%1$d</xliff:g> apper har tilgang til posisjon</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Bruk ansiktet ditt til å godkjenne"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Start"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Hvis ansiktslås med tilgjengelighet er slått av, fungerer muligens ikke enkelte konfigureringstrinn som de skal, med TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Gå tilbake"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Fortsett konfig."</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Bruk tilgjengelighetsoppsett"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="one">Må inneholde færre enn <xliff:g id="NUMBER_0">%d</xliff:g> siffer</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Enhetsadministratoren forbyr nylig brukt PIN-kode"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Vanlige PIN-koder er blokkert av IT-administratoren din. Prøv en annen PIN-kode."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Dette kan ikke inkludere et ugyldig tegn"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Må inneholde minst én bokstav"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Må inneholde minst ett siffer"</string>
@@ -653,7 +655,6 @@
       <item quantity="one">Må inneholde minst 1 tegn som ikke er et tall</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Enhetsadministratoren forbyr nylig brukte passord"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Vanlige passord er blokkert av IT-administratoren din. Prøv et annet passord."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"En sekvens av stigende, synkende eller like sifre er ikke tillatt"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Bekreft"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Avbryt"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Slå på Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Bruk Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Bruk Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Innstillinger for Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Sett opp og styr trådløse aksesspunkt"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Sentrér QR-koden nedenfor for å koble til «<xliff:g id="SSID">%1$s</xliff:g>»"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Koble til Wi‑Fi ved å skanne en QR-kode"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Del Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Skann denne QR-koden for å koble til «<xliff:g id="SSID">%1$s</xliff:g>» og dele passordet"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Skann denne QR-koden med en annen enhet for å koble til «<xliff:g id="SSID">%1$s</xliff:g>»"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Skann denne QR-koden for å koble til «<xliff:g id="SSID">%1$s</xliff:g>»"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Prøv igjen. Hvis problemet vedvarer, kan du kontakte enhetsprodusenten."</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Noe gikk galt"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi-Fi-passord: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Passord for Wi-Fi-sone: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Automatisk tilkobling"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Tillat at telefonen kobler seg til automatisk i nærheten av dette nettverket"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Tillat at nettbrettet kobler seg til automatisk i nærheten av dette nettverket"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Tillat tilkobling til dette nettverket når det er innen rekkevidde"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Legg til en enhet"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Bruk en QR-kode for å legge til en enhet på dette nettverket"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR-kode er ikke et gyldig format"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Bruk systemsertifikat"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Ikke oppgi"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Ikke godkjenn"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Ingen sertifikater er spesifisert. Tilkoblingen din blir ikke privat."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Nettverksnavnet er for langt."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Du må angi et domene."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Sertifikat er påkrevd."</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Koble til"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi er slått på"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Koblet til <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Kobler til <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Kobler til …"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Kan ikke koble til nettverket"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Nettverket er ikke innen rekkevidde"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Appen deler innhold. For å dele Internett-tilkoblingen, slå Wi-Fi-sonen av og deretter på"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Ingen passord er angitt"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Navn på Wi-Fi-sone"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Slår på <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> …"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Slår på <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> …"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Andre enheter kan koble til <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Passord for Wi-Fi-sone"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP-bånd"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Øker oppdateringsfrekvensen automatisk fra 60 til 90 Hz for noe innhold. Øker batteribruken."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Tving oppdateringsfrekvens på 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Den høyeste oppdateringsfrekvensen for å oppnå bedre trykkfølsomhet og animasjonskvalitet. Øker batteribruken."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Skjermoppmerksomhet"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"På / skjermen slås ikke av hvis du ser på den"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android-versjon"</string>
     <string name="security_patch" msgid="4071756145347865382">"Sikkerhetsoppdatering for Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Modell"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Modell: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Modell og maskinvare"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Maskinvareversjon"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Utstyrs-ID"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Nettverksinnstillingene er tilbakestilt"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Kan ikke slette SIM-kort"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Nedlastede SIM-kort kan ikke slettes på grunn av en feil.\n\nStart enheten din å nytt og prøv igjen."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Slett alle data (tilbakestill til fabrikkstandard)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Slett alle data (tilbakestill)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Dette sletter alle data fra nettbrettets "<b>"interne lagringsplass"</b>", inkludert følgende:\n\n"<li>"Google-kontoen din"</li>\n<li>"Data og innstillinger for system og apper"</li>\n<li>"Nedlastede apper"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Dette sletter alle data fra telefonens "<b>"interne lagringsplass"</b>", inkludert følgende:\n\n"<li>"Google-kontoen din"</li>\n<li>"Data og innstillinger for system og apper"</li>\n<li>"Nedlastede apper"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Du er for øyeblikket pålogget følgende kontoer:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Det er andre brukere tilstede på denne enheten.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Musikk"</li>\n<li>"Bilder"</li>\n<li>"Andre brukerdata"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"e-SIM-kort"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Dette kansellerer ikke mobilabonnementet ditt."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"For å slette musikk, bilder og andre brukerdata må "<b>"USB-lageret"</b>" tømmes."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"For å slette musikk, bilder og andre brukerdata, må "<b>"SD-kortet"</b>" tømmes."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Slett alle data (tilbakestill til fabrikkstandard)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Slett alle data (tilbakestill)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Dette sletter alle data fra nettbrettets "<b>"internminne"</b>", inkludert\n\n"<li>"Google-kontoen din"</li>\n<li>"data og innstillinger for system og apper"</li>\n<li>"nedlastede apper"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Dette sletter alle data fra telefonens "<b>"internminne"</b>", inkludert\n\n"<li>"Google-kontoen din"</li>\n<li>"data og innstillinger for system og apper"</li>\n<li>"nedlastede apper"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Du er for øyeblikket pålogget følgende kontoer:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Det er andre brukere til stede på denne enheten.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"musikk"</li>\n<li>"bilder"</li>\n<li>"andre brukerdata"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"e-SIM-kort"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Dette sier ikke opp mobilabonnementet ditt."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"For å slette musikk, bilder og andre brukerdata må "<b>"USB-lagringen"</b>" tømmes."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"For å slette musikk, bilder og andre brukerdata må "<b>"SD-kortet"</b>" tømmes."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Slett USB-lagring"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Tøm SD-kort"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Slett alle data på intern USB-lagring, som for eksempel musikk eller bilder"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Slett alle data fra SD-kortet, som musikk og bilder"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Slett alle data"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Slett alle data"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Alle personopplysningene dine og appene du har lastet ned, blir slettet. Denne handlingen kan ikke angres."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Alle personopplysningene dine, inkludert nedlastede apper og SIM-kort, blir slettet. Denne handlingen kan ikke angres."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Slett alt"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Tilbakestilling ble ikke utført fordi tilbakestillingstjenesten ikke er tilgjengelig."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Vil du slette alle dataene?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Tilbakestilling til fabrikkstandard er ikke tilgjengelig for denne brukeren"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Sletter"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Vent litt …"</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Slett alle data"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Slett alle data"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Alle personopplysningene dine og appene du har lastet ned, blir slettet. Denne handlingen kan ikke angres."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Alle personopplysningene dine, inkludert nedlastede apper og SIM-kort, blir slettet. Denne handlingen kan ikke angres."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Vil du slette alle dataene?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Tilbakestilling til fabrikkstandard er ikke tilgjengelig for denne brukeren"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Tømmer"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Vent litt"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Samtaleinnstillinger"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Telefonsvarer, viderekobling, samtale venter, nummervisning"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB-internettdeling"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Kan ikke knytte til mer enn <xliff:g id="MAXCONNECTION">%1$d</xliff:g> enheter."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kobles fra."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ethernet-internettdeling"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Del telefonens internettilkobling via USB-Ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Del telefonens internettilkobling via Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Bruk Wi-Fi-sone og internettdeling for å gi andre enheter tilgang til internett via mobildataforbindelsen din. Apper kan også opprette en Wi-Fi-sone for å dele innhold med enheter i nærheten."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Bruk Wi-Fi-soner og internettdeling for å gi andre enheter internettilgang via Wi-Fi- eller mobildatatilkoblingen din. Du kan også bruke apper til å opprette Wi-Fi-soner for å dele innhold med enheter i nærheten."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Hjelp"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Valg for teksting"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Forstørring"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Forstørrelsesområde"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Slå på forstørrelse"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Velg forstørrelsesområdene du vil bruke når du forstørrer skjermen"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Fullskjerm"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"En del av skjermen"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Fullskjerm og en del av skjermen"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Forstørr hele skjermen"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Forstørr en del av skjermen"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Vil du bytte til en Tilgjengelighet-knapp?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Hvis du bruker trippeltrykk for å forstørre en del av skjermen, blir skriving og andre handlinger forsinket.\n\nVil du bytte til å bruke en Tilgjengelighet-knapp til å forstørre?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Bytt til en Tilgjengelighet-knapp"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Behold trippeltrykk for å forstørre"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Forstørrelsesinnstillinger"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Forstørr med trippeltrykk"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Forstørr med snarvei"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Legg på med av/på-knappen"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Stor musepeker"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Fjern animasjoner"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Monolyd"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Kombiner kanaler når du spiller av lyd"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Lydbalanse"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Venstre"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Høyre"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Monolyd"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Kombiner kanaler når du spiller av lyd"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Lydbalanse"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Venstre"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Høyre"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Standard"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 sekunder"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 sekunder"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Varselvibrering"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Ringevibrering"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Tilbakemelding ved berøring"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Bruk <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Åpne <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Bruk fargekorrigering"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Vis teksting"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Bare for apper som støttes"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Bruk <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Åpne <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Bruk fargekorrigering"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Vis teksting"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Bare for apper som støttes"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Størrelse og stil for teksting"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Tekststørrelse <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Flere alternativer"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomali"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomali"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomali"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Gråtoner"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Rød-grønn"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Rød-grønn"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Blå-gul"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Bakgrunnsbegrensning"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"La appen kjøre i bakgrunnen"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Appen har ikke tillatelse til å kjøre i bakgrunnen"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Bruk i bakgrunnen kan ikke begrenses"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Bruk i bakgrunnen kan ikke begrenses"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Vil du begrense bakgrunnsaktivitet?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Hvis du begrenser bakgrunnsaktivitet for en app, kan det oppstå problemer"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Du kan ikke begrense appen siden den ikke er satt til å optimalisere batteriet.\n\nFor å begrense appen, slå på batterioptimalisering."</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Angi en tidsplan"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Forleng batteriets levetid"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Slå av når den er ladet"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Batterisparing slås av når telefonen har <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Batterisparing slås av når nettbrettet har <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Batterisparing slås av når enheten har <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Batterisparing slås av når telefonen lades til over <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Batterisparing slås av når nettbrettet lades til over <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Batterisparing slås av når enheten lades til over <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Slå på"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Tilbakestill"</string>
     <string name="tts_play" msgid="2945513377250757221">"Spill av"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Selvjusterende tilkobling"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Forlenger batterilevetiden og enhetsytelsen ved å administrere nettverkstilkoblingene automatisk"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Legitimasjonslager"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Installer et sertifikat"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Installer sertifikater fra lagringsenhet"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Brukerlegitimasjon"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Se og endre lagret legitimasjon"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Avansert"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Lagringstype"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Maskinvarebasert"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Bare programvare"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Legitimasjon er ikke tilgjengelig for denne brukeren"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Installert for VPN og apper"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Installert for Wi-Fi"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Betaling ved terminaler"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Konfigurer en betalingsapp. Deretter holder du baksiden av telefonen mot en terminal som har symbolet for kontaktløs betaling."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Skjønner"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Mr"</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Mer"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Angi en standardapp for betaling"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Oppdater standardappen for betaling"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"I en kontaktløs terminal betaler du med <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Bruk alltid dette for samtaler"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Velg et SIM-kort for data"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Velg et SIM-kort for SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Bytter data-SIM-kort – dette kan ta opptil ett minutt …"</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Bytter data-SIM-kort – dette kan ta opptil ett minutt …"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Ring med"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Velg et SIM-kort"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM-kort <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"rutine, tidsplan, batterisparing, strømsparing, batteri, automatisk, prosent"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, avansert ringing, 4g-ringing"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"Legg til språk, legg til et språk"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"tekststørrelse"</string>
     <string name="default_sound" msgid="6604374495015245195">"Standardlyd"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Ringe- og varselvolum er satt til <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Volum, vibrasjon, ikke forstyrr"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Lyder ved oppstart"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Direkteteksting"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Automatisk medieteksting"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Ingen"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> tidsplaner er angitt</item>
-      <item quantity="one">1 tidsplan er angitt</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Ingen}=1{1 tidsplan er angitt}other{# tidsplaner er angitt}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Ikke forstyrr"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Bli bare varslet av viktige personer og apper"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Begrens forstyrrelser"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Bare prioritet"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"På / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Av / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Av"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"På"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Spør hver gang"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Til du slår av"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> timer</item>
-      <item quantity="one">1 time</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minutter"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> tidsplaner kan slås på automatisk</item>
-      <item quantity="one">1 tidsplan kan slås på automatisk</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 time}other{# timer}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minutt}other{# minutter}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Av}=1{Av / 1 tidsplan kan slås på automatisk}other{Av / # tidsplaner kan slås på automatisk}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Hva kan avbryte «Ikke forstyrr»?"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Personer"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Apper"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Angi varsler med lavere prioritet automatisk til Diskré"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Tilpasset varselrangering"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Ranger varsler automatisk etter relevans"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Tilbakemelding om tilpasset varsel"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Vis justeringer av varsler og alternativet for å gi tilbakemelding til systemet"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Foreslåtte handlinger og svar"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Vis foreslåtte handlinger og svar automatisk"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Vis nylige og slumrede varsler"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"«Ikke forstyrr»-tilgang"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Tillat «Ikke forstyrr»"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Ingen installerte apper har bedt om «Ikke forstyrr»-tilgang"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Laster inn apper …"</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Laster inn appene …"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"I tråd med det du har valgt, hindrer Android at varsler fra denne appen vises på denne enheten"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"I tråd med det du har valgt, blokkerer Android denne varselkategorien fra å vises på denne enheten"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"I tråd med det du har valgt, blokkerer Android denne varselgruppen fra å vises på denne enheten"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Alle samtaler"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Prioriterte samtaler"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Ingen"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> samtaler</item>
-      <item quantity="one">1 samtale</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Ingen"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Ingen}=1{1 samtale}other{# samtaler}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Hvem kan forstyrre?"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Anrop"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Anrop"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"For å kontrollere at tillatte anrop lager lyd, sjekk at enheten er satt til ringing"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Innkommende anrop er blokkert for «<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>». Du kan justere innstillinger for å la venner, familie eller andre kontakter nå deg."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Stjernemerkede kontakter"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> andre</item>
-      <item quantity="one">1 annen</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Ingen"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Ingen}=1{{contact_1}}=2{{contact_1} og {contact_2}}=3{{contact_1}, {contact_2} og {contact_3}}other{{contact_1}, {contact_2} og # andre}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Meldinger"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"meldinger"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Meldinger"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Innkommende meldinger er blokkert for «<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>». Du kan justere innstillinger for å la venner, familie eller andre kontakter nå deg."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Alle meldinger kan nå deg"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Alle anrop kan nå deg"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Ingen"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontakter</item>
-      <item quantity="one">1 kontakt</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Ingen}=1{1 kontakt}other{# kontakter}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Alle"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Kontakter"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Stjernemerkede kontakter"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Alle varsler"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Noen varsler"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Utvalgte personer kan fremdeles nå deg, selv om du ikke tillater at apper forstyrrer"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> kan forstyrre</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> kan forstyrre</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> flere"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Ingen apper kan forstyrre}=1{{app_1} kan forstyrre}=2{{app_1} og {app_2} kan forstyrre}=3{{app_1}, {app_2} og {app_3} kan forstyrre}other{{app_1}, {app_2} og # flere kan forstyrre}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Apper"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Alle varsler"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Noen varsler"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Varsler som kan forstyrre"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Tillat alle varsler"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> kan forstyrre</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> kan forstyrre</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Ingenting kan forstyrre"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> flere"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Ingenting kan forstyrre}=1{{sound_category_1} kan forstyrre}=2{{sound_category_1} og {sound_category_2} kan forstyrre}=3{{sound_category_1}, {sound_category_2} og {sound_category_3} kan forstyrre}other{{sound_category_1}, {sound_category_2} og # flere kan forstyrre}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Ingenting kan forstyrre"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Ingen kan forstyrre"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Noen personer kan forstyrre"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Alle personer kan forstyrre"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB kontrolleres av"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Tilkoblet enhet"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Denne enheten"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Bytter …"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Bytter …"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Kunne ikke bytte"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Lader denne enheten"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Lading av den tilkoblede enheten"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Se detaljer"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Datasparing"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Ubegrenset datatilgang"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Bakgrunnsdata er slått av"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Bakgrunnsdata er slått av"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"På"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Av"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Bruk Datasparing"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Når enheten er låst, kan man ikke skrive svar eller annen tekst i varsler"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Standard stavekontroll"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Velg stavekontroll"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Bruk stavekontroll"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Bruk stavekontroll"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Ikke valgt"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(ingen)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"For å frigjøre lagringsplass fjernes sikkerhetskopierte bilder og videoer fra enheten din av lagringsadministratoren."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Fjern bilder og videoer"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Lagringsadministrator"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Bruk lagringsadministrator"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Bruk lagringsbehandling"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automatisk"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Manuelle innstillinger"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Frigjør lagringsplass nå"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Dobbelttrykk for å sjekke telefonen"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Dobbelttrykk for å sjekke nettbrettet"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Dobbelttrykk for å sjekke enheten"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Sveip for varsler"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Sveip ned på den nederste kanten av skjermen for å se varslene"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Enhåndsmodus"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Bruk enhåndsmodus"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Avslutt når du bytter app"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Tidsavbrudd"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 sekunder"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 sekunder"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 sekunder"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"tilgjengelighet"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Dobbelttrykk på skjermen for å sjekke klokkeslettet, varsler og annen informasjon."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Løft for å sjekke telefonen"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Løft for å sjekke nettbrettet"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Trykk for å sjekke nettbrettet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Trykk for å sjekke enheten"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Trykk på skjermen for å sjekke klokkeslettet, varsler og annen informasjon."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Panikknapp"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Start nødhandlingene ved å trykke raskt fem ganger på av/på-knappen."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Varsellyd"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Varsle før handlingene startes"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Nødkontakter"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Sveip fingersensoren for varsler"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Sveip på fingersensoren"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Sjekk varsler ved å sveipe ned på fingeravtrykksensoren på baksiden av telefonen."</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Aktiver for alle apper"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Velg en grafikkdriver"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Standard"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Spilldriver"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Spilldriver"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Utviklerdriver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Systemets grafikkdriver"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Fant ingen nettverk. Prøv på nytt."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(forbudt)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"SIM-kortet mangler"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM-kort"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Uten SIM-kort"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Ingen"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Krever SIM-kort for å koble til"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Krever <xliff:g id="WIRELESS_CARRIER">%s</xliff:g>-SIM-kort for å koble til"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Foretrukket nettverksmodus: WCDMA foretrekkes"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Foretrukket nettverksmodus: kun GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Foretrukket nettverksmodus: kun WCDMA"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobildata"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Bruk data via mobilnettverket"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Telefonen bytter automatisk til denne operatøren når den er innen rekkevidde"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Ingen SIM-kort er tilgjengelige"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Anropspreferanse"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS-preferanse"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Spør hver gang"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Tillat skjermoverlegg over Innstillinger"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Tillat apper som kan vises over andre apper, å legge seg over Innstillinger-skjermer"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Medier"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Skjul spilleren når medieøkten er avsluttet"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Med spilleren kan du gjenoppta en økt fra det utvidede Hurtiginnstillinger-panelet."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Mediseavspiller i hurtiginnstillingene"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Vis medieavspilleren i en lengre periode for å gjenoppta avspilling enkelt"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Skjul spilleren"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Vis spilleren"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Det finnes ingen tilgjengelige spillere"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Tillatte apper"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"medier"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth slås på"</string>
 </resources>
diff --git a/res/values-ne/arrays.xml b/res/values-ne/arrays.xml
index 5151645..4af2b52 100644
--- a/res/values-ne/arrays.xml
+++ b/res/values-ne/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"मध्यम"</item>
     <item msgid="6740026006576843477">"लामो"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"छोटो"</item>
+    <item msgid="7397961711906421599">"मध्यम"</item>
+    <item msgid="4079132024502041928">"लामो"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"पूर्वनिर्धारित"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"विश्वव्यापी"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA मात्र"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"विश्वव्यापी"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 41dbc77..812a4c5 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"लक स्क्रिनमा प्रोफाइलको जानकारी देखाउनुहोस्"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"खाताहरू"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"स्थान"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"स्थान प्रयोग गर्नुहोस्"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"स्थानसम्बन्धी सेवा प्रयोग गर्नुहोस्"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"निष्क्रिय"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">सक्रिय - <xliff:g id="COUNT_1">%1$d</xliff:g> अनुप्रयोगसँग स्थानमाथिको पहुँच छ</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"प्रमाणित गर्न आफ्नो अनुहार प्रयोग गर्नु…"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"सुरु गर्नुहोस्"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"सुलभता मोडमा फेस अनलक गर्ने सुविधा अफ गरिएको छ भने TalkBack प्रयोग गरी सेटअपका केही चरणहरू पूरा गर्न नसकिने सम्भावना हुन्छ।"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"पछाडि जानु"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"सेटअप जारी राख्नु"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"पहुँचसम्बन्धी सेटअप प्रयोग गर्नु"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="one">अनिवार्य रूपमा <xliff:g id="NUMBER_0">%d</xliff:g> अङ्क भन्दा कम हुनु पर्छ</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"यन्त्र प्रशासकले पछिल्लो PIN प्रयोग गर्न अनुमति दिँदैन"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"तपाईंकसे IT व्यवस्थापकले धेरै प्रयोग हुने PIN हरूमाथि रोक लगाउनु भएको छ। कुनै फरक PIN प्रयोग गरी हेर्नुहोस्।"</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"यसमा अमान्य वर्ण समावेश गर्न सकिँदैन"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"कम्तीमा एउटा अक्षर हुन अनिवार्य छ"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"कम्तीमा एउटा अङ्क हुन अनिवार्य छ"</string>
@@ -653,7 +655,6 @@
       <item quantity="one">कम्तीमा पनि एउटा गैर-सङ्ख्यात्मक वर्ण हुनु अनिवार्य छ</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"यन्त्रको प्रशासकले पछिल्लो पासवर्ड प्रयोग गर्ने अनुमति दिँदैन"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"तपाईंकसे IT व्यवस्थापकले धेरै प्रयोग हुने पासवर्डहरूमाथि रोक लगाउनु भएको छ। कुनै फरक पासवर्ड प्रयोग गरी हेर्नुहोस्।"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"बढ्दो, घट्दो वा दोहोरिएका अङ्कहरूको अनुक्रमलाई निषेध गरिएको छ"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"पुष्टि गर्नुहोस्"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"रद्द गर्नुहोस्"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Wi-Fi खोल्नुहोस्"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Wi-Fi प्रयोग गर्नुहोस्"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Wi-Fi प्रयोग गर्नुहोस्"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wi-Fi सेटिङहरू"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"ताररहित पहुँच बिन्दुहरू सेटअप र प्रबन्ध गर्नुहोस्"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"“<xliff:g id="SSID">%1$s</xliff:g>” मा जडान गर्न तलको QR कोडलाई मध्य भागमा राख्नुहोस्"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">" Wi‑Fi जोड्न QR कोड स्क्यान गर्नुहोस्"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Wi‑Fi सेयर गर्नुहोस्"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"“<xliff:g id="SSID">%1$s</xliff:g>” मा कनेक्ट गर्न र पासवर्ड सेयर गर्न यो QR कोड स्क्यान गर्नुहोस्"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"“<xliff:g id="SSID">%1$s</xliff:g>” मा सामेल हुन कुनै अर्को यन्त्रबाट यो QR कोड स्क्यान गर्नुहोस्"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"“<xliff:g id="SSID">%1$s</xliff:g>” मा जडान गर्न QR कोड स्क्यान गर्नुहोस्"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"फेरि प्रयास गर्नुहोस्। समस्या यथावत् रहिरहेमा यन्त्रका निर्मातासँग सम्पर्क गर्नुहोस्"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"केही चिज गडबड भयो"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi-Fi को पासवर्ड: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"हटस्पटको पासवर्ड: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"स्वतः जडान"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"फोनलाई यो नेटवर्कका छेउमा हुँदा स्वतः कनेक्ट हुन दिनुहोस्"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"ट्याब्लेटलाई यो नेटवर्कका छेउमा हुँदा स्वतः जोडिन दिनुहोस्"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"दायराभित्र भएको बेला यो नेटवर्कमा जडान हुने अनुमति दिनुहोस्"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"यन्त्र थप्नुहोस्"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"यो नेटवर्कमा थप्नका ला्गि कुनै QR प्रयोग गर्नुहोस्"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR कोडको ढाँचा मान्य छैन"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"प्रणालीका प्रमाणपत्रहरू प्रयोग गर्नुहोस्"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"प्रदान नगर्नुहोस्"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"प्रमाणित नगर्नुहोस्"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"कुनै प्रमाणपत्र निर्दिष्ट गरिएको छैन। तपाईंको जडान निजी हुने छैन।"</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"नेटवर्कको नाम धेरै लामो भयो।"</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"डोमेन तोक्नु पर्छ"</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"प्रमाणपत्र चाहिन्छ।"</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"जडान गर्नुहोस्"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi सक्रिय गरियो"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> मा कनेक्ट गरियो"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> मा कनेक्ट गरिँदै"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"जडान गर्दै…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"सञ्जालमा जडान गर्न विफल"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"नेटवर्क दायरामा छैन"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"अनुप्रयोगले सामग्री आदान प्रदान गर्दैछ। इन्टरनेट जडान साझा गर्न हटस्पट निष्क्रिय पार्नुहोस् र त्यसपछि फेरि सक्रिय गर्नुहोस्‌"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"पासवर्ड सेट गरिएको छैन"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"हटस्पटको नाम"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> सक्रिय गर्दै..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> अन गरिँदै…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"अन्य यन्त्रहरू <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> मा जडान गर्न सक्छन्"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"हटस्पटको पासवर्ड"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP ब्यान्ड"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"केही सामग्रीका लागि रिफ्रेस रेट स्वतः ६० हर्ट्जबाट बढाएर ९० हर्ट्ज बनाउँछ। ब्याट्रीको उपयोग बढाउँछ।"</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"रिफ्रेस गर्ने दर बलपूर्वक ९० हर्ज बनाउनुहोस्"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"स्क्रिनमा छुँदा स्क्रिनले जनाउने प्रतिक्रिया र एनिमेसनको गुणस्तर सुधार्न उच्चतम रिफ्रेस रेट। ब्याट्रीको खपत बढाउँछ।"</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"स्क्रिनमा हेरिरहेको पहिचान गर्ने सुविधा"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"सक्रिय / तपाईं स्क्रिनमा हेर्दै हुनुहुन्छ भने यो बन्द हुने छैन"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"एन्ड्रोइड संस्करण"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android को सुरक्षासम्बन्धी अद्यावधिक"</string>
     <string name="model_info" msgid="8997566254717810904">"मोडेल"</string>
-    <string name="model_summary" msgid="2246651782442466213">"मोडेल: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"मोडेल तथा हार्डवेयर"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"हार्डवेयरको संस्करण"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"उपकरण ID"</string>
@@ -1391,7 +1390,7 @@
     <string name="memory_apps_usage" msgid="8818570780540532952">"एप &amp; एप डेटा"</string>
     <string name="memory_media_usage" msgid="5161308657995646963">"मिडिया"</string>
     <string name="memory_downloads_usage" msgid="8252462247720191179">"डाउनलोडहरू"</string>
-    <string name="memory_dcim_usage" msgid="3568913845973164352">"तस्बिरहरू, भिडियोहरू"</string>
+    <string name="memory_dcim_usage" msgid="3568913845973164352">"फोटोहरू, भिडियोहरू"</string>
     <string name="memory_music_usage" msgid="8100634000114206429">"अडियो (सङ्गीत, रिङ्गटोन, पडकास्ट, आदि)"</string>
     <string name="memory_media_misc_usage" msgid="7066851245178533269">"अन्य फाइलहरू"</string>
     <string name="memory_media_cache_usage" msgid="780808666853685824">"क्यास गरेको डेटा"</string>
@@ -1407,7 +1406,7 @@
     <string name="sd_mount_summary" product="default" msgid="2190410240845521205"></string>
     <string name="sd_format" product="nosdcard" msgid="8657427883364711513">"USB भण्डारण मेटाउनुहोस्"</string>
     <string name="sd_format" product="default" msgid="9085302892248732329">"SD कार्ड मेटाउनुहोस्"</string>
-    <string name="sd_format_summary" product="nosdcard" msgid="6179784504937189658">"आन्तरिक USB भण्डारणमा सम्पूर्ण डेटाहरू मेटाउँछ, जस्तै सङ्गीत र तस्बिरहरू"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6179784504937189658">"आन्तरिक USB भण्डारणमा सम्पूर्ण डेटाहरू मेटाउँछ, जस्तै सङ्गीत र फोटोहरू"</string>
     <string name="sd_format_summary" product="default" msgid="60583152211068164">"SD कार्डमा सबै डेटा जस्तै सङ्गीत र फोटोहरू मेटाउँछ"</string>
     <string name="memory_clear_cache_title" msgid="2605096903803953619">"क्यास डेटा हटाउनु हुन्छ?"</string>
     <string name="memory_clear_cache_message" msgid="4759561226480906588">"यसले सबै अनुप्रयोगहरूको लागि केस गरिएको डेटा हटाउँछ।"</string>
@@ -1464,11 +1463,11 @@
     <string name="storage_dialog_unmounted" msgid="1187960789775910051">"यो <xliff:g id="NAME_0">^1</xliff:g> सुरक्षित रूपमा निकालियो, तर अझै पनि उपलब्ध छ। \n\n यो <xliff:g id="NAME_1">^1</xliff:g> प्रयोग गर्न, तपाईँले पहिला यो माउन्ट गर्नुपर्छ।"</string>
     <string name="storage_dialog_unmountable" msgid="1761107904296941687">"यो <xliff:g id="NAME_0">^1</xliff:g> बिग्रिएको छ। \n\n यो <xliff:g id="NAME_1">^1</xliff:g> प्रयोग गर्न, तपाईँले पहिले यसलाई सेटअप गर्नुहोस्।"</string>
     <string name="storage_dialog_unsupported" msgid="7787241928013470089">"यो यन्त्रले यो <xliff:g id="NAME_0">^1</xliff:g> लाई समर्थन गर्दैन। \n\n यस यन्त्रसँग यो <xliff:g id="NAME_1">^1</xliff:g> प्रयोग गर्न, तपाईँले पहिला यो सेटअप गर्नुपर्छ।"</string>
-    <string name="storage_internal_format_details" msgid="8922023528848861812">"ढाँचामा मिलाएपछि, तपाईँले यसलाई <xliff:g id="NAME_0">^1</xliff:g> अन्य यन्त्रहरूमा प्रयोग गर्न सक्नुहुन्छ। \n\nयसका <xliff:g id="NAME_1">^1</xliff:g> सबै डेटा मेटिनेछन्। पहिले ब्याकअप राख्ने बारे विचार गर्नुहोस्। \n\n"<b>"तस्बिर तथा अन्य मिडिया ब्याकअप गर्नुहोस्"</b>" \n यस यन्त्रमा वैकल्पिक भण्डारण गर्न आफ्नो मिडिया फाइलहरू सार्नुहोस्, वा USB केबल प्रयोग गरी कम्प्युटरको स्थानान्तरण गर्नुहोस्। \n\n"<b>"एपहरू ब्याकअप गर्नुहोस्"</b>" \n यसमा <xliff:g id="NAME_6">^1</xliff:g> भण्डारित सबै एपहरू हटाइने छन् र तिनका डेटा मेटिनेछन्। यी एपहरू राख्न, यस यन्त्रमा वैकल्पिक भण्डारण गर्न तिनीहरूलाई सार्नुहोस्।"</string>
+    <string name="storage_internal_format_details" msgid="8922023528848861812">"ढाँचामा मिलाएपछि, तपाईँले यसलाई <xliff:g id="NAME_0">^1</xliff:g> अन्य यन्त्रहरूमा प्रयोग गर्न सक्नुहुन्छ। \n\nयसका <xliff:g id="NAME_1">^1</xliff:g> सबै डेटा मेटिनेछन्। पहिले ब्याकअप राख्ने बारे विचार गर्नुहोस्। \n\n"<b>"फोटो तथा अन्य मिडिया ब्याकअप गर्नुहोस्"</b>" \n यस यन्त्रमा वैकल्पिक भण्डारण गर्न आफ्नो मिडिया फाइलहरू सार्नुहोस्, वा USB केबल प्रयोग गरी कम्प्युटरको स्थानान्तरण गर्नुहोस्। \n\n"<b>"एपहरू ब्याकअप गर्नुहोस्"</b>" \n यसमा <xliff:g id="NAME_6">^1</xliff:g> भण्डारित सबै एपहरू हटाइने छन् र तिनका डेटा मेटिनेछन्। यी एपहरू राख्न, यस यन्त्रमा वैकल्पिक भण्डारण गर्न तिनीहरूलाई सार्नुहोस्।"</string>
     <string name="storage_internal_unmount_details" msgid="487689543322907311"><b>"जब तपाईं <xliff:g id="NAME_0">^1</xliff:g> लाई निकाल्नुहुन्छ, यसमा भएका एपहरू चल्न छोड्नेछन्, र पुनः नघुसाएसम्म त्यसमा भएका मिडिया फाइलहरू उपलब्ध हुने छैनन्।"</b>\n\n"यो <xliff:g id="NAME_1">^1</xliff:g> यस यन्त्रमा मात्र काम गर्ने हिसाबले फरम्याट गरिएको छ। यो अन्य कुनैमा काम गर्ने छैन।"</string>
     <string name="storage_internal_forget_details" msgid="5606507270046186691">"<xliff:g id="NAME">^1</xliff:g> मा भएका एपहरू, तस्बिरहरु, र डेटाको प्रयोग गर्न, यसलाई पुन: घुसाउनुहोस्।\n\nवैकल्पिक रूपमा, यन्त्र उपलब्ध नभएको खण्डमा यस भण्डारणलाई भुल्नको लागि रोज्न सक्नुहुनेछ।\n\nयदि तपाईँले भुल्ने विकल्प रोज्नु हुन्छ भने, यन्त्रमा भएका सम्पूर्ण डेटा सदाको लागि नष्ट हुनेछ।\n\nतपाईँले पछि पनि एपहरू पुन: स्थापना गर्न सक्नुहुन्छ तर यस यन्त्रमा भण्डारण भएका डेटा नष्ट हुनेछ।"</string>
     <string name="storage_internal_forget_confirm_title" msgid="379238668153099015">"<xliff:g id="NAME">^1</xliff:g> भुल्नुभयो?"</string>
-    <string name="storage_internal_forget_confirm" msgid="5752634604952674123">"यो <xliff:g id="NAME">^1</xliff:g> मा भण्डारण गरिएका सबै एपहरू, तस्बिरहरू, र डेटा सधैंका लागि नष्ट हुनेछन्।"</string>
+    <string name="storage_internal_forget_confirm" msgid="5752634604952674123">"यो <xliff:g id="NAME">^1</xliff:g> मा भण्डारण गरिएका सबै एपहरू, फोटोहरू, र डेटा सधैंका लागि नष्ट हुनेछन्।"</string>
     <string name="storage_detail_apps" msgid="5055911985540355324">"एपहरू"</string>
     <string name="storage_detail_images" msgid="6003883845718804371">"छविहरू"</string>
     <string name="storage_detail_videos" msgid="9079894412680404208">"भिडियोहरू"</string>
@@ -1479,12 +1478,12 @@
     <string name="storage_detail_explore" msgid="13782374784415466">"<xliff:g id="NAME">^1</xliff:g> अन्वेषण गर्नुहोस्"</string>
     <string name="storage_detail_dialog_other" msgid="3359851869961609901">"अन्यमा एपहरूले सुरक्षित गेरका साझा फाइल, इन्टरनेट वा ब्लुटुथबाट डाउनलोड गरिएका फाइल, Android का फाइलहरू र यस्तै थप कुराहरू पर्छन्। \n\nयो <xliff:g id="NAME">^1</xliff:g> का देख्न सकिने सामग्रीहरू हेर्न अन्वेषण गर्नुहोस् नामक विकल्पमा ट्याप गर्नुहोस्।"</string>
     <string name="storage_detail_dialog_system" msgid="7461009051858709479">"प्रणालीमा Android संस्करण <xliff:g id="VERSION">%s</xliff:g> चलाउनका लागि प्रयोग भएका फाइलहरू समावेश छन्"</string>
-    <string name="storage_detail_dialog_user" msgid="1691219071007313226">"<xliff:g id="USER_0">^1</xliff:g> ले तस्बिर, सङ्गीत, एप वा अन्य डेटा सुरक्षित गर्नुभएको हुनसक्छ, जसले <xliff:g id="SIZE">^2</xliff:g> भण्डारण ओगटिरहेको छ। \n\nविवरणहरू हेर्न <xliff:g id="USER_1">^1</xliff:g> मा स्विच गर्नुहोस्।"</string>
+    <string name="storage_detail_dialog_user" msgid="1691219071007313226">"<xliff:g id="USER_0">^1</xliff:g> ले फोटो, सङ्गीत, एप वा अन्य डेटा सुरक्षित गर्नुभएको हुनसक्छ, जसले <xliff:g id="SIZE">^2</xliff:g> भण्डारण ओगटिरहेको छ। \n\nविवरणहरू हेर्न <xliff:g id="USER_1">^1</xliff:g> मा स्विच गर्नुहोस्।"</string>
     <string name="storage_wizard_init_title" msgid="9036374223934708619">"तपाईँको <xliff:g id="NAME">^1</xliff:g> सेट गर्नुहोस्"</string>
     <string name="storage_wizard_init_external_title" msgid="6540132491909241713">"पोर्टेबल भण्डारणको रूपमा प्रयोग गर्नुहोस्"</string>
-    <string name="storage_wizard_init_external_summary" msgid="5807552934494462984">"यन्त्रहरू बीच तस्बिर र अन्य मिडिया सार्नका लागि।"</string>
+    <string name="storage_wizard_init_external_summary" msgid="5807552934494462984">"यन्त्रहरू बीच फोटो र अन्य मिडिया सार्नका लागि।"</string>
     <string name="storage_wizard_init_internal_title" msgid="3256355049992147270">"आन्तरिक भण्डारणको रूपमा प्रयोग गर्नुहोस्"</string>
-    <string name="storage_wizard_init_internal_summary" msgid="2283798331883929674">"यस यन्त्रमा मात्र कुनै पनि चिज, एप र तस्बिरहरू  भण्डारण गर्नाका लागि। यसलाई ढाँचा मिलाउन आवश्यक हुन्छ जसले अर्का यन्त्रहरूसँग काम गर्नबाट रोक्छ।"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="2283798331883929674">"यस यन्त्रमा मात्र कुनै पनि चिज, एप र फोटोहरू  भण्डारण गर्नाका लागि। यसलाई ढाँचा मिलाउन आवश्यक हुन्छ जसले अर्का यन्त्रहरूसँग काम गर्नबाट रोक्छ।"</string>
     <string name="storage_wizard_format_confirm_title" msgid="4898014527956178762">"आन्तरिक भण्डारणको रुपमा ढाँचा गर्नुहोस्"</string>
     <string name="storage_wizard_format_confirm_body" msgid="5514665245241830772">"यो सुरक्षित बनाउन यसलाई <xliff:g id="NAME_0">^1</xliff:g> ढाँचा बनाउन आवश्यकता छ। \n\nढाँचामा मिलाएपछि, यो यन्त्रमा यसले <xliff:g id="NAME_1">^1</xliff:g> मात्र काम गर्ने छ। \n\n"<b>" ढाँचा मिलाउँदा <xliff:g id="NAME_2">^1</xliff:g> मा हालैका भण्डारित सबै डेटा मेटिन्छ।"</b>" डेटा गुमाउनुपर्ने बाट जोगिन, यसको ब्याकअप राख्ने बारे विचार गर्नुहोस्।"</string>
     <string name="storage_wizard_format_confirm_public_title" msgid="649252654496577680">"पोर्टेबल भण्डारणका रूपमा फरम्याट गर्नुहोस्"</string>
@@ -1502,8 +1501,8 @@
     <string name="storage_wizard_migrate_progress_title" msgid="462238335086734131">"डेटा सार्दै..."</string>
     <string name="storage_wizard_migrate_details" msgid="7474061662976940407">"सार्दाको समयमा: \n• <xliff:g id="NAME">^1</xliff:g> नहटाउनुहोस्। \n• केही एपहरूले सही काम गर्ने छैन। \n• यन्त्र चार्जमा राख्नुहोस्।"</string>
     <string name="storage_wizard_ready_title" msgid="3093468548660255543">"तपाईंको <xliff:g id="NAME">^1</xliff:g> प्रयोगका लागि तयार छ"</string>
-    <string name="storage_wizard_ready_external_body" msgid="45040717412844114">"तपाईँको <xliff:g id="NAME">^1</xliff:g> तस्बिर र अन्य मिडिया प्रयोग गर्न सबै सेट छ।"</string>
-    <string name="storage_wizard_ready_internal_body" msgid="7734817996475607447">"तपाईँको नयाँ <xliff:g id="NAME">^1</xliff:g> ले काम गर्दैछ। \n\n यो यन्त्रमा तस्बिरहरू, फाइलहरू, र एप डेटा सार्न, सेटिङ &amp;gt मा जानुहोस्; भण्डारण गर्नुहोस्।"</string>
+    <string name="storage_wizard_ready_external_body" msgid="45040717412844114">"तपाईँको <xliff:g id="NAME">^1</xliff:g> फोटो र अन्य मिडिया प्रयोग गर्न सबै सेट छ।"</string>
+    <string name="storage_wizard_ready_internal_body" msgid="7734817996475607447">"तपाईँको नयाँ <xliff:g id="NAME">^1</xliff:g> ले काम गर्दैछ। \n\n यो यन्त्रमा फोटोहरू, फाइलहरू, र एप डेटा सार्न, सेटिङ &amp;gt मा जानुहोस्; भण्डारण गर्नुहोस्।"</string>
     <string name="storage_wizard_move_confirm_title" msgid="6812469630804101590">"सार्नुहोस् <xliff:g id="APP">^1</xliff:g>"</string>
     <string name="storage_wizard_move_confirm_body" msgid="1713022828842263574">"<xliff:g id="NAME_0">^2</xliff:g> मा <xliff:g id="APP">^1</xliff:g> र यसको डेटा सार्न केही बेर मात्र लिनेछ। तपाईं सार्ने क्रम पूरा नहुन्जेल एप प्रयोग गर्न सक्नुहुने छैन। \n\n सार्ने क्रममा <xliff:g id="NAME_1">^2</xliff:g> नहटाउनुहोस्।"</string>
     <string name="storage_wizard_move_unlock" msgid="14651384927767749">"डेटा सार्न तपाईंले प्रयोगकर्ताको <xliff:g id="APP">^1</xliff:g> अनलक गर्नु पर्ने हुन्छ।"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"सञ्जाल सेटिङहरू रिसेट गरियो"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"SIM हरू मेट्न सकिँदैन"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"कुनै त्रुटि भएका कारण डाउनलोड गरिएका SIM हरू मेटाउन सकिएन।\n\nआफ्नो यन्त्र पुनः सुरु गरी फेरि प्रयास गर्नुहोस्।"</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"सबै डेटा मेटाउनुहोस् (फ्याक्ट्री रिसेट गर्नुहोस्)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"सबै डेटा मेटाउनुहोस् (फ्याक्ट्री रिसेट गर्नुहोस्)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"यसले निम्नलगायतका सबै डेटा तपाईंको "<b>"आन्तरिक भण्डारणबाट मेटाउँदछ"</b>":\n\n"<li>"तपाईंको Google खाता"</li>\n<li>"प्रणाली र एप डेटा र सेटिङहरू"</li>\n<li>"डाउनलोड गरिएका एपहरू"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"यस कार्यले तपाईंको यन्त्रको "<b>"आन्तरिक भण्डारण"</b>" बाट सम्पूर्ण डेटा मेटाउँछ, जसमा निम्न कुराहरू पर्दछन्:\n\n"<li>"तपाईंको Google खाता"</li>\n<li>"प्रणाली र अनुप्रयोगका डेटा तथा सेटिङहरू"</li>\n<li>"डाउनलोड गरिएका एपहरू"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n" \nतपाईं अहिले निम्न खाताहरूमा साइन इन हुनुहुन्छ:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n" यस यन्त्रमा हाल अन्य प्रयोगकर्ताहरु छन्। \n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"संगीत"</li>\n<li>"तस्बिरहरू"</li>\n<li>"अन्य उपयोगकर्ता डेटा"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM हरू"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"यस कार्यले तपाईंको मोबाइल सेवाको योजना रद्द गर्नेछैन।"</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n" \n सङ्गीत, चित्र र अन्य उपयोगकर्ता डेटा हटाउन "<b>"USB संग्रह"</b>" मेटाउन जरुरी छ।"</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n" \n सङ्गीत, तस्वीरहरू, र अन्य प्रयोगकर्ता डेटा मेटाउनका लागि, "<b>" SD कार्ड "</b>" मेटाउनु पर्छ।"</string>
+    <string name="main_clear_title" msgid="277664302144837723">"सबै डेटा मेटाउनुहोस् (फ्याक्ट्री रिसेट गर्नुहोस्)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"सबै डेटा मेटाउनुहोस् (फ्याक्ट्री रिसेट गर्नुहोस्)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"यसो गर्नुभयो भने तपाईंको ट्याब्लेटको "<b>"आन्तरिक भण्डारण"</b>"मा भएका निम्नलगायतका सबै डेटा मेटाइने छ:\n\n"<li>"तपाईंको Google खाता"</li>\n<li>"प्रणाली र एपका डेटा तथा सेटिङ"</li>\n<li>"डाउनलोड गरिएका एपहरू"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"यसो गर्नुभयो भने तपाईंको फोनको "<b>"आन्तरिक भण्डारण"</b>"मा भएका निम्नलगायतका सबै डेटा मेटाइने छ:\n\n"<li>"तपाईंको Google खाता"</li>\n<li>"प्रणाली र एपका डेटा तथा सेटिङ"</li>\n<li>"डाउनलोड गरिएका एपहरू"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n" \nतपाईं हाल निम्न खाताहरूमा साइन इन हुनुहुन्छ:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"यो यन्त्रमा अन्य प्रयोगकर्ताहरू छन्।\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"सङ्गीत"</li>\n<li>"फोटोहरू"</li>\n<li>"प्रयोगकर्ताको अन्य डेटा"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM हरू"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"यसो गर्नुभयो भने तपाईंको मोबाइल सेवा योजना रद्द गरिने छ।"</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n" \n सङ्गीत, फोटो तथा प्रयोगकर्ताको अन्य डेटा मेटाउनका लागि "<b>"USB भण्डारण"</b>" मेटाउनु पर्ने हुन्छ।"</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n" \n सङ्गीत, फोटो र प्रयोगकर्ताको अन्य डेटा मेटाउनका लागि "<b>" SD कार्ड "</b>" मेटाउनु पर्ने हुन्छ।"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USB भण्डारण मेटाउनुहोस्"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SD कार्ड मेटाउनुहोस्"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"आन्तरिक USB भण्डारणमा सबै डेटा मेटाउनुहोस्, जस्तै सङ्गीत वा फोटोहरू"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"SD कार्डबाट सबै डाटाहरू जस्तै सङ्गीत वा फोटोहरू मेटाउनुहोस्"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"सबै डेटा मेट्नुहोस्"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"सबै डेटा मेट्नुहोस्"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"तपाईंका सबै व्यक्तिगत जानकारी र डाउनलोड गरिएका एपहरू मेटिने छन्। तपाईं यस कार्यलाई अन्डू गर्न सक्नुहुन्न!"</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"तपाईंका डाउनलोड गरिएका एप तथा SIM हरू लगायत सबै निजी जानकारी मेटाइने छन्। तपाईं यस कार्यलाई अन्डू गर्न सक्नुहुन्न!"</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"सबै मेटाउनुहोस्"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"कुनै रिसेट हुन सकेन किनभने सिस्टम क्लिएर सेवा उपलब्ध छैन।"</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"सबै डेटा मेट्ने हो?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"यस प्रयोगकर्ताको लागि कारखाना रिसेट गर्ने उपलब्ध छैन"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"मेटाउँदै"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"कृपया प्रतीक्षा गर्नुहोला..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"सबै डेटा मेट्नुहोस्"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"सबै डेटा मेट्नुहोस्"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"तपाईंका सबै व्यक्तिगत जानकारी र डाउनलोड गरिएका एपहरू मेटाइने छन्। तपाईं यो कार्य अन्डू गर्न सक्नुहुन्न।"</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"तपाईंका डाउनलोड गरिएका एप तथा SIM लगायत सबै व्यक्तिगत जानकारी मेटाइने छन्। तपाईं यो कार्य अन्डू गर्न सक्नुहुन्न।"</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"सबै डेटा मेट्ने हो?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"यी प्रयोगकर्ताले फ्याक्ट्री रिसेट गर्न पाउँदैनन्"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"मेटाइँदै छ"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"कृपया पर्खनुहोस्…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"कल सेटिङहरू"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"भ्वाइस मेल, कल फर्वार्ड, कल प्रतीक्षा, र कलर ID सेटअप गर्नुहोस्"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB टेथर गर्दै"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> उपकरणहरूभन्दा बढीसँग टेदर गर्न सक्दैन।"</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> अनटेथर गरिने छ।"</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"इथरनेट टेदरिङ"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"USB इथरनेटमार्फत फोनको सेयर गर्नुहोस्"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"इथरनेटमार्फत फोनको इन्टरनेट कनेक्सन सेयर गर्नुहोस्"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"आफ्नो मोबाइल डेटा जडानमार्फत अन्य यन्त्रहरूलाई इन्टरनेट उपलब्ध गराउन हटस्पट र टेदरिङ प्रयोग गर्नुहोस्। नजिकैका यन्त्रहरूसँग सामग्री आदान प्रदान गर्नाका निम्ति एपहरूले हटस्पट सिर्जना गर्न पनि सक्छन्।"</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"आफ्नो Wi‑Fi वा मोबाइल डेटा इन्टरनेटमार्फत अन्य यन्त्रहरूमा इन्टरनेट उपलब्ध गराउन हटस्पट र टेदरिङ प्रयोग गर्नुहोस्। एपहरूले पनि वरपरका यन्त्रहरूसँग सामग्री सेयर गर्न हटस्पट सिर्जना गर्न सक्छन्।"</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"मद्दत"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"क्याप्सनसम्बन्धी प्राथमिकताहरू"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"म्याग्निफिकेसन"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"म्याग्निफिकेसन क्षेत्र"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"म्याग्निफिकेसन सक्षम पारिएको"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"स्क्रिन म्याग्निफाई गर्दा आफूले प्रयोग गर्न चाहेका म्याग्निफिकेसन क्षेत्र (हरू) छनौट गर्नुहोस्"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"फुल स्क्रिन"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"स्क्रिनको भाग"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"फुल स्क्रिन र स्क्रिनको भाग"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"समग्र स्क्रिन म्याग्निफाई गर्नुहोस्"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"स्क्रिनको भाग म्याग्निफाई गर्नुहोस्"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"पहुँचको बटन प्रयोग गर्ने हो?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"तपाईंले स्क्रिनमा तीन पटक ट्याप गरेर स्क्रिनको कुनै भाग म्याग्निफाई गर्ने सुविधा प्रयोग गर्नुभयो भने टाइपिङका साथै अन्य कारबाहीहरूमा ढिलाइ हुन्छ।\n\n तपाईं म्याग्निफाई गर्नका लागि पहुँचको बटन प्रयोग गर्न चाहनुहुन्छ?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"पहुँचको बटन प्रयोग गर्नुहोस्"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"तीन पटक ट्याप गरेर म्याग्निफाई गर्ने सुविधा चालू राख्नुहोस्"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"म्याग्निफिकेसनसम्बन्धी सेटिङ"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"तीन ट्यापमा म्याग्निफाइ गर्नुहोस्"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"सर्टकट प्रयोग गरी म्याग्निफाइ गर्नुहोस्"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"पावर बटनले कल काट्छ"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"ठुलो माउस पोइन्टर"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"एनिमेसनहरू हटाउनुहोस्"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"मोनो अडियो"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"अडियो प्ले गर्दा च्यानलहरूलाई संयोजन गर्नुहोस्"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"अडियोको सन्तुलन"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"बायाँ"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"दायाँ"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"मोनो अडियो"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"सबै अडियो एउटै च्यानलबाट प्ले गर्नुहोस्"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"अडियोको सन्तुलन"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"बायाँ"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"दायाँ"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"पूर्वनिर्धारित"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"१० सेकेन्ड"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"३० सेकेन्ड"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"सूचना आएको जनाउने कम्पन"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"कम्पनसहितको घन्टी"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"छोएर दिइने प्रतिक्रिया"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> प्रयोग गर्नुहोस्"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> खोल्नुहोस्"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"रङ्ग सुधार गर्ने सुविधा प्रयोग गर्नुहोस्"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"क्याप्सनहरू देखाउनुहोस्"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"यो सुविधा चल्ने एपहरूमा मात्र"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> प्रयोग गर्नुहोस्"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> खोल्नुहोस्"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"रङ सच्याउने सुविधा प्रयोग गर्नुहोस्"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"क्याप्सनहरू देखाउनुहोस्"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"यो सुविधा चल्ने एपमा मात्र"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"क्याप्सनको आकार र शैली"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> पाठको आकार"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"थप विकल्पहरू"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"ड्युटेरानोमेली"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"प्रोटानोमेली"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"ट्रिटानोमेली"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"ग्रेस्केल"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"रातो-हरियो"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"रातो-हरियो"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"निलो-पहेँलो"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"पृष्ठभूमिको प्रतिबन्ध"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"एपलाई पृष्ठभूमिमा चल्न अनुमति दिनुहोस्"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"एपलाई पृष्ठभूमिमा चल्न दिइएको छैन"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"पृष्ठभूमिको प्रयोगमा प्रतिबन्ध लगाउन सकिँदैन"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"ब्याकग्राउन्डमा हुने गतिविधिमाथि रोक लगाउन सकिँदैन"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"पृष्ठभूमिको गतिविधिलाई सीमित गर्ने हो?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"तपाईंले कुनै एपको पृष्ठभूमिको गतिविधिलाई सीमित गर्नुभयो भने यसले सही तरिकाले काम नगर्न सक्छ"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"यो एपलाई ब्याट्री अप्टिमाइज गर्न भनी सेट नगरिएको हुनाले तपाईं यसमा बन्देज लगाउन सक्नुहुन्न।\n\nअनुप्रयोगमा बन्देज लगाउन पहिले ब्याट्री अप्टिमाइजेसन सुविधा सक्रिय गर्नुहोस्।"</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"समयतालिका सेट गर्नुहोस्‌"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"ब्याट्रीको खपत बढाउनुहोस्"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"चार्ज भएपछि अफ गर्नुहोस्"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"तपाईंको फोन <xliff:g id="PERCENT">%1$s</xliff:g> भएपछि ब्याट्री सेभर अफ हुन्छ"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"तपाईंको ट्याब्लेटको चार्ज <xliff:g id="PERCENT">%1$s</xliff:g> भएपछि ब्याट्री सेभर अफ हुन्छ"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"तपाईंको यन्त्र <xliff:g id="PERCENT">%1$s</xliff:g> भएपछि ब्याट्री सेभर अफ हुन्छ"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"तपाईंको फोन <xliff:g id="PERCENT">%1$s</xliff:g> भन्दा बढी चार्ज हुँदा ब्याट्री सेभर अफ हुन्छ"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"तपाईंको ट्याब्लेट <xliff:g id="PERCENT">%1$s</xliff:g> भन्दा बढी चार्ज हुँदा ब्याट्री सेभर अफ हुन्छ"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"तपाईंको यन्त्र <xliff:g id="PERCENT">%1$s</xliff:g> भन्दा बढी चार्ज हुँदा ब्याट्री सेभर अफ हुन्छ"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"सक्रिय गर्नुहोस्"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"रिसेट गर्नुहोस्"</string>
     <string name="tts_play" msgid="2945513377250757221">"प्ले गर्नुहोस्"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"एड्याप्टिभ कनेक्टिभिटी"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"तपाईंले एड्याप्टिभ कनेक्टिभिटी नामक विकल्प छनौट गर्नुभयो भने तपाईंको इन्टरनेट कनेक्सन स्वतः व्यवस्थापन गरिन्छ। यसले गर्दा ब्याट्रीको आयु बढ्छ र यन्त्रको कार्यसम्पादनमा सुधार आउँछ"</string>
     <string name="credentials_title" msgid="7535942196886123656">"प्रमाण संग्रहण"</string>
     <string name="credentials_install" msgid="3933218407598415827">"प्रमाणपत्र स्थापना गर्नुहोस्"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"भण्डारणबाट प्रमाणपत्रहरू स्थापना गर्नुहोस्"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"प्रयोगकर्ताका प्रमाणपत्रहरू"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"भण्डारमा भएका प्रमाणपत्रहरू हेर्नुहोस् र परिमार्जन गर्नुहोस्"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"उन्नत"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"भण्डारण प्रकार"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"हार्डवेयर-ब्याक गरिएको"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"सफ्टवेयर मात्र"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"साखकर्ताहरू यस प्रयोगकर्ताका लागि उपलव्ध छैन"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN र अनुप्रयोगहरूका लागि स्थापना गरिएको"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi का लागि स्थापना गरिएको"</string>
@@ -2706,7 +2706,7 @@
     <string name="backup_erase_dialog_title" msgid="5892431263348766484"></string>
     <string name="backup_erase_dialog_message" msgid="2250872501409574331">"तपाईँको Wi-Fi पासवर्डहरू, बुकमार्क, अन्य सेटिङहरू, र एप डेटाको जगेडा राख्न बन्द गर्ने र Google सर्भरबाट सम्पूर्ण प्रतिलिपिहरू मेटाउने हो?"</string>
     <string name="fullbackup_erase_dialog_message" msgid="2379053988557486162">"के यन्त्र डेटा (जस्तै Wi-Fi पासवर्डहरू र इतिहास कल) र एप डेटा (जस्तै एपहरू द्वारा भण्डारण सेटिङहरू र फाइलहरू) को ब्याकअपलाई रोक्ने, र थप रिमोट सर्भरहरूमा सबै प्रतिलिपिहरू मेटाउन चाहनु हुन्छ?"</string>
-    <string name="fullbackup_data_summary" msgid="971587401251601473">"यन्त्र डेटा (जस्तै Wi-Fi पासवर्डहरू र कल इतिहास) र एप डेटा (जस्तै एपहरूद्वारा भण्डारित सेटिङहरू र फाइलहरू) टाढाबाट स्वचालित रुपमा ब्याकअप गर्नुहोस्। \n\nजब तपाईं स्वचालित ब्याकअप यन्त्र सक्षम गर्नुहुन्छ, यन्त्र र एप डेटा आवधिक रूपमा टाढाबाट सुरक्षित गरिएको छ। सम्पर्क, सन्देशहरू, र तस्बिरहरू जस्तै सम्भावित संवेदनशील डेटा सहित, एप डेटा कुनै पनि डेटा हुनसक्छ जुन एपले (विकासकर्ता सेटिङहरूमा आधारित) सुरक्षित गरेको छ।"</string>
+    <string name="fullbackup_data_summary" msgid="971587401251601473">"यन्त्र डेटा (जस्तै Wi-Fi पासवर्डहरू र कल इतिहास) र एप डेटा (जस्तै एपहरूद्वारा भण्डारित सेटिङहरू र फाइलहरू) टाढाबाट स्वचालित रुपमा ब्याकअप गर्नुहोस्। \n\nजब तपाईं स्वचालित ब्याकअप यन्त्र सक्षम गर्नुहुन्छ, यन्त्र र एप डेटा आवधिक रूपमा टाढाबाट सुरक्षित गरिएको छ। सम्पर्क, सन्देशहरू, र फोटोहरू जस्तै सम्भावित संवेदनशील डेटा सहित, एप डेटा कुनै पनि डेटा हुनसक्छ जुन एपले (विकासकर्ता सेटिङहरूमा आधारित) सुरक्षित गरेको छ।"</string>
     <string name="device_admin_settings_title" msgid="31392408594557070">"यन्त्रका प्रशासक सम्बन्धी सेटिङहरू"</string>
     <string name="active_device_admin_msg" msgid="7744106305636543184">"यन्त्रको प्रशासन सम्बन्धी एप"</string>
     <string name="remove_device_admin" msgid="3143059558744287259">"यो यन्त्रको प्रशासकीय एपलाई निष्क्रिय पार्नुहोस्"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"टर्मिनलमा भुक्तानी"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"एउटा भुक्तानी एप सेटअप गर्नुहोस्। त्यसपछि आफ्नो फोनको पछाडिको भाग कन्ट्याक्टलेस सङ्केतभएको कुनै टर्मिनलले पहिचान गर्ने गरी होल्ड गर्नुहोस्।"</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"बुझेँ"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"थप..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"थप…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"पूर्वनिर्धारित भुक्तानी एप सेट गर्नुहोस्"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"पूर्वनिर्धारित भुक्तानी एप परिवर्तन गर्नु…"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"कन्ट्याक्टलेस टर्मिनलमा <xliff:g id="APP">%1$s</xliff:g> मार्फत भुक्तानी गर्नुहोस्"</string>
@@ -3073,7 +3073,7 @@
     <string name="help_label" msgid="2896538416436125883">"मद्दत र प्रतिक्रिया"</string>
     <string name="support_summary" msgid="1034146931237148885">"मद्दतसम्बन्धी लेखहरू, फोन, कुराकानी र सुरूवात गर्नेसम्बन्धी सहायता"</string>
     <string name="user_account_title" msgid="6389636876210834864">"सामग्रीको लागि खाता"</string>
-    <string name="user_picture_title" msgid="7176437495107563321">"तस्बिर ID"</string>
+    <string name="user_picture_title" msgid="7176437495107563321">"फोटो ID"</string>
     <string name="extreme_threats_title" msgid="1098958631519213856">"चरम धम्की"</string>
     <string name="extreme_threats_summary" msgid="3560742429496902008">"जीवन र सम्पत्तिको चरम खतराहरूको लागि चेतावनीहरू प्राप्त"</string>
     <string name="severe_threats_title" msgid="8962959394373974324">"गम्भीर खतराहरू"</string>
@@ -3130,9 +3130,9 @@
     <string name="wizard_back" msgid="8257697435061870191">"पछाडि जानुहोस्"</string>
     <string name="wizard_next" msgid="3884832431439072471">"अर्को"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"समाप्त गर्नुहोस्"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"तस्बिर खिच्नुहोस्"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"कुनै तस्बिर छनौट गर्नुहोस्"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"तस्बिर छान्नुहोस्"</string>
+    <string name="user_image_take_photo" msgid="2601691481533190924">"फोटो खिच्नुहोस्"</string>
+    <string name="user_image_choose_photo" msgid="5904586923236027350">"कुनै फोटो छनौट गर्नुहोस्"</string>
+    <string name="user_image_photo_selector" msgid="7727851029781491727">"फोटो छान्नुहोस्"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"सिम कार्ड"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM कार्डहरू"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"सधैं यो कलको लागि प्रयोग गर्नुहोस्"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"डेटाको लागि सिम चयन गर्नुहोस्"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"SMS गर्न कुनै SIM चयन गर्नुहोस्"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"डेटा SIM स्विच गर्दै, यसलाई करिब एक मिनेट लाग्न सक्छ ..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"डेटा प्रयोग गर्ने SIM परिवर्तन गरिँदै छ, यसो गर्न एक मिनेटसम्म लाग्न सक्छ…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"संग कल"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"SIM कार्ड चयन गर्नुहोस्"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"दिनचर्या, समयतालिका, ब्याट्री सेभर, पावर सेभर, ब्याट्री, स्वचालित, प्रतिशत"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, कल गर्ने उन्नत सुविधा, 4g मार्फत कल गर्ने सुविधा"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"भाषा थप्नुहोस्, कुनै भाषा थप्नुहोस्"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"पाठको आकार"</string>
     <string name="default_sound" msgid="6604374495015245195">"पूर्वनिर्धारित ध्वनि"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"घन्टी तथा सूचनाको भोल्युम <xliff:g id="PERCENTAGE">%1$s</xliff:g> मा सेट छ"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"भोल्युम, कम्पन, बाधा नपुर्‍याउनुहोस्"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"यन्त्र सक्रिय हुँदाका ध्वनिहरू"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"लाइभ क्याप्सन"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"मिडियाको स्वत: क्याप्सन बनाउनुहोस्"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"कुनै पनि होइन"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> समयतालिकाहरू निर्धारण गरिए</item>
-      <item quantity="one">१ समयतालिका निर्धारण गरियो</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{कुनै पनि समयतालिका निर्धारण गरिएको छैन}=1{एउटा समयतालिका निर्धारण गरियो}other{# वटा समयतालिका निर्धारण गरिए}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"बाधा नपुऱ्याउनुहोस्"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"महत्त्वपूर्ण मान्छे र एपका सूचना मात्र प्राप्त गर्नुहोस्"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"अवरोधहरू सीमित पार्नुहोस्"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"प्राथमिकता मात्र"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>। <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"सक्रिय छ/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"निष्क्रिय छ/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"निष्क्रिय छ"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"सक्रिय"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"प्रत्येक पटक सोध्नुहोस्"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"तपाईंले निष्क्रिय नपारेसम्म"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> घन्टा</item>
-      <item quantity="one">१ घन्टा</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> मिनेट"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> समयतालिकाहरू स्वतः सक्रिय हुन सक्छन्‌</item>
-      <item quantity="one">१ समयतालिका स्वतः सक्रिय हुन सक्छ</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{१ घन्टा}other{# घन्टा}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{१ मिनेट}other{# मिनेट}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{निष्क्रिय छ}=1{निष्क्रिय छ / एउटा समयतालिका स्वतः अन हुन सक्छ}other{निष्क्रिय छ / # वटा समयतालिका स्वतः अन हुन सक्छन्}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"बाधा नपुर्‍याउनुहोस् नामक सुविधालाई केले निष्क्रिय पार्न सक्छ"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"मान्छेहरू"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"एपहरू"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"न्यून प्राथमिकता भएका सूचनाहरूलाई स्वतः मौन सूचनाका रूपमा सेट गर्नुहोस्"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"अनुकूल पार्न मिल्ने सूचनाहरूको श्रेणीकरण"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"सन्दर्भअनुसार सूचनाहरू स्वतः श्रेणीबद्ध गर्नुहोस्"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"परिस्थितिअनुसार प्राप्त हुने सूचनाबारे प्रतिक्रिया"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"सूचनाहरूमा गरिएको समायोजनबारे सूचित गर्छ र सिस्टमका बारेमा प्रतिक्रिया दिने विकल्प देखाउँछ"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"सिफारिस गरिएका कारबाही तथा जवाफहरू"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"सिफारिस गरिएका कारबाही तथा जवाफहरू स्वतः देखाउनुहोस्"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"हालका र स्नुज गरिएका सूचनाहरू देखाउनुहोस्"</string>
@@ -3575,7 +3566,7 @@
     <string name="allow_interruption" msgid="5237201780159482716">"अवरोधहरूहरूलाई अनुमति दिनुहोस्"</string>
     <string name="allow_interruption_summary" msgid="9044131663518112543">"एपलाई बज्न, कम्पन गर्न र/वा स्क्रिनमा सूचनाहरू पप गर्न दिनुहोस्"</string>
     <string name="notification_priority_title" msgid="5554834239080425229">"प्राथमिकता"</string>
-    <string name="notification_channel_summary_priority" msgid="7225362351439076913">"वार्तालाप खण्डको सिरानमा देखा पर्छ, तैरने बबलका रूपमा देखा पर्छ, लक स्क्रिनमा प्रोफाइल तस्बिर देखाइन्छ"</string>
+    <string name="notification_channel_summary_priority" msgid="7225362351439076913">"वार्तालाप खण्डको सिरानमा देखा पर्छ, तैरने बबलका रूपमा देखा पर्छ, लक स्क्रिनमा प्रोफाइल फोटो देखाइन्छ"</string>
     <string name="convo_not_supported_summary" msgid="4285471045268268048">"<xliff:g id="APP_NAME">%1$s</xliff:g> मा वार्तालापसम्बन्धी धेरैजसो सुविधाहरू प्रयोग गर्न मिल्दैन। तपाईं वार्तालापलाई महत्त्वपूर्ण वार्तालापका रूपमा सेट गर्न सक्नुहुन्न र वार्तालापहरू तैरने बबलका रूपमा देखा पर्दैनन्।"</string>
     <string name="notification_channel_summary_min" msgid="8823399508450176842">"पुल डाउन सेडमा सूचनाहरूलाई एउटा पङ्क्तिमा सङ्क्षिप्त पार्नुहोस्"</string>
     <string name="notification_channel_summary_low" msgid="5549662596677692000">"न घन्टी बज्छ न त कम्पन नै हुन्छ"</string>
@@ -3621,7 +3612,7 @@
     <string name="display_vr_pref_off" msgid="4008841566387432721">"स्क्रिन झिलमिलाउने प्रभाव कम गर्नुहोस्"</string>
     <string name="picture_in_picture_title" msgid="9001594281840542493">"Picture-in-picture"</string>
     <string name="picture_in_picture_empty_text" msgid="9123600661268731579">"स्थापना गरिएका कुनै पनि एपहरूले Picture-in-picture मोडलाई समर्थन गर्दैनन्"</string>
-    <string name="picture_in_picture_keywords" msgid="3605379820551656253">"तस्बिरमा तस्बिर मोडमा तस्बिर"</string>
+    <string name="picture_in_picture_keywords" msgid="3605379820551656253">"फोटोमा फोटो मोडमा फोटो"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4442235098255164650">"Picture-in-picture"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="8544190716075624017">"Picture-in-picture लाई अनुमति दिनुहोस्"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="2503211101305358849">"यो एप खुला रहेको अवस्थामा वा तपाईंले यसलाई छाड्नुभएपछि (उदाहरणका लागि, भिडियो हेर्ने कार्य जारी राख्न) यस एपलाई picture-in-picture विन्डो सिर्जना गर्न अनुमति दिनुहोस्। यो विन्डो तपाईंले प्रयोग गरिरहनुभएका अन्य एपहरूको शीर्ष भागमा देखिन्छ।"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"बाधा नपुर्‍यानुहोस् पहुँच"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"बाधा नपुर्‍याउनुहोस् नामक सुविधा सक्रिय गर्ने अनुमति दिनुहोस्"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"कुनै पनि स्थापित एपहरू द्वारा बाधा नपुर्‍यानुहोस् पहुँच को माग गरेका छैनन्"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"एपहरू लोड हुँदै..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"एपहरू लोड गरिँदै…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"तपाईंको अनुरोधबमोजिम Android ले यस अनुप्रयोगका सूचनाहरूलाई यो यन्त्रमा देखाउन दिइरहेको छैन"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"तपाईंको अनुरोधबमोजिम Android ले सूचनाहरूको यस कोटिलाई यो यन्त्रमा देखिन दिइरहेको छैन"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"तपाईंको अनुरोधबमोजिम Android ले सूचनाहरूको यस समूहलाई यो यन्त्रमा देखाउन दिइरहेको छैन"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"सबै वार्तालापहरू"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"महत्वपूर्ण वार्तालापहरू"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"कुनै पनि होइन"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> वार्तालापहरू</item>
-      <item quantity="one">१ वार्तालाप</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"कुनै पनि होइन"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{कुनै पनि वार्तालाप होइन}=1{एउटा वार्तालाप}other{# वटा वार्तालाप}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"अवरोध गर्न सक्ने कुराहरू"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"कलहरू"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"कलहरू"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"अनुमति दिइएका कलहरू आउँदा घन्टी बजोस् भन्नाका खातिर यन्त्रमा घन्टी बज्ने मोड सक्रिय गरिएको छ भन्ने कुरा सुनिश्चित गर्नुहोस्"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ का आगम कलहरूलाई रोक लगाइएको छ। तपाईं आफ्ना साथीभाइ, परिवारजन वा अन्य सम्पर्कहरूलाई आफूसँग सम्पर्क राख्न दिने गरी सेटिङहरू समायोजन गर्न सक्नुहुन्छ।"</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"ताराङ्कित सम्पर्कहरू"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other">अन्य <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="one">अन्य १</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"कुनै पनि होइन"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{कुनै पनि ताराङ्कित सम्पर्क व्यक्ति होइन}=1{{contact_1}}=2{{contact_1} र {contact_2}}=3{{contact_1}, {contact_2} र {contact_3}}other{{contact_1}, {contact_2} र अरू #}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"सन्देशहरू"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"सन्देशहरू"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Messages"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ का आगम कलहरूलाई रोक लगाइएको छ। तपाईं आफ्ना साथीभाइ, परिवारजन वा अन्य सूचीमा भएका अन्य मान्छेहरूलाई आफूसँग सम्पर्क राख्न दिने गरी सेटिङहरू समायोजन गर्न सक्नुहुन्छ।"</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"\'बाधा नपुर्‍याउनुहोस्\' मोडले कुनै पनि सन्देश रोकिरहेको छैन"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"\'बाधा नपुर्‍याउनुहोस्\' मोडले कुनै पनि आगमन कल रोकिरहेको छैन"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"कुनै पनि होइन"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> सम्पर्क ठेगानाहरू</item>
-      <item quantity="one">१ सम्पर्क ठेगाना</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{सम्पर्क सूचीमा भएका कुनै पनि व्यक्ति होइन}=1{सम्पर्क सूचीमा भएका एक जना व्यक्ति}other{सम्पर्क सूचीमा भएका # जना व्यक्ति}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"जोसुकै"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"सम्पर्क ठेगानाहरू"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"ताराङ्कित सम्पर्क ठेगानाहरू"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"सबै सूचनाहरू"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"केही सूचनाहरू"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"तपाईंले एपहरूलाई बाधा पुर्‍याउन नदिए पनि निश्चित मान्छेहरू अझै पनि तपाईंलाई सम्पर्क गर्न सक्छन्"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> ले अवरोध गर्न सक्छन्</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> ले अवरोध गर्न सक्छ</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"थप <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{कुनै पनि एपले अवरोध गर्न सक्दैन}=1{{app_1} ले अवरोध गर्न सक्छ}=2{{app_1} र {app_2} ले अवरोध गर्न सक्छन्}=3{{app_1}, {app_2} र {app_3} ले अवरोध गर्न सक्छन्}other{{app_1}, {app_2} र अरू # एपले अवरोध गर्न सक्छन्}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"एपहरू"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"सबै सूचनाहरू"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"केही सूचनाहरू"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"अवरोध गर्न सक्ने सूचनाहरू"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"सबै सूचनाहरूलाई अनुमति दिनुहोस्"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> ले अवरोध गर्न सक्छन्</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> ले अवरोध गर्न सक्छ</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"कुनै पनि आवाजले अवरोध गर्न सक्दैन"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"थप <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{कुनै पनि आवाजले अवरोध गर्न सक्दैन}=1{{sound_category_1} ले अवरोध गर्न सक्छ}=2{{sound_category_1} र {sound_category_2} ले अवरोध गर्न सक्छन्}=3{{sound_category_1}, {sound_category_2} र {sound_category_3} ले अवरोध गर्न सक्छन्}other{{sound_category_1}, {sound_category_2} र अरू # आवाजले अवरोध गर्न सक्छन्}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"कुनै पनि आवाजले अवरोध गर्न सक्दैन"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"कोही पनि अवरोध गर्न सक्दैनन्"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"केही मान्छेहरू अवरोध गर्न सक्छन्"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"सबै मान्छेहरू अवरोध गर्न सक्छन्"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"निम्नमध्ये USB नियन्त्रण गर्ने चिज"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"जडान गरिएको यन्त्र"</string>
     <string name="usb_control_device" msgid="527916783743021577">"यो यन्त्र"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"बदल्दै..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"बदलिँदै…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"बदल्न सकिएन"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"यो यन्त्रलाई चार्ज गर्दै"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"जडान गरिएको यन्त्र चार्ज गर्दै"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"विवरणहरू हेर्नुहोस्"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"डेटा सेभर"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"असीमित डेटा"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"पृष्ठभूमिको डेटालाई निष्क्रिय पारियो"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"ब्याकग्राउन्डको डेटा निष्क्रिय पारिएको छ"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"सक्रिय गर्नुहोस्"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"निष्क्रिय गर्नुहोस्"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"डेटा सेभर प्रयोग गर्नुहोस्"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"यदि यन्त्रलाई लक गरिएको छ भने सूचनाहरूमा जवाफ वा अन्य पाठ टाइप गर्न रोक लगाउनुहोस्"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"पूर्वनिर्धारित हिज्जे परीक्षक"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"हिज्जे परीक्षक छनोट गर्नुहोस्"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"हिज्जे जाँचकर्ता प्रयोग गर्नुहोस्"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"हिज्जे जाँचकर्ता प्रयोग गर्नुहोस्"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"चयन गरिएको छैन"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(कुनै पनि होइन)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4429,10 +4400,10 @@
       <item quantity="one">१ सेकेन्ड</item>
     </plurals>
     <string name="automatic_storage_manager_settings" msgid="519158151463974656">"भण्डारणको व्यवस्थापन गर्नुहोस्"</string>
-    <string name="automatic_storage_manager_text" msgid="6900593059927987273">"भण्डारण प्रबन्धकले भण्डारणको ठाउँ खाली गर्न मद्दतका लागि तपाईँको यन्त्रबाट ब्याक अप गरिएका तस्बिर र भिडियोहरू हटाउँदछ।"</string>
-    <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"तस्बिर र भिडियोहरूलाई मेट्नुहोस्"</string>
+    <string name="automatic_storage_manager_text" msgid="6900593059927987273">"भण्डारण प्रबन्धकले भण्डारणको ठाउँ खाली गर्न मद्दतका लागि तपाईँको यन्त्रबाट ब्याक अप गरिएका फोटो र भिडियोहरू हटाउँदछ।"</string>
+    <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"फोटो र भिडियोहरूलाई मेट्नुहोस्"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"भण्डारण प्रबन्धक"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"भण्डारण प्रबन्धक प्रयोग गर्नुहोस्"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"स्टोरेज म्यानेजर प्रयोग गर्नुहोस्"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"स्वतः"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"म्यानुअल"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"अहिले नै ठाउँ खाली गर्नुहोस्"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"फोनको जाँच गर्न डबल-ट्याप गर्नुहोस्"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"ट्याब्लेटको जाँच गर्न डबल-ट्याप गर्नुहोस्"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"यन्त्रको जाँच गर्न डबल-ट्याप गर्नुहोस्"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"सूचनाहरू हेर्न स्वाइप गर्नुहोस्"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"सूचनाहरू हेर्न स्क्रिनमा तलतिर स्वाइप गर्नुहोस्"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"एक हाते मोड"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"एक हाते मोड प्रयोग गर्नुहोस्"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"एउटा एपबाट अर्को एपमा जाँदा बाहिर निस्कनुहोस्"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"समयसीमा समाप्ति"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"४ सेकेन्ड"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"८ सेकेन्ड"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"१२ सेकेन्ड"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"गम्यता"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"समय, सूचना र अन्य जानकारी हेर्न आफ्नो यन्त्रको स्क्रिनमा डबल ट्याप गर्नुहोस्।"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"फोनको जाँच गर्न उठाउनुहोस्"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"ट्याब्लेटको जाँच गर्न उठाउनुहोस्"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"ट्याब्लेटको जाँच गर्न ट्याप गर्नुहोस्"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"यन्त्रको जाँच गर्न ट्याप गर्नुहोस्"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"समय, सूचना र अन्य जानकारी हेर्न आफ्नो यन्त्रको स्क्रिनमा ट्याप गर्नुहोस्।"</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"खतराको सङ्केत दिन प्रयोग हुने बटन"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"द्रुत रूपमा ५ पटक पावर बटन थिचेर आपत्कालीन उद्धार सेवामा सम्पर्क गर्नुहोस्"</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"चेतावनी दिने आवाज"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"आपत्कालीन उद्धार सेवाहरूमा सम्पर्क गर्नुअघि अलर्ट जारी गर्नुहोस्"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"आपत्‌कालीन सम्पर्क सूचीमा व्यक्तिहरू"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"सूचनाहरू प्राप्त गर्न फिंगरप्रिन्ट स्वाइप गर्नुहोस्"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"फिंगरप्रिन्ट स्वाइप गर्नु"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"अफ्ना सूचनाहरूको जाँच गर्न आफ्नो फोनको पछाडिको भागमा रहेको फिंगरप्रिन्ट सेन्सरमा तलतिर स्वाइप गर्नुहोस्।"</string>
@@ -4582,7 +4568,7 @@
     </plurals>
     <string name="app_names_concatenation_template_2" msgid="8320181646458855457">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>"</string>
     <string name="app_names_concatenation_template_3" msgid="7019703249717854148">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>, <xliff:g id="THIRD_APP_NAME">%3$s</xliff:g>"</string>
-    <string name="storage_photos_videos" msgid="6926197783745481869">"तस्बिर र भिडियोहरू"</string>
+    <string name="storage_photos_videos" msgid="6926197783745481869">"फोटो र भिडियोहरू"</string>
     <string name="storage_music_audio" msgid="1185624135490182822">"सङ्गीत तथा अडियो"</string>
     <string name="storage_games" msgid="1176568610086802469">"खेलहरू"</string>
     <string name="storage_other_apps" msgid="5902520888043081176">"अन्य एपहरू"</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"सबै अनुप्रयोगहरूका हकमा सक्षम पार्नुहोस्"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"ग्राफिक्स ड्राइभर चयन गर्नुहोस्"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"पूर्वनिर्धारित"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"गेम ड्राइभर"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"गेम ड्राइभर"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"विकासकर्ताको ड्राइभर"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"प्रणालीको ग्राफिक्स ड्राइभर"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"नेटवर्कहरू फेला पार्न सकिएन। फेरि प्रयास गर्नुहोस्।"</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(निषेध गरिएको)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"SIM कार्ड छैन"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"SIM कार्ड छैन"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"SIM कार्डसम्बन्धी कुनै पनि जानकारी दिइएको छैन"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"कनेक्ट गर्न SIM कार्ड चाहिन्छ"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"कनेक्ट गर्न <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> को SIM कार्ड चाहिन्छ"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"रुचाइएको नेटवर्क मोड: WCDMA रुचाइएको"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"रुचाइएको नेटवर्क मोड: GSM मात्र"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"रुचाइएको नेटवर्क मोड: WCDMA मात्र"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"मोबाइल डेटा"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"मोबाइल नेटवर्क प्रयोग गरी डेटामाथि पहुँच राख्नुहोस्"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"फोन दायरामा हुँदा यस सेवा प्रदायकमा स्वत: स्विच हुने छ"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"कुनै पनि SIM कार्ड उपलब्ध छैन"</string>
     <string name="calls_preference" msgid="2166481296066890129">"कलसम्बन्धी प्राथमिकता"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS सम्बन्धी प्राथमिकता"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"प्रत्येक पटक सोध्नुहोस्"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"सेटिङका स्क्रिनको माथिपट्टि देखिन दिनुहोस्"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"अन्य एपको माथिपट्टि देखिन सक्ने एपहरूलाई सेटिङका स्क्रिनको माथिपट्टि देखिन दिनुहोस्"</string>
     <string name="media_controls_title" msgid="403271085636252597">"मिडिया"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"मिडियाको सत्र सकिएपछि प्लेयर लुकाउनुहोस्"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"प्लेयरले तपाईंलाई विस्तृत गरिएको द्रुत सेटिङको प्यानलबाट कुनै सत्र सुचारु गर्न दिन्छ।"</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"द्रुत सेटिङमा मिडिया प्लेयर"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"सजिलैसँग प्लेब्याक सुचारु गर्न मिडिया प्लेयर लामो अवधिसम्म देखाउनुहोस्"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"प्लेयर लुकाउनुहोस्"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"प्लेयर देखाउनुहोस्"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"कुनै पनि प्लेयर उपलब्ध छैन"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"अनुमति दिइएका एपहरू"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"मिडिया"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"ब्लुटुथ अन हुने छ"</string>
 </resources>
diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
index 4ce02ee..4eb0afd 100644
--- a/res/values-night/colors.xml
+++ b/res/values-night/colors.xml
@@ -27,6 +27,7 @@
     <color name="notification_importance_selection_bg">@*android:color/material_grey_800</color>
     <color name="notification_importance_button_selected">#AECBFA</color> <!-- material blue 200 -->
     <color name="notification_importance_button_unselected">#5F6368</color>
+    <color name="notification_history_background">#202124</color>
     <color name="face_intro_outline">?android:attr/colorAccent</color>
     <!-- Palette list preference colors. -->
     <color name="palette_list_gradient_background">@android:color/black</color>
@@ -37,6 +38,7 @@
     <color name="palette_list_color_cyan">@color/palette_list_dark_mode_color_cyan</color>
     <color name="palette_list_color_blue">@color/palette_list_dark_mode_color_blue</color>
     <color name="palette_list_color_purple">@color/palette_list_dark_mode_color_purple</color>
+    <color name="palette_list_color_gray">@color/palette_list_dark_mode_color_gray</color>
     <color name="gestures_setting_background_color">@android:color/black</color>
 </resources>
 
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index ab29678..766efc7 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Normaal"</item>
     <item msgid="6740026006576843477">"Lang"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Kort"</item>
+    <item msgid="7397961711906421599">"Normaal"</item>
+    <item msgid="4079132024502041928">"Lang"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Standaard"</item>
     <item msgid="4234707448428002595">"Sans Serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Algemeen"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Alleen TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Algemeen"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index c184ed0..e52e484 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -169,7 +169,7 @@
     <string name="proxy_port_label" msgid="4647357286461712574">"Proxy-poort"</string>
     <string name="proxy_exclusionlist_label" msgid="2598613986784917542">"Proxy omzeilen voor"</string>
     <string name="proxy_defaultView_text" msgid="6795150505379688451">"Standaardwaarden herstellen"</string>
-    <string name="proxy_action_text" msgid="1103328484441449542">"Gereed"</string>
+    <string name="proxy_action_text" msgid="1103328484441449542">"Klaar"</string>
     <string name="proxy_hostname_label" msgid="5504327742505848063">"Hostnaam van proxy"</string>
     <string name="proxy_error" msgid="3615905975598084126">"Let op"</string>
     <string name="proxy_error_dismiss" msgid="4207430265140873078">"OK"</string>
@@ -228,7 +228,7 @@
     <string name="okay" msgid="4827099303045669054">"OK"</string>
     <string name="forget" msgid="3754013654135912783">"Vergeten"</string>
     <string name="save" msgid="3125033126936493822">"Opslaan"</string>
-    <string name="done" msgid="7497982645646431310">"Gereed"</string>
+    <string name="done" msgid="7497982645646431310">"Klaar"</string>
     <string name="apply" msgid="7834684883190163536">"Toepassen"</string>
     <string name="share" msgid="8502235338607613795">"Delen"</string>
     <string name="add" msgid="8335206931421683426">"Toevoegen"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Profielinfo weergeven op vergrendelscherm"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Accounts"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Locatie"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Locatie gebruiken"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Locatie gebruiken"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Uit"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">Aan: <xliff:g id="COUNT_1">%1$d</xliff:g> apps hebben toegang tot de locatie</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Gebruik je gezicht voor verificatie"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Starten"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Als de toegankelijkheidsfunctie \'Ontgrendelen via gezichtsherkenning\' is uitgeschakeld, werken sommige instelstappen mogelijk niet goed met TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Terug"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Doorgaan met instellen"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Toegankelijkheidsinst. gebruiken"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -356,7 +359,7 @@
     <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="7768349698547951750">"Tijdlimiet voor gezichtsregistratie is bereikt. Probeer het opnieuw."</string>
     <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3186810411630091490">"Gezichtsregistratie is mislukt"</string>
     <string name="security_settings_face_enroll_finish_title" msgid="5882322568359775393">"Alles is ingesteld."</string>
-    <string name="security_settings_face_enroll_done" msgid="3048687969498187442">"Gereed"</string>
+    <string name="security_settings_face_enroll_done" msgid="3048687969498187442">"Klaar"</string>
     <string name="security_settings_face_enroll_should_re_enroll_title" msgid="9080635904939148410">"Ontgrendelen via gezichtsherkenning verbeteren"</string>
     <string name="security_settings_face_enroll_should_re_enroll_subtitle" msgid="2318506792574194633">"Ontgrendelen via gezicht weer instellen"</string>
     <string name="security_settings_face_enroll_must_re_enroll_title" msgid="8907917317111783249">"Ontgrendelen via gezichtsherkenning weer instellen"</string>
@@ -435,7 +438,7 @@
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Instellen van wachtwoord overslaan?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Instellen patroon overslaan?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="3538784524778508018">"Schermvergrendeling instellen"</string>
-    <string name="security_settings_fingerprint_enroll_done" msgid="9198775984215057337">"Gereed"</string>
+    <string name="security_settings_fingerprint_enroll_done" msgid="9198775984215057337">"Klaar"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="5742429501012827526">"Dat is niet de sensor"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="7172969336386036998">"Raak de sensor achter op je telefoon aan. Gebruik je wijsvinger."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="132085362209418770">"Registratie is niet voltooid"</string>
@@ -619,7 +622,6 @@
       <item quantity="one">Moet minder dan <xliff:g id="NUMBER_0">%d</xliff:g> cijfer bevatten</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Apparaatbeheer staat het gebruik van een recente pincode niet toe"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Veelvoorkomende pincodes worden geblokkeerd door je IT-beheerder. Probeer een andere pincode."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Mag geen ongeldig teken bevatten"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Moet ten minste één letter bevatten"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Moet ten minste één cijfer bevatten"</string>
@@ -653,7 +655,6 @@
       <item quantity="one">Moet ten minste 1 niet-numeriek teken bevatten</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Apparaatbeheer staat het gebruik van een recent wachtwoord niet toe"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Veelvoorkomende wachtwoorden worden geblokkeerd door je IT-beheerder. Probeer een ander wachtwoord."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Een oplopende, aflopende of herhaalde reeks cijfers is niet toegestaan"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Bevestigen"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Annuleren"</string>
@@ -761,7 +762,7 @@
     <string name="wifi_display_details" msgid="2351632307998142920">"Weergave-instellingen"</string>
     <string name="wifi_display_options_title" msgid="7584326966240865043">"Opties voor draadloze weergave"</string>
     <string name="wifi_display_options_forget" msgid="3140558691112356024">"Vergeten"</string>
-    <string name="wifi_display_options_done" msgid="7608851767701954020">"Gereed"</string>
+    <string name="wifi_display_options_done" msgid="7608851767701954020">"Klaar"</string>
     <string name="wifi_display_options_name" msgid="8181334945680312228">"Naam"</string>
     <string name="wifi_band_24ghz" msgid="7322286660245127384">"2,4 GHz"</string>
     <string name="wifi_band_5ghz" msgid="7995204987245404797">"5 GHz"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wifi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Wifi inschakelen"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wifi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Wifi gebruiken"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Wifi gebruiken"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wifi-instellingen"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wifi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Draadloze toegangspunten instellen en beheren"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Centreer de onderstaande QR-code om verbinding te maken met \'<xliff:g id="SSID">%1$s</xliff:g>\'"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Maak verbinding met wifi door een QR-code te scannen"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Wifi delen"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Scan deze QR-code om verbinding te maken met \'<xliff:g id="SSID">%1$s</xliff:g>\' en het wachtwoord te delen"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Scan deze QR-code met een ander apparaat om deel te nemen aan \'<xliff:g id="SSID">%1$s</xliff:g>\'"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Scan deze QR-code om verbinding te maken met \'<xliff:g id="SSID">%1$s</xliff:g>\'"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Probeer het nog eens. Als het probleem zich blijft voordoen, neem je contact op met de fabrikant van het apparaat."</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Er is iets misgegaan"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wifi-wachtwoord: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Wachtwoord hotspot: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Automatisch verbinding maken"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Toestaan dat telefoon automatisch verbinding maakt met dit netwerk"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Toestaan dat tablet automatisch verbinding maakt met dit netwerk"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Verbinding met dit netwerk toestaan indien binnen bereik"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Apparaat toevoegen"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Gebruik een QR-code om een apparaat aan dit netwerk toe te voegen"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR-code heeft geen geldige indeling"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Systeemcertificaten gebruiken"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Niet leveren"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Niet valideren"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Geen certificaat opgegeven. Je verbinding is niet privé."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Netwerknaam is te lang."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Je moet een domein opgeven."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Certificaat vereist."</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Verbinden"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wifi ingeschakeld"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Verbonden met <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Verbinding maken met <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Verbinden…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Kan geen verbinding maken met het netwerk"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Netwerk is niet binnen bereik"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"App deelt content. Als je de internetverbinding wilt delen, schakel je de hotspot uit en weer in."</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Geen wachtwoord ingesteld"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Naam hotspot"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> inschakelen..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> inschakelen…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Andere apparaten kunnen verbinding maken met <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Wachtwoord hotspot"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Frequentieband voor toegangspunt"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Hiermee wordt de vernieuwingssnelheid automatisch verhoogd van 60 naar 90 Hz voor bepaalde content. Het batterijgebruik neemt toe."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Vernieuwingssnelheid van 90 Hz afdwingen"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"De hoogste vernieuwingssnelheid voor verbeterde responsiviteit voor aanraking en animatiekwaliteit. Het batterijgebruik neemt toe."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Schermaandacht"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Aan / Scherm schakelt niet uit als je ernaar kijkt"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android-versie"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android-beveiligingsupdate"</string>
     <string name="model_info" msgid="8997566254717810904">"Model"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Model: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Model en hardware"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Hardwareversie"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Apparatuur-ID"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Netwerkinstellingen zijn gereset"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Kan simkaarten niet wissen"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Door een fout kunnen gedownloade simkaarten niet worden gewist.\n\nStart je apparaat opnieuw en probeer het nogmaals."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Alle gegevens wissen (fabrieksinstellingen terugzetten)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Alle gegevens wissen (fabrieksinstellingen terugzetten)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Hiermee worden alle gegevens in de "<b>"interne opslag"</b>" van je tablet gewist, waaronder:\n\n"<li>"Je Google-account"</li>\n<li>"Gegevens en instellingen van het systeem en de apps"</li>\n<li>"Gedownloade apps"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Hiermee worden alle gegevens in de "<b>"interne opslag"</b>" van je telefoon gewist, waaronder:\n\n"<li>"Je Google-account"</li>\n<li>"Gegevens en instellingen van het systeem en de apps"</li>\n<li>"Gedownloade apps"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Je bent momenteel aangemeld bij de volgende accounts:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Er zijn andere gebruikers aanwezig op dit apparaat.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Muziek"</li>\n<li>"Foto\'s"</li>\n<li>"Andere gebruikersgegevens"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"E-simkaarten"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Je mobiele abonnement wordt niet opgezegd."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Als je muziek, foto\'s en andere gebruikersgegevens wilt wissen, moet de "<b>"USB-opslag"</b>" worden gewist."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Als je muziek, foto\'s en andere gebruikersgegevens wilt wissen, moet de "<b>"SD-kaart"</b>" worden gewist."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Alle gegevens wissen (fabrieksinstellingen terugzetten)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Alle gegevens wissen (fabrieksinstellingen terugzetten)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Hiermee worden alle gegevens in de "<b>"interne opslag"</b>" van je tablet gewist, waaronder:\n\n"<li>"Je Google-account"</li>\n<li>"Gegevens en instellingen van het systeem en de apps"</li>\n<li>"Gedownloade apps"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Hiermee worden alle gegevens in de "<b>"interne opslag"</b>" van je telefoon gewist, waaronder:\n\n"<li>"Je Google-account"</li>\n<li>"Gegevens en instellingen van het systeem en de apps"</li>\n<li>"Gedownloade apps"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Je bent momenteel ingelogd op de volgende accounts:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Er zijn andere gebruikers aanwezig op dit apparaat.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Muziek"</li>\n<li>"Foto\'s"</li>\n<li>"Andere gebruikersgegevens"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"E-simkaarten"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Je mobiele abonnement wordt niet opgezegd."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Als je muziek, foto\'s en andere gebruikersgegevens wilt wissen, moet de "<b>"USB-opslag"</b>" worden gewist."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Als je muziek, foto\'s en andere gebruikersgegevens wilt wissen, moet de "<b>"SD-kaart"</b>" worden gewist."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USB-opslag wissen"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SD-kaart wissen"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Alle gegevens in de interne USB-opslag wissen, zoals muziek en foto\'s"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Alle gegevens op de SD-kaart wissen, zoals muziek en foto\'s"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Alle gegevens wissen"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Alle gegevens wissen"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Al je persoonlijke gegevens en gedownloade apps worden verwijderd. Je kunt deze actie niet ongedaan maken."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Al je persoonlijke informatie wordt verwijderd, inclusief gedownloade apps en simkaarten. Je kunt deze actie niet ongedaan maken."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Alles wissen"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Niet gereset, omdat de service \'Systeem wissen\' niet beschikbaar is."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Alle gegevens wissen?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Terugzetten op fabrieksinstellingen is niet beschikbaar voor deze gebruiker"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Wissen"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Even geduld..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Alle gegevens wissen"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Alle gegevens wissen"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Al je persoonlijke informatie en gedownloade apps worden verwijderd. Je kunt deze actie niet ongedaan maken."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Al je persoonlijke informatie wordt verwijderd, waaronder gedownloade apps en simkaarten. Je kunt deze actie niet ongedaan maken."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Alle gegevens wissen?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Fabrieksinstellingen terugzetten is niet beschikbaar voor deze gebruiker"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Wissen"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Even geduld…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Gespreksinstellingen"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Voicemail, gesprekken doorschakelen, wisselgesprek, beller-ID instellen"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB-tethering"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Kan niet meer dan <xliff:g id="MAXCONNECTION">%1$d</xliff:g> apparaten tetheren."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Tethering van <xliff:g id="DEVICE_NAME">%1$s</xliff:g> wordt opgeheven."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ethernet-tethering"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Internetverbinding van telefoon delen via USB-ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Internetverbinding van deze telefoon delen via ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Gebruik hotspot en tethering om internet aan andere apparaten te leveren via je mobiele dataverbinding. Apps kunnen ook hotspots maken om content te delen met apparaten in de buurt."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Gebruik hotspot en tethering om internet aan andere apparaten te leveren via je wifi- of mobiele dataverbinding. Apps kunnen ook hotspots maken om content te delen met apparaten in de buurt."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Hulp"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Voorkeuren voor ondertiteling"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Vergroting"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Vergrotingsgebied"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Vergroting inschakelen"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Kies de vergrotingsgebieden die je wilt gebruiken als je het scherm vergroot"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Volledig scherm"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Deel van het scherm"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Volledig scherm en deel van het scherm"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Gehele scherm vergroten"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Deel van het scherm vergroten"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Overschakelen naar knop Toegankelijkheid?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Als je drie keer tikken gebruikt om een deel van het scherm te vergroten, worden typen en andere acties vertraagd.\n\nWil je in plaats daarvan de knop Toegankelijkheid gebruiken om te vergroten?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Overschakelen naar knop Toegankelijkheid"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Drie keer tikken blijven gebruiken om te vergroten"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Instellingen voor vergroting"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Vergroten door 3 keer te tikken"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Vergroten met sneltoets"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Aan/uit-knop beëindigt gesprek"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Grote muisaanwijzer"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Animaties verwijderen"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Monogeluid"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Kanalen combineren bij het afspelen van geluid"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Audiobalans"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Links"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Rechts"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Monogeluid"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Kanalen combineren bij het afspelen van geluid"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Audiobalans"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Links"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Rechts"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Standaard"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 seconden"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 seconden"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Trilling bij melding"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Trilling bij bellen"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Tikfeedback"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> gebruiken"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> openen"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Kleurcorrectie gebruiken"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Ondertiteling weergeven"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Alleen voor ondersteunde apps"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> gebruiken"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> openen"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Kleurcorrectie gebruiken"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Ondertiteling weergeven"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Alleen voor ondersteunde apps"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Grootte en stijl van ondertiteling"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Tekstgrootte <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Meer opties"</string>
@@ -2225,14 +2225,14 @@
     <string name="accessibility_shortcut_type_hardware" msgid="4834144210432451916">"Volumetoetsen ingedrukt houden"</string>
     <string name="accessibility_shortcut_type_triple_tap" msgid="7717524216825494543">"Drie keer op het scherm tikken"</string>
     <string name="accessibility_hearingaid_instruction_continue_button" msgid="3367260988024430722">"Doorgaan"</string>
-    <string name="accessibility_hearingaid_title" msgid="427173678199203191">"Gehoorapparaten"</string>
-    <string name="accessibility_hearingaid_not_connected_summary" msgid="3371427366765435743">"Geen gehoorapparaten verbonden"</string>
-    <string name="accessibility_hearingaid_adding_summary" msgid="999051610528600783">"Gehoorapparaten toevoegen"</string>
-    <string name="accessibility_hearingaid_pair_instructions_message" msgid="8913409742121315657">"Als je je gehoorapparaten wilt koppelen, zoek je op het volgende scherm naar je apparaat en tik je erop. Controleer of je gehoorapparaat zich in de koppelingsmodus bevindt."</string>
+    <string name="accessibility_hearingaid_title" msgid="427173678199203191">"Hoortoestellen"</string>
+    <string name="accessibility_hearingaid_not_connected_summary" msgid="3371427366765435743">"Geen hoortoestellen verbonden"</string>
+    <string name="accessibility_hearingaid_adding_summary" msgid="999051610528600783">"Hoortoestellen toevoegen"</string>
+    <string name="accessibility_hearingaid_pair_instructions_message" msgid="8913409742121315657">"Als je je hoortoestellen wilt koppelen, zoek je op het volgende scherm naar je apparaat en tik je erop. Controleer of je hoortoestel zich in de koppelingsmodus bevindt."</string>
     <string name="accessibility_hearingaid_active_device_summary" msgid="509703438222873967">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> actief"</string>
     <plurals name="show_number_hearingaid_count" formatted="false" msgid="776000580683647556">
-      <item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> opgeslagen gehoorapparaten</item>
-      <item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> opgeslagen gehoorapparaat</item>
+      <item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> opgeslagen hoortoestellen</item>
+      <item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> opgeslagen hoortoestel</item>
     </plurals>
     <string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Snelkoppeling aan"</string>
     <string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"Uit"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomalie"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomalie"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomalie"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Grijstinten"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Rood-groen"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Rood-groen"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Blauw-geel"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Achtergrondbeperking"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Toestaan dat de app wordt uitgevoerd op de achtergrond"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"App mag niet worden uitgevoerd op de achtergrond"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Achtergrondgebruik kan niet worden beperkt"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Achtergrondgebruik kan niet worden beperkt"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Achtergrondactiviteit beperken?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Als je de achtergrondactiviteit voor een app beperkt, functioneert de app mogelijk niet meer correct"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Batterijoptimalisatie is niet ingesteld voor deze app. Je kunt de app dus niet beperken.\n\nSchakel eerst batterijoptimalisatie in als je de app wilt beperken."</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Een planning instellen"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Gebruiksduur van de batterij verlengen"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Uitschakelen als opgeladen"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Batterijbesparing wordt uitgeschakeld wanneer je telefoon <xliff:g id="PERCENT">%1$s</xliff:g> batterijlading heeft"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Batterijbesparing wordt uitgeschakeld wanneer je tablet <xliff:g id="PERCENT">%1$s</xliff:g> batterijlading heeft"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Batterijbesparing wordt uitgeschakeld wanneer je apparaat <xliff:g id="PERCENT">%1$s</xliff:g> batterijlading heeft"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Batterijbesparing wordt uitgeschakeld als je telefoon meer dan <xliff:g id="PERCENT">%1$s</xliff:g> batterijlading heeft"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Batterijbesparing wordt uitgeschakeld als je tablet meer dan <xliff:g id="PERCENT">%1$s</xliff:g> batterijlading heeft"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Batterijbesparing wordt uitgeschakeld als je apparaat meer dan <xliff:g id="PERCENT">%1$s</xliff:g> batterijlading heeft"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Inschakelen"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Resetten"</string>
     <string name="tts_play" msgid="2945513377250757221">"Afspelen"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Adaptieve connectiviteit"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Verlengt de batterijduur en verbetert de prestaties van het apparaat door de netwerkverbindingen automatisch te beheren"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Opslag certificaatgegevens"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Een certificaat installeren"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Certificaten vanuit opslag installeren"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Inloggegevens van gebruiker"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Opgeslagen inloggegevens bekijken en aanpassen"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Geavanceerd"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Opslagtype"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Ondersteund door hardware"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Alleen software"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Er zijn geen inloggegevens beschikbaar voor deze gebruiker"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Geïnstalleerd voor VPN en apps"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Geïnstalleerd voor wifi"</string>
@@ -2979,7 +2979,7 @@
     <string name="backup_pw_cancel_button_text" msgid="2244399819018756323">"Annuleren"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="7230385345152138051">"Aanvullende systeemupdates"</string>
     <string name="ssl_ca_cert_warning" msgid="3898387588657346106">"Netwerk kan worden gemonitord"</string>
-    <string name="done_button" msgid="6269449526248267">"Gereed"</string>
+    <string name="done_button" msgid="6269449526248267">"Klaar"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="5491460811755938449">
       <item quantity="other">Certificaten vertrouwen of verwijderen</item>
       <item quantity="one">Certificaat vertrouwen of verwijderen</item>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Betalen bij de betaalautomaat"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Stel een betalings-app in. Houd de achterzijde van je telefoon tegen een terminal met het logo voor contactloos betalen."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Ik snap het"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Meer…"</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Meer…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Standaard betaal-app instellen"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Standaard betaal-app updaten"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Bij een contactloze betaalautomaat betalen met <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Altijd gebruiken voor gesprekken"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Selecteer een simkaart voor gegevens"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Selecteer een simkaart voor sms"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Schakelen naar simkaart voor mobiele data, dit kan even duren…"</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Schakelen naar simkaart voor mobiele data, dit kan even duren…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Bellen met"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Een simkaart selecteren"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"Simkaart <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"routine, planning, batterijbesparing, energiebesparing, batterij, automatisch, procent"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, geavanceerd bellen, bellen via 4G"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"taal toevoegen, een taal toevoegen"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"tekstgrootte"</string>
     <string name="default_sound" msgid="6604374495015245195">"Standaardgeluid"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Volume van ringtone en meldingen op <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Volume, trillen, niet storen"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Opstartgeluiden"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Live ondertiteling"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Media automatisch ondertitelen"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Geen"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> planningen ingesteld</item>
-      <item quantity="one">1 planning ingesteld</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Geen}=1{1 planning ingesteld}other{# planningen ingesteld}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Niet storen"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Alleen meldingen van belangrijke mensen en apps ontvangen"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Onderbrekingen beperken"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Alleen prioriteit"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Aan / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Uit / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Uit"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Aan"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Altijd vragen"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Totdat je uitschakelt"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> uur</item>
-      <item quantity="one">1 uur</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minuten"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> planningen kunnen automatisch worden ingeschakeld</item>
-      <item quantity="one">1 planning kan automatisch worden ingeschakeld</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 uur}other{# uur}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minuut}other{# minuten}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Uit}=1{Uit / 1 planning kan automatisch worden ingeschakeld}other{Uit / # planningen kunnen automatisch worden ingeschakeld}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Waardoor \'Niet storen\' mag worden onderbroken"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Mensen"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Apps"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Meldingen met lagere prioriteit automatisch instellen op Subtiel"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Aanpasbare rangschikking van meldingen"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Meldingen automatisch rangschikken op relevantie"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Aanpasbare meldingsfeedback"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Aanpassingen aan meldingen aangeven en de optie weergeven om feedback te geven aan het systeem"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Voorgestelde acties en antwoorden"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Voorgestelde acties en antwoorden automatisch weergeven"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Recente en gesnoozede meldingen weergeven"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Toegang tot \'Niet storen\'"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"\'Niet storen\' toestaan"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Er zijn geen geïnstalleerde apps die toegang tot \'Niet storen\' hebben aangevraagd"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Apps laden..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Apps laden…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Op jouw verzoek blokkeert Android de weergave van meldingen van deze app op dit apparaat"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Op jouw verzoek blokkeert Android de weergave van deze categorie meldingen op dit apparaat"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Op jouw verzoek blokkeert Android de weergave van deze groep meldingen op dit apparaat"</string>
@@ -3689,7 +3680,7 @@
     <string name="app_notification_row_banned" msgid="4513523107019706924">"Geblokkeerd"</string>
     <string name="app_notification_row_priority" msgid="8100777138078316446">"Prioriteit"</string>
     <string name="app_notification_row_sensitive" msgid="7374688948587174964">"Gevoelig"</string>
-    <string name="app_notifications_dialog_done" msgid="573716608705273004">"Gereed"</string>
+    <string name="app_notifications_dialog_done" msgid="573716608705273004">"Klaar"</string>
     <string name="app_notification_importance_title" msgid="8293193440040799998">"Belang"</string>
     <string name="notification_show_lights_title" msgid="5564315979007438583">"Knipperlicht"</string>
     <string name="notification_vibrate_title" msgid="1422330728336623351">"Trillen"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Alle gesprekken"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Prioriteitsgesprekken"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Geen"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> gesprekken</item>
-      <item quantity="one">1 gesprek</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Geen"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Geen}=1{1 gesprek}other{# gesprekken}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Wie mag onderbreken"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Oproepen"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Oproepen"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Zorg dat je apparaat niet in de stille modus staat, zodat je zeker weet dat het hoorbaar overgaat bij toegestane gesprekken"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Voor \'<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\' worden inkomende gesprekken geblokkeerd. Je kunt de instellingen aanpassen zodat je vrienden, gezinsleden of andere contacten je kunnen bereiken."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Contacten met ster"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> anderen</item>
-      <item quantity="one">1 andere persoon</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Geen"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Geen}=1{{contact_1}}=2{{contact_1} en {contact_2}}=3{{contact_1}, {contact_2} en {contact_3}}other{{contact_1}, {contact_2} en nog # anderen}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Berichten"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"berichten"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Berichten"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Voor \'<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\' worden inkomende berichten geblokkeerd. Je kunt de instellingen aanpassen zodat je vrienden, gezinsleden of andere contacten je kunnen bereiken."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Je ontvangt alle berichten"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Je ontvangt alle oproepen"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Geen"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> contacten</item>
-      <item quantity="one">1 contact</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Geen}=1{1 contact}other{# contacten}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Iedereen"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Contacten"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Contacten met ster"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Alle meldingen"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Bepaalde meldingen"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Geselecteerde mensen kunnen je nog steeds bereiken, ook als je niet toestaat dat apps je onderbreken"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> mogen onderbreken</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> mag onderbreken</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"en nog <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Geen apps mogen onderbreken}=1{{app_1} mag onderbreken}=2{{app_1} en {app_2} mogen onderbreken}=3{{app_1}, {app_2} en {app_3} mogen onderbreken}other{{app_1}, {app_2} en nog # mogen onderbreken}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Apps"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Alle meldingen"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Bepaalde meldingen"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Meldingen die mogen onderbreken"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Alle meldingen toestaan"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> mogen onderbreken</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> mag onderbreken</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Niets mag onderbreken"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"en nog <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Niets mag onderbreken}=1{{sound_category_1} mag onderbreken}=2{{sound_category_1} en {sound_category_2} mogen onderbreken}=3{{sound_category_1}, {sound_category_2} en {sound_category_3} mogen onderbreken}other{{sound_category_1}, {sound_category_2} en nog # mogen onderbreken}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Niets mag onderbreken"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Niemand mag onderbreken"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Bepaalde mensen mogen onderbreken"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Alle mensen mogen onderbreken"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB beheerd door"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Verbonden apparaat"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Dit apparaat"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Overschakelen..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Overschakelen…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Kan niet schakelen"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Dit apparaat wordt opgeladen"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Verbonden apparaat wordt opgeladen"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Details bekijken"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Databesparing"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Onbeperkte data"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Achtergrondgegevens zijn uitgeschakeld"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Achtergrondgegevens zijn uitgeschakeld"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Aan"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Uit"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Databesparing gebruiken"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Het typen van reacties of andere tekst in meldingen blokkeren als het apparaat is vergrendeld"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Standaard spellingcontrole"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Spellingcontrole kiezen"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Spellingcontrole gebruiken"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Spellingcontrole gebruiken"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Niet geselecteerd"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(geen)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Opslagbeheer verwijdert foto\'s en video\'s waarvan een back-up is gemaakt, van je apparaat om opslagruimte vrij te maken."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Foto\'s en video\'s verwijderen"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Opslagbeheer"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Opslagbeheer gebruiken"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Opslagbeheer gebruiken"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automatisch"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Handmatig"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Nu ruimte vrijmaken"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Dubbeltikken om telefoon te checken"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Dubbeltikken om tablet te checken"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Dubbeltikken om apparaat te checken"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Swipen voor meldingen"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Swipe omlaag op de onderste rand van het scherm om je meldingen te bekijken"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Bediening met één hand"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Bediening met één hand gebruiken"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Afsluiten bij schakelen tussen apps"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Time-out"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 seconden"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 seconden"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 seconden"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"bediening met één hand"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Dubbeltik op je scherm om de tijd, meldingen en andere informatie te bekijken."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Oppakken om telefoon te checken"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Oppakken om tablet te checken"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Tik om tablet te controleren"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Tik om apparaat te controleren"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Tik op je scherm om de tijd, meldingen en andere informatie te bekijken."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Paniekknop"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Start de SOS-acties voor noodgevallen door snel vijf keer op de aan/uit-knop te drukken."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Waarschuwingsgeluid"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Waarschuwingsgeluid voordat de acties worden gestart"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Contacten voor noodgevallen"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Over vingerafdruksensor swipen voor meldingen"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Over vingerafdruk swipen"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Als je je meldingen wilt bekijken, swipe je omlaag over de vingerafdruksensor achter op je telefoon."</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Inschakelen voor alle apps"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Grafisch stuurprogramma selecteren"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Standaard"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Game Driver"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Game Driver"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Stuurprogramma voor ontwikkelaars"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Grafisch stuurprogramma voor systeem"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Kan geen netwerken vinden. Probeer het opnieuw."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(niet toegestaan)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Geen simkaart"</string>
+    <string name="sim_card" msgid="6381158752066377709">"Simkaart"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Geen simkaart"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Geen"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Simkaart vereist voor verbinding"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Simkaart van <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> vereist voor verbinding"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Voorkeursnetwerkmodus: voorkeur voor WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Voorkeursnetwerkmodus: alleen GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Voorkeursnetwerkmodus: alleen WCDMA"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobiele data"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Datatoegang via mobiel netwerk"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Telefoon schakelt automatisch over naar deze provider als deze binnen bereik is"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Geen simkaart beschikbaar"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Voorkeur voor gesprekken"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Sms-voorkeuren"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Altijd vragen"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Schermoverlays toestaan voor Instellingen"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Toestaan dat apps die vóór andere apps kunnen worden weergegeven, vóór instellingsschermen worden weergegeven"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Media"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Speler verbergen als de mediasessie is afgelopen"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Met de speler kun je een sessie hervatten vanuit het uitgevouwen deelvenster \'Snelle instellingen\'."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Mediaspeler in Snelle instellingen"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Mediaspeler langer weergeven om afspelen makkelijker te hervatten"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Speler verbergen"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Speler weergeven"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Geen spelers beschikbaar"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Toegestane apps"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"media"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth wordt ingeschakeld"</string>
 </resources>
diff --git a/res/values-or/arrays.xml b/res/values-or/arrays.xml
index 7bf9193..bf3b84b 100644
--- a/res/values-or/arrays.xml
+++ b/res/values-or/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"ମଧ୍ୟମ"</item>
     <item msgid="6740026006576843477">"ଲମ୍ଵା"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"ଛୋଟ"</item>
+    <item msgid="7397961711906421599">"ମଧ୍ୟମ"</item>
+    <item msgid="4079132024502041928">"ଲମ୍ଵା"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"ପୂର୍ବ-ନିର୍ଦ୍ଧାରିତ"</item>
     <item msgid="4234707448428002595">"ସାନ୍ସ-ସେରିଫ୍‌"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"ଗ୍ଲୋବାଲ୍"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"କେବଳ TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"ଗ୍ଲୋବାଲ୍"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index c2bc132..2af8921 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"ଲକ୍‌ ସ୍କ୍ରୀନ୍‌ରେ ପ୍ରୋଫାଇଲ୍‌ ସୂଚନା ଦେଖନ୍ତୁ"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"ଆକାଉଣ୍ଟ"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"ଲୋକେସନ୍‌"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"ଲୋକେସନ୍ ବ୍ୟବହାର କରନ୍ତୁ"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"ଲୋକେସନ୍ ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"ବନ୍ଦ"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">ଚାଲୁ - <xliff:g id="COUNT_1">%1$d</xliff:g>ଟି ଆପର ଲୋକେସନ୍‌କୁ ଆକ୍ସେସ୍ ଅଛି</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"ପ୍ରମାଣ ପାଇଁ ଆପଣଙ୍କର ମୁହଁକୁ ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"ଆରମ୍ଭ କରନ୍ତୁ"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"ଯଦି ଆକ୍ସେସିବିଲିଟୀ ଫେସ୍ ଅନଲକ୍ ବନ୍ଦ କରାଯାଇଛି, ତେବେ TalkBack ସହ କିଛି ସେଟଅପ୍ ଷ୍ଟେପ୍ ସଠିକ୍ ଭାବରେ କାମ କରିନପାରେ।"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"ପଛକୁ ଯାଅ"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"ସେଟଅପ୍ ଜାରି ରଖନ୍ତୁ"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"ଆକ୍ସେସିବିଲିଟୀ ସେଟ୍‌ଅପ୍‌ ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="one"><xliff:g id="NUMBER_0">%d</xliff:g> ଅଙ୍କରୁ କମ୍‌ ହେବା ଦରକାର</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"ଏକ ସାମ୍ପ୍ରତିକ ପିନ୍‌ର ବ୍ୟବହାରକୁ ଡିଭାଇସ୍‌ ଆଡ୍‌ମିନ୍‌ ଅନୁମତି ଦେବନାହିଁ"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"ସାଧାରଣ PINଗୁଡିକ ଆପଣଙ୍କ IT ଆଡମିନ୍‌ଙ୍କ ଦ୍ୱାରା ଅବରୋଧ କରିଦିଆଯାଇଛି। ଭିନ୍ନ PIN ଚେଷ୍ଟା କରନ୍ତୁ।"</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"ଏକ ଭୁଲ ଅକ୍ଷରକୁ ଏହା ମିଶାଇ ପାରିବନାହିଁ"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"ଅତିକମ୍‌ରେ ଗୋଟିଏ ଅକ୍ଷର ରହିବା ଦରକାର"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"ଅତିକମ୍‌ରେ ଗୋଟିଏ ସଂଖ୍ୟା ରହିବା ଜରୁରୀ"</string>
@@ -653,7 +655,6 @@
       <item quantity="one">ଅତିକମ୍‌ରେ 1ଟି ଅକ୍ଷର ହେବା ନିହାତି ଆବଶ୍ୟକ ଯାହା ସଂଖ୍ୟା ହୋଇନଥିବା</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"ଏକ ସମ୍ପ୍ରତି ପାସ୍‌ୱର୍ଡ ବ୍ୟବହାର କରିବାକୁ ଡିଭାଇସ୍‌ ଆଡମିନ୍‌ ଅନୁମତି ଦିଅନ୍ତି ନାହିଁ"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"ଆପଣଙ୍କର ଆଇଟି ଆଡ୍‌ମିନ୍‌ ଦ୍ୱାରା ସାଧାରଣ ପାସ୍‌ୱର୍ଡଗୁଡ଼ିକୁ ରୋକିଦିଆଯାଇଛି। ଏକ ଭିନ୍ନ ପାସ୍‌ୱର୍ଡ ଦିଅନ୍ତୁ।"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"ସଂଖ୍ୟାର କ୍ରମବୃଦ୍ଧି, କ୍ରମହ୍ରାସ, କିମ୍ବା ପୁନରାବୃତ୍ତ କ୍ରମ ଅନୁମୋଦିତ ନୁହେଁ"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"ନିଶ୍ଚିତ"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"କ୍ୟାନ୍ସଲ୍‌ କରନ୍ତୁ"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"ୱାଇଫାଇ"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"ୱାଇ-ଫାଇ ଅନ୍‌ କରନ୍ତୁ"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"ୱାଇ-ଫାଇ"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"ୱାଇ-ଫାଇ ବ୍ୟବହାର କରନ୍ତୁ"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"ୱାଇ-ଫାଇ ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"ୱାଇ-ଫାଇ ସେଟିଂସ୍"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"ୱାଇ-ଫାଇ"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"ୱାୟର୍‌ଲେସ୍‌ ଆକ୍ସେସ୍‌ ପଏଣ୍ଟର ସେଟ୍‌ଅପ୍‍ ଓ ପରିଚାଳନା"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"“<xliff:g id="SSID">%1$s</xliff:g>” ସହ ସଂଯୋଗ କରିବାକୁ ନିମ୍ନରେ ଥିବା କେନ୍ଦ୍ରକୁ ଆଣନ୍ତୁ"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"ଗୋଟିଏ QR କୋଡ୍ ସ୍କାନ୍‌ କରି ୱାଇ-ଫାଇରେ ଯୋଗ ଦିଅନ୍ତୁ"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"ୱାଇ-ଫାଇ ସେୟାର୍‌ କରନ୍ତୁ"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"“<xliff:g id="SSID">%1$s</xliff:g>” ସହ ସଂଯୋଗ କରିବାକୁ ଏହି QR କୋଡ୍ ସ୍କାନ୍ କରନ୍ତୁ ଏବଂ ପାସୱାର୍ଡ ସେୟାର୍ କରନ୍ତୁ"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"“<xliff:g id="SSID">%1$s</xliff:g>”ରେ ଯୋଗଦେବାକୁ, ଏହି QR କୋଡକୁ ଅନ୍ୟ ଏକ ଡିଭାଇସରେ ସ୍କାନ୍ କରନ୍ତୁ"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"“<xliff:g id="SSID">%1$s</xliff:g>”କୁ ସଂଯୋଗ କରିବାକୁ ଏହି QR କୋଡ୍ ସ୍କାନ୍ କରନ୍ତୁ"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ। ଯଦି ସମସ୍ୟା ଜାରି ରୁହେ, ଡିଭାଇସ୍‍ର ନିର୍ମାତାଙ୍କୁ ଯୋଗାଯୋଗ କରନ୍ତୁ"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"କିଛି ଭୁଲ ହୋଇଗଲା"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"ୱାଇ-ଫାଇ ପାସୱାର୍ଡ: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"ହଟସ୍ପଟ୍ ପାସୱାର୍ଡ: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"ସ୍ଵତଃ-ସଂଯୋଗ"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"ଏହି ନେଟୱାର୍କର ପାଖାପାଖି ହେଲେ ଫୋନକୁ ସ୍ୱଚାଳିତ ଭାବେ ସଂଯୋଗ ହେବାକୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"ଏହି ନେଟୱାର୍କର ପାଖାପାଖି ହେଲେ ଟାବଲେଟକୁ ସ୍ୱଚାଳିତ ଭାବେ ସଂଯୋଗ ହେବାକୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"ରେଞ୍ଜରେ ରହିଲେ ଏହି ନେଟୱାର୍କକୁ ସଂଯୋଗ ପାଇଁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"ଡିଭାଇସ୍‌ ଯୋଗ କରନ୍ତୁ"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"ଏହି ନେଟ୍‌ୱାର୍କରେ ଏକ ଡିଭାଇସ୍ ଯୋଗ କରିବା ପାଇଁ ଏକ QR କୋଡ୍ ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR କୋଡ୍ ଏକ ବୈଧ ଫର୍ମାଟ୍ ନୁହେଁ"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"ସିଷ୍ଟମ୍‌ ସାର୍ଟିଫିକେଟ ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"ପ୍ରଦାନ କରନ୍ତୁ ନାହିଁ"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"ବୈଧ କରନ୍ତୁ ନାହିଁ"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"କୌଣସି ସର୍ଟିଫିକେଟ୍‌ ଦର୍ଶାଯାଇନାହିଁ। ଆପଣଙ୍କ ସଂଯୋଗ ଗୋପନ ରହିବ ନାହିଁ।"</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"ନେଟୱାର୍କ ନାମ ବହୁତ ଲମ୍ଵା ଅଟେ।"</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"ନିଶ୍ଚିତ ଭାବେ ଏକ ଡୋମେନ୍‌ ଦେବାକୁ ପଡ଼ିବ।"</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"ସାର୍ଟିଫିକେଟ ଆବଶ୍ୟକ।"</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"ସଂଯୋଗ କରନ୍ତୁ"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"ୱାଇ-ଫାଇ ଅନ୍‍ ଅଛି"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ସହ ସଂଯୁକ୍ତ ହୋଇଛି"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ସହ ସଂଯୋଗ ହେଉଛି"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"ସଂଯୋଗ ହେଉଛି…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"ନେଟ୍‌ୱର୍କକୁ ସଂଯୋଗ କରିପାରିଲା ନାହିଁ।"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"ନେଟ୍‌ୱର୍କ ପରିସୀମା ମଧ୍ୟରେ ନାହିଁ"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"ଆପ୍‍ କଣ୍ଟେଣ୍ଟ ଶେୟର୍ କରୁଛି। ଇଣ୍ଟରନେଟ୍‌ ସଂଯୋଜନା ଶେୟାର କରିବାକୁ, ହଟ୍‌ସ୍ପଟ୍‌ ଅଫ୍‌ କରି ଅନ୍‌ କରନ୍ତୁ"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"କୌଣସି ପାସ୍‌ୱାର୍ଡ୍‌ ସେଭ୍‌ ହୋଇନାହିଁ"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"ହଟସ୍ପଟ୍‌ ନାମ"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ଅନ୍‌ ହେଉଛି..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ଚାଲୁ କରାଯାଉଛି…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ସହ ଅନ୍ୟ ଡିଭାଇସ୍‌ଗୁଡ଼ିକ ସଂଯୁକ୍ତ ହୋଇପାରିବ"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"ହଟସ୍ପଟ୍‌ ପାସ୍‌ୱାର୍ଡ"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP ବ୍ୟାଣ୍ଡ"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"ସ୍ମୁଥ୍ ଡିସପ୍ଲେ"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"କିଛି ବିଷୟବସ୍ତୁ ପାଇଁ ରିଫ୍ରେସ୍ ରେଟ୍ ସ୍ୱଚାଳିତ ଭାବରେ 60ରୁ 90 Hz ପର୍ଯ୍ୟନ୍ତ ବଢ଼ାଇଥାଏ। ବ୍ୟାଟେରୀର ବ୍ୟବହାର ବଢ଼ାଇଥାଏ।"</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"ସ୍ମୁଥ୍ ଡିସପ୍ଲେ"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"90 Hz ରିଫ୍ରେସ୍ ହାର ଲାଗୁ କରନ୍ତୁ"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"ଉନ୍ନତ ସ୍ପର୍ଶ ପ୍ରତିକ୍ରିୟା ଓ ଆନିମେସନ୍ ଗୁଣବତ୍ତା ପାଇଁ ସର୍ବାଧିକ ରିଫ୍ରେସ୍ ରେଟ୍। ବ୍ୟାଟେରୀର ବ୍ୟବହାର ବଢ଼ାଇଥାଏ।"</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"ସ୍କ୍ରିନ୍ ଆଟେନ୍‌ସନ୍"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"ଯଦି ଆପଣ ଏହାକୁ ଦେଖୁଥିବେ ତେବେ ଚାଲୁ / ସ୍କ୍ରିନ୍ ବନ୍ଦ ହେବ ନାହିଁ"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android ଭର୍ସନ୍‌"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android ସୁରକ୍ଷା ଅପଡେଟ୍"</string>
     <string name="model_info" msgid="8997566254717810904">"ମଡେଲ୍‌"</string>
-    <string name="model_summary" msgid="2246651782442466213">"ମଡେଲ୍‌: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"ମଡେଲ୍‌ ଓ ହାର୍ଡୱେର୍"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"ହାର୍ଡୱେର୍‌ ଭର୍ସନ୍‌"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ଉପକରଣ ଆଇଡି"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"ନେଟ୍‌ୱର୍କ ସେଟିଙ୍ଗକୁ ରିସେଟ୍‌ କରିଦିଆଯାଇଛି"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"SIMକୁ ଖାଲି କରିହେବ ନାହିଁ"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"ଏକ ତ୍ରୁଟି ଯୋଗୁଁ ଡାଉନଲୋଡ୍ ହୋଇଥିବା SIMଗୁଡ଼ିକ ଲିଭାଯାଇ ପାରିବାନାହିଁ।\n\nଆପଣଙ୍କର ଡିଭାଇସ୍‌କୁ ରିଷ୍ଟାର୍ଟ କରନ୍ତୁ ଏବଂ ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ।"</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"ସମସ୍ତ ଡାଟା ଖାଲି କରିଦିଅନ୍ତୁ (ଫ୍ୟାକ୍ଟୋରୀ ରିସେଟ୍‌)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"ସମସ୍ତ ଡାଟା ଖାଲି କରିଦିଅନ୍ତୁ (ଫ୍ୟାକ୍ଟୋରୀ ରିସେଟ୍‌)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"ଏହା, ଆପଣଙ୍କ ଟାବ୍‍‍ଲେଟ୍‍ର "<b>"ଇଣ୍ଟର୍ନଲ୍ ଷ୍ଟୋରେଜ୍‍‍"</b>"ରେ ଥିବା ସମସ୍ତ ଡାଟାକୁ ଖାଲି କରିଦେବ, ଯେପରିକି:\n\n"<li>"ଆପଣଙ୍କ Google ଆକାଉଣ୍ଟ"</li>\n<li>"ସିଷ୍ଟମ ଓ ଆପ୍ ଡାଟା ଓ ସେଟିଂସ୍"</li>\n<li>"ଡାଉନ୍‌ଲୋଡ୍‌ ହୋଇଥିବା ଆପ୍ "</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"ଏହା ଆପଣଙ୍କ ଫୋନ୍‍ର "<b>"ଇଣ୍ଟର୍ନଲ୍ ଷ୍ଟୋରେଜ୍"</b>"ରେ ଥିବା ସମସ୍ତ ଡାଟା ସହିତ ଏସବୁକୁ ମଧ୍ୟ ଖାଲି କରିଦେବ:\n\n"<li>"ଆପଣଙ୍କ Google ଆକାଉଣ୍ଟ"</li>\n<li>"ସିଷ୍ଟମ ଓ ଆପ୍ ଡାଟା ଓ ସେଟିଂସ୍"</li>\n<li>"ଡାଉନ୍‌ଲୋଡ୍‌ ହୋଇଥିବା ଆପ୍"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"ଆପଣ ବର୍ତ୍ତମାନ ନିମ୍ନ ଆକାଉଣ୍ଟଗୁଡ଼ିକରେ ସାଇନ୍‌ ଇନ୍‌ କରିଛନ୍ତି:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"ଏହି ଡିଭାଇସ୍‌ରେ ଅନ୍ୟ ଉପଯୋଗକର୍ତ୍ତାମାନେ ଅଛନ୍ତି।\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"ମ୍ୟୁଜିକ୍‌"</li>\n<li>"ଫଟୋ"</li>\n<li>"ଅନ୍ୟ ଉପଯୋଗକର୍ତ୍ତାଙ୍କ ଡାଟା"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIMs"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"ଏହା ଆପଣଙ୍କ ମୋବାଇଲ୍‌ ସେବା ପ୍ଲାନ୍‌ ବାତିଲ୍‌ କରିବ ନାହିଁ।"</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"ସଙ୍ଗୀତ, ଛବି ଓ ଅନ୍ୟାନ୍ୟ ଉପଯୋଗକର୍ତ୍ତା ଡାଟାକୁ ସଫା କରିବା ପାଇଁ "<b>"USB ଷ୍ଟୋରେଜ୍‌"</b>"କୁ ଖାଲି କରିବା ଆବଶ୍ୟକ।"</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"ମ୍ୟୁଜିକ୍‌, ଛବି ଓ ଉପଯୋଗକର୍ତ୍ତାଙ୍କ ଅନ୍ୟାନ୍ୟ ଡାଟାକୁ ସଫା କରିବାକୁ, "<b>"SD କାର୍ଡ"</b>" ଲିଭାଯିବା ଆବଶ୍ୟକ କରେ।"</string>
+    <string name="main_clear_title" msgid="277664302144837723">"ସମସ୍ତ ଡାଟା ଖାଲି କରନ୍ତୁ (ଫ୍ୟାକ୍ଟୋରୀ ରିସେଟ୍)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"ସମସ୍ତ ଡାଟା ଖାଲି କରନ୍ତୁ (ଫ୍ୟାକ୍ଟୋରୀ ରିସେଟ୍)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"ଏହା, ଆପଣଙ୍କ ଟାବଲେଟର "<b>"ଇଣ୍ଟର୍ନଲ୍ ଷ୍ଟୋରେଜ"</b>"ରେ ଥିବା ସମସ୍ତ ଡାଟା ସମେତ ଏହି ସବୁ ମଧ୍ୟ ଖାଲି କରିଦେବ:\n\n"<li>"ଆପଣଙ୍କ Google ଆକାଉଣ୍ଟ"</li>\n<li>"ସିଷ୍ଟମ ଏବଂ ଆପ୍ ଡାଟା ଓ ସେଟିଂସ୍"</li>\n<li>"ଡାଉନଲୋଡ୍ ହୋଇଥିବା ଆପଗୁଡ଼ିକ"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"ଏହା, ଆପଣଙ୍କ ଫୋନର "<b>"ଇଣ୍ଟର୍ନଲ୍ ଷ୍ଟୋରେଜ୍"</b>"ରେ ଥିବା ସମସ୍ତ ଡାଟା ସମେତ ଏହି ସବୁ ମଧ୍ୟ ଖାଲି କରିଦେବ:\n\n"<li>"ଆପଣଙ୍କ Google ଆକାଉଣ୍ଟ"</li>\n<li>"ସିଷ୍ଟମ ଏବଂ ଆପ୍ ଡାଟା ଓ ସେଟିଂସ୍"</li>\n<li>"ଡାଉନଲୋଡ୍ ହୋଇଥିବା ଆପଗୁଡ଼ିକ"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"ଆପଣ ବର୍ତ୍ତମାନ ନିମ୍ନୋକ୍ତ ଆକାଉଣ୍ଟଗୁଡ଼ିକରେ ସାଇନ୍ ଇନ୍ କରିଛନ୍ତି:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"ଏହି ଡିଭାଇସରେ ଅନ୍ୟ ଉପଯୋଗକର୍ତ୍ତା ଅଛନ୍ତି।\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"ସଙ୍ଗୀତ"</li>\n<li>"ଫଟୋ"</li>\n<li>"ଅନ୍ୟ ଉପଯୋଗକର୍ତ୍ତା ଡାଟା"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIMs"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"ଏହା ଆପଣଙ୍କ ମୋବାଇଲ ସେବା ପ୍ଲାନକୁ ବାତିଲ୍ କରିବ ନାହିଁ।"</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"ସଙ୍ଗୀତ, ଛବି ଓ ଅନ୍ୟ ଉପଯୋଗକର୍ତ୍ତା ଡାଟାକୁ ଖାଲି କରିବାକୁ "<b>"USB ଷ୍ଟୋରେଜ୍"</b>"କୁ ଖାଲି କରିବା ଆବଶ୍ୟକ।"</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"ସଙ୍ଗୀତ, ଛବି ଓ ଅନ୍ୟ ଉପଯୋଗକର୍ତ୍ତା ଡାଟାକୁ ଖାଲି କରିବାକୁ "<b>"SD କାର୍ଡ"</b>"କୁ ଖାଲି କରିବା ଆବଶ୍ୟକ।"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USB ଷ୍ଟୋରେଜ୍‌କୁ ଲିଭାନ୍ତୁ"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SD କାର୍ଡ ଲିଭାନ୍ତୁ"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"ଇଣ୍ଟର୍‌ନଲ୍ USB ଷ୍ଟୋରେଜ୍‌ରେ ସମସ୍ତ ଡାଟା ଲିଭାନ୍ତୁ, ଯେପରିକି ମ୍ୟୁଜିକ୍‌ କିମ୍ବା ଫଟୋଗୁଡ଼ିକ"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"SD କାର୍ଡ୍‌ରୁ ସମସ୍ତ ଡାଟା ଲିଭାଇଦିଅନ୍ତୁ, ଯେପରିକି ମ୍ୟୁଜିକ୍‌ କିମ୍ବା ଫଟୋଗୁଡ଼ିକ"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"ସମସ୍ତ ଡାଟା ଖାଲି କରନ୍ତୁ"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"ସମସ୍ତ ଡାଟା ଖାଲି କରନ୍ତୁ"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"ଆପଣଙ୍କର ସମସ୍ତ ବ୍ୟକ୍ତିଗତ ସୂଚନା ଏବଂ ଡାଉନଲୋଡ୍‌ କରିଥିବା ଆପ୍‌ଗୁଡ଼ିକ ଡିଲିଟ୍ ହୋଇଯିବ। ଆପଣ ଏହି କାର୍ଯ୍ୟକୁ ପୂର୍ବବତ୍ କରିପାରିବେ ନାହିଁ।"</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"ଆପଣଙ୍କର ସମସ୍ତ ବ୍ୟକ୍ତିଗତ ସୂଚନା ସମେତ ଡାଉନଲୋଡ୍ କରିଥିବା ଆପ୍ସ &amp; SIM ଡିଲିଟ୍ ହୋଇଯିବ। ଆପଣ ଏହି କାର୍ଯ୍ୟକୁ ପୂର୍ବବତ୍ କରିପାରିବେ ନାହିଁ।"</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"ସବୁକିଛି ଖାଲି କରିଦିଅନ୍ତୁ"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"ରିସେଟ୍‌ କରାଯାଇନାହିଁ, କାରଣ ସିଷ୍ଟମ୍‌ କ୍ଲିଅର୍ ସର୍ଭିସ୍ ଉପଲବ୍ଧ ନାହିଁ"</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"ସମସ୍ତ ଡାଟା ଖାଲି କରିବେ?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"ଏହି ଉପଯୋଗକର୍ତ୍ତାଙ୍କ ପାଇଁ ଫ୍ୟାକ୍ଟୋରୀ ରିସେଟ୍‌ ଉପଲବ୍ଧ ନାହିଁ"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"ଲିଭାଉଛି"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"ଦୟାକରି ଅପେକ୍ଷା କରନ୍ତୁ..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"ସମସ୍ତ ଡାଟା ଖାଲି କରନ୍ତୁ"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"ସମସ୍ତ ଡାଟା ଖାଲି କରନ୍ତୁ"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"ଆପଣଙ୍କର ସମସ୍ତ ବ୍ୟକ୍ତିଗତ ସୂଚନା ଏବଂ ଡାଉନଲୋଡ୍ କରାଯାଇଥିବା ଆପ୍ ଡିଲିଟ୍ ହୋଇଯିବ। ଆପଣ ଏହି କାର୍ଯ୍ୟକୁ ପୂର୍ବବତ୍ କରିପାରିବେ ନାହିଁ।"</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"ଡାଉନଲୋଡ୍ କରାଯାଇଥିବା ଆପ୍ ଓ SIM ସମେତ ଆପଣଙ୍କର ସମସ୍ତ ବ୍ୟକ୍ତିଗତ ସୂଚନା ଡିଲିଟ୍ ହୋଇଯିବ। ଆପଣ ଏହି କାର୍ଯ୍ୟକୁ ପୂର୍ବବତ୍ କରିପାରିବେ ନାହିଁ।"</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"ସମସ୍ତ ଡାଟା ଖାଲି କରିବେ?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"ଏହି ଉପଯୋଗକର୍ତ୍ତାଙ୍କ ପାଇଁ ଫ୍ୟାକ୍ଟୋରୀ ରିସେଟ୍ ଉପଲବ୍ଧ ନାହିଁ"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"ଖାଲି କରାଯାଉଛି"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"ଦୟାକରି ଅପେକ୍ଷା କରନ୍ତୁ…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"କଲ୍‌ ସେଟିଂସ୍"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"ଭଏସ୍‌ମେଲ୍‌, କଲ୍‌ ଫର୍‌ୱାର୍ଡିଙ୍ଗ, କଲ୍‌ ୱେଟିଙ୍ଗ, କଲର୍‌ ID ସେଟ୍‌ କରନ୍ତୁ"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB ଟିଥରିଂ"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> ଡିଭାଇସ୍‌ଠାରୁ ଅଧିକ ସହ ଟିଥର୍‌ କରିପାରିବ ନାହିଁ।"</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>କୁ ଅନ୍‌ଟିଥର୍ କରାଯିବ"</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"ଇଥରନେଟ୍ ଟିଥେରିଂ"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"USB ଇଥରନେଟ୍ ମାଧ୍ୟମରେ ଫୋନର ଇଣ୍ଟର୍ନେଟ୍ ସଂଯୋଗ ସେୟାର୍ କରନ୍ତୁ"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"ଇଥରନେଟ୍ ମାଧ୍ୟମରେ ଫୋନର ଇଣ୍ଟରନେଟ୍ ସଂଯୋଗ ସେୟାର୍ କରନ୍ତୁ"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"ଆପଣଙ୍କ ମୋବାଇଲ୍‌ ଡାଟା ସଂଯୋଗ ମାଧ୍ୟମରେ ଅନ୍ୟ ଡିଭାଇସଗୁଡିକୁ ଇଣ୍ଟରନେଟ୍‌ ପ୍ରଦାନ କରିବା ପାଇଁ ହଟସ୍ପଟ୍ ଏବଂ ଟିଥରିଂ ବ୍ୟବହାର କରନ୍ତୁ। ଆଖପାଖରେ ଥିବା ଡିଭାଇସ୍‌ଗୁଡ଼ିକ ସହ କଣ୍ଟେଣ୍ଟ ସେୟାର୍‌ କରିବାକୁ ଆପ୍‌ଗୁଡ଼ିକ ମଧ୍ୟ ଗୋଟିଏ ହଟ୍‌ସ୍ପଟ୍‌ ତିଆରି କରିପାରିବେ।"</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"ଆପଣଙ୍କ ୱାଇ-ଫାଇ ବା ମୋବାଇଲ୍ ଡାଟା ସଂଯୋଗ ମାଧ୍ୟମରେ ଅନ୍ୟ ଡିଭାଇସକୁ ଇଣ୍ଟର୍ନେଟ୍ ପ୍ରଦାନ କରିବାକୁ ହଟସ୍ପଟ୍ ଏବଂ ଟିଥରିଂ ବ୍ୟବହାର କରନ୍ତୁ। ନିକଟସ୍ଥ ଡିଭାଇସଗୁଡ଼ିକ ସହ ବିଷୟବସ୍ତୁ ସେୟାର୍ କରିବାକୁ ଆପ୍ସ ମଧ୍ୟ ଏକ ହଟସ୍ପଟ୍ ତିଆରି କରିପାରିବ।"</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"ସାହାଯ୍ୟ"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"କ୍ୟାପସନ୍ ପସନ୍ଦଗୁଡ଼ିକ"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"ମ୍ୟାଗ୍ନିଫିକେସନ୍"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"ମାଗ୍ନିଫିକେସନ୍ ଅଞ୍ଚଳ"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"ମ୍ୟାଗ୍ନିଫିକେସନ୍ ସକ୍ଷମ ମୋଡ୍"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"ସ୍କ୍ରିନ୍ ମାଗ୍ନିଫାଏ କରିବା ବେଳେ ଆପଣ ବ୍ୟବହାର କରିବାକୁ ଚାହୁଁଥିବା ମାଗ୍ନିଫିକେସନ୍ ଅଞ୍ଚଳ(ଗୁଡ଼ିକୁ) ବାଛନ୍ତୁ"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"ପୂର୍ଣ୍ଣ ସ୍କ୍ରିନ୍"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"ସ୍କ୍ରିନ୍‌‌ର କିଛି ଅଂଶ"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"ପୂର୍ଣ୍ଣ ସ୍କ୍ରିନ୍ ଏବଂ ସ୍କ୍ରିନ୍‌ର ଅଂଶ"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"ସମ୍ପୁର୍ଣ୍ଣ ସ୍କ୍ରିନ୍ ମାଗ୍ନିଫାଏ କରନ୍ତୁ"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"ସ୍କ୍ରିନ୍‌‌ର କିଛି ଅଂଶ ମାଗ୍ନିଫାଏ କରନ୍ତୁ"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"ଆକ୍ସେସିବିଲିଟୀ ବଟନକୁ ସ୍ୱିଚ୍ କରିବେ କି?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"ସ୍କ୍ରିନର ଏକ ଅଂଶକୁ ମାଗ୍ନିଫାଏ କରିବା ପାଇଁ ତିନିଥର ଟାପ୍ ବ୍ୟବହାର କରିବା ଦ୍ୱାରା ଟାଇପିଂ ଏବଂ ଅନ୍ୟ କାର୍ଯ୍ୟଗୁଡ଼ିକ ବିଳମ୍ବ ହୋଇଯିବ।\n\nଆପଣ ମାଗ୍ନିଫାଏ କରିବା ପାଇଁ ଆକ୍ସେସିବିଲିଟୀ ବଟନ୍ ବ୍ୟବହାର କରିବା ନିମନ୍ତେ ସ୍ୱିଚ୍ କରିବାକୁ ଚାହୁଁଛନ୍ତି କି?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"ଆକ୍ସେସିବିଲିଟୀ ବଟନକୁ ସ୍ୱିଚ୍ କରନ୍ତୁ"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"ମାଗ୍ନିଫାଏ କରିବାକୁ ତିନିଥର ଟାପ୍ ଜାରି ରଖନ୍ତୁ"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"ମାଗ୍ନିଫିକେସନ୍ ସେଟିଂସ୍"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"ଟ୍ରିପଲ୍‌-ଟାପ୍‌ ଦ୍ୱାରା ମାଗ୍ନିଫାଏ କରନ୍ତୁ"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"ସର୍ଟକଟ୍ ସାହାଯ୍ୟରେ ମାଗ୍ନିଫାଏ କରନ୍ତୁ"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"ପାୱର୍‌ ବଟନ୍‌ କଲ୍‌ ସମାପ୍ତ କରେ"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"ବହୁତ ବଡ଼ ମାଉସ୍‌ ପଏଣ୍ଟର୍"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"ଆନିମେସନ୍‌ଗୁଡ଼ିକୁ କାଢ଼ିଦିଅନ୍ତୁ"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"ମୋନୋ ଅଡିଓ"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"ଅଡିଓ ଚାଲୁଥିବା ସମ‍ୟରେ ଚାନେଲ୍‌ଗୁଡ଼ିକୁ ଯୋଡ଼ନ୍ତୁ"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"ଅଡିଓ ବ୍ୟାଲେନ୍ସ"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"ବାମ"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"ଡାହାଣ"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"ମୋନୋ ଅଡିଓ"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"ଅଡିଓ ଚାଲୁଥିବା ସମୟରେ ଚ୍ୟାନେଲଗୁଡ଼ିକୁ ଯୋଡ଼ନ୍ତୁ"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"ଅଡିଓ ବାଲାନ୍ସ"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"ବାମ"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"ଡାହାଣ"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"ଡିଫଲ୍ଟ"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 ସେକେଣ୍ଡ"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 ସେକେଣ୍ଡ"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"ବିଜ୍ଞପ୍ତି ଭାଇବ୍ରେସନ୍"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"ରିଙ୍ଗ ଭାଇବ୍ରେସନ୍"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"ଟଚ୍ ଫିଡବ୍ୟାକ୍"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ବ୍ୟବହାର କରନ୍ତୁ"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ଖୋଲନ୍ତୁ"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"ରଙ୍ଗ ସଂଶୋଧନକୁ ବ୍ୟବହାର କରନ୍ତୁ"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"କ୍ୟାପ୍ସନ୍ ଦେଖାନ୍ତୁ"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"କେବଳ ସମର୍ଥିତ ଆପ୍ ପାଇଁ"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ବ୍ୟବହାର କରନ୍ତୁ"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ଖୋଲନ୍ତୁ"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"ରଙ୍ଗ ସଂଶୋଧନ ବ୍ୟବହାର କରନ୍ତୁ"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"କ୍ୟାପ୍ସନଗୁଡ଼ିକୁ ଦେଖାନ୍ତୁ"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"କେବଳ ସମର୍ଥିତ ଆପ୍ ପାଇଁ"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"କ୍ୟାପସନ୍ ଆକାର ଏବଂ ଷ୍ଟାଇଲ୍"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> ଟେକ୍ସଟ୍ ଆକାର"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"ଅଧିକ ବିକଳ୍ପ"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"ଡ୍ୟୁଟେରାନୋମାଲି"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"ପ୍ରୋଟାନୋମାଲି"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"ଟ୍ରିଟାନୋମାଲି"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"ଗ୍ରେସ୍କେଲ୍"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"ଲାଲ୍-ସବୁଜ"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"ଲାଲ୍-ସବୁଜ"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"ନୀଳ-ହଳଦିଆ"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"ବ୍ୟାକଗ୍ରାଉଣ୍ଡ ରେଷ୍ଟ୍ରିକସନ୍"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"ଆପ୍‌ଟିକୁ ବ୍ୟାକ୍‌ଗ୍ରାଉଣ୍ଡରେ ଚାଲିବାକୁ ଦିଅନ୍ତୁ"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"ବ୍ୟାକ୍‌ଗ୍ରାଉଣ୍ଡରେ ଚାଲିବା ପାଇଁ ଆପ୍‌ ପାଖରେ ଅନୁମତି ନାହିଁ"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"ବ୍ୟାକଗ୍ରାଉଣ୍ଡରେ ବ୍ୟବହାରକୁ ପ୍ରତିବନ୍ଧିତ କରିହେବ ନାହିଁ"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"ପୃଷ୍ଠପଟ ବ୍ୟବହାରକୁ ପ୍ରତିବନ୍ଧିତ କରାଯାଇପାରିବ ନାହିଁ"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"ବ୍ୟାକ୍‌ଗ୍ରାଉଣ୍ଡ କାର୍ଯ୍ୟକଳାପ ସୀମିତ କରିବେ?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"ଯଦି ଆପଣ ଗୋଟିଏ ଆପ୍‌ର ବ୍ୟାକ୍‌ଗ୍ରାଉଣ୍ଡ କାର୍ଯ୍ୟକଳାପକୁ ସୀମିତ କରିବେ, ଏହା ଠିକ୍‍ ଭାବରେ କାମ କରିନପାରେ"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"ବ୍ୟାଟେରୀକୁ ଅପ୍ଟିମାଇଜ୍ କରିବା ପାଇଁ ଯେହେତୁ ଏହି ଆପ୍‍କୁ ସେଟ୍ କରାଯାଇନାହିଁ, ତେଣୁ ଆପଣ ଏହାକୁ ସୀମାବଦ୍ଧ କରିପାରିବେ ନାହିଁ। \n\nଆପ୍‍କୁ ସୀମାବଦ୍ଧ କରିବା ପାଇଁ ପ୍ରଥମେ ବ୍ୟାଟେରୀ ଅପ୍ଟିମାଇଜେସନ୍‍କୁ ଚାଲୁ କରନ୍ତୁ।"</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"ଗୋଟିଏ ସିଡୁଲ୍ ସେଟ୍‌ କରନ୍ତୁ"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"ବ୍ୟାଟେରୀର ଜୀବନକାଳ ବଢ଼ାନ୍ତୁ"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"ଚାର୍ଜ ହୋଇଗଲେ ବନ୍ଦ କରନ୍ତୁ"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"ଆପଣଙ୍କ ଫୋନ୍ <xliff:g id="PERCENT">%1$s</xliff:g> ହେଲେ ବ୍ୟାଟେରୀ ସେଭର୍ ବନ୍ଦ ହୁଏ"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"ଆପଣଙ୍କ ଟାବ୍‌ଲେଟ୍‌ର ଚାର୍ଜ <xliff:g id="PERCENT">%1$s</xliff:g> ହେଲେ ବ୍ୟାଟେରୀ ସେଭର୍ ବନ୍ଦ ହୁଏ"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"ଆପଣଙ୍କ ଡିଭାଇସ୍ <xliff:g id="PERCENT">%1$s</xliff:g> ହେଲେ ବ୍ୟାଟେରୀ ସେଭର୍ ବନ୍ଦ ହୁଏ"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"ଆପଣଙ୍କ ଫୋନର ଚାର୍ଜ <xliff:g id="PERCENT">%1$s</xliff:g>ରୁ ଅଧିକ ହେଲେ ବ୍ୟାଟେରୀ ସେଭର୍ ବନ୍ଦ ହୁଏ"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"ଆପଣଙ୍କ ଟାବଲେଟର ଚାର୍ଜ <xliff:g id="PERCENT">%1$s</xliff:g>ରୁ ଅଧିକ ହେଲେ ବ୍ୟାଟେରୀ ସେଭର୍ ବନ୍ଦ ହୁଏ"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"ଆପଣଙ୍କ ଡିଭାଇସର ଚାର୍ଜ <xliff:g id="PERCENT">%1$s</xliff:g>ରୁ ଅଧିକ ହେଲେ ବ୍ୟାଟେରୀ ସେଭର୍ ବନ୍ଦ ହୁଏ"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"ଚାଲୁ କରନ୍ତୁ"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"ରିସେଟ୍‌ କରନ୍ତୁ"</string>
     <string name="tts_play" msgid="2945513377250757221">"ଚଲାନ୍ତୁ"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"ଆଡପ୍ଟିଭ୍ କନେକ୍ଟିଭିଟି"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"ଆପଣଙ୍କ ନେଟୱାର୍କ ସଂଯୋଗଗୁଡ଼ିକୁ ସ୍ୱଚାଳିତ ଭାବେ ପରିଚାଳନା କରି ବ୍ୟାଟେରୀ ଲାଇଫ୍ ବଢ଼ାଏ ଏବଂ ଡିଭାଇସର କାର୍ଯ୍ୟଦକ୍ଷତାକୁ ଉନ୍ନତ କରେ"</string>
     <string name="credentials_title" msgid="7535942196886123656">"କ୍ରେଡେନ୍ସିଆଲ୍ ଷ୍ଟୋରେଜ୍"</string>
     <string name="credentials_install" msgid="3933218407598415827">"ଏକ ସାର୍ଟିଫିକେଟ୍ ଇନଷ୍ଟଲ୍ କରନ୍ତୁ"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"ଷ୍ଟୋରେଜ୍‌ରୁ ସାର୍ଟିଫିକେଟ୍‌ ଇନଷ୍ଟଲ୍ କରନ୍ତୁ"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"ଉପଯୋଗକର୍ତ୍ତା କ୍ରେଡେନସିଆଲ୍"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"ସେଭ୍‌ ହୋଇଥିବା କ୍ରେଡେନସିଆଲ୍ ଦେଖନ୍ତୁ ଓ ବଦଳାନ୍ତୁ"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"ଉନ୍ନତ"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"ଷ୍ଟୋରେଜ୍‌ ପ୍ରକାର"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"ହାର୍ଡୱେର୍‌-ସମର୍ଥିତ"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"ସଫ୍ଟୱେୟାର କେବଳ"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"ଏହି ଉପଯୋଗକର୍ତ୍ତାଙ୍କର ତଥ୍ୟ ଉପଲବ୍ଧ ନାହିଁ"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN ଏବଂ ଆପସ୍‌ ପାଇଁ ସଂସ୍ଥାପିତ"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"ୱାଇ-ଫାଇ ପାଇଁ ଇନ୍‌ଷ୍ଟଲ୍‌ ହୋଇଛି"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"ଟର୍ମିନାଲ୍‌‌ରେ ଦେୟ ଦେବା"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"ଏକ ପେମେଣ୍ଟ ଆପ୍‌ ସେଟ୍‌ଅପ୍‌ କରନ୍ତୁ। କଣ୍ଟାକ୍ଟଲେସ୍‌ ସଙ୍କେତ ଥିବା ଯେକୌଣସି ଟର୍ମିନାଲ୍‌ରେ ଆପଣଙ୍କ ଫୋନ୍‌ର ପଛ ପାଖ କେବଳ ଧରି ରଖନ୍ତୁ।"</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"ବୁଝିଲି"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"ଅଧିକ..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"ଅଧିକ…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"ଡିଫଲ୍ଟ ପେମେଣ୍ଟ ଆପ୍ ସେଟ୍ କରନ୍ତୁ"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"ଡିଫଲ୍ଟ ପେମେଣ୍ଟ ଆପ୍ ଅପଡେଟ୍ କରନ୍ତୁ"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"ଏକ କଣ୍ଟାକ୍ଟଲେସ୍ ଟର୍ମିନାଲରେ, <xliff:g id="APP">%1$s</xliff:g> ମାଧ୍ୟମରେ ପେ କରନ୍ତୁ"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"କଲ୍‌ ପାଇଁ ଏହାକୁ ସର୍ବଦା ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"ଡାଟା ପାଇଁ ଏକ SIM ଚୟନ କରନ୍ତୁ"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"SMS ପାଇଁ ଏକ SIM ବାଛନ୍ତୁ"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"ଡାଟା ପାଇଁ ସିମ୍‌ ବଦଳାଉଛି, ଏଥିରେ କିଛି ସମୟ ଲାଗିପାରେ..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"ଡାଟା SIM ସ୍ୱିଚ୍ କରାଯାଉଛି, ଏଥିରେ କିଛି ସମୟ ଲାଗିପାରେ…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"ଏହାଙ୍କ ସହ କଲ୍‌"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"ଏକ SIM କାର୍ଡ ବାଛି ନିଅନ୍ତୁ"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"ରୁଟିନ୍, ସମୟ ସୂଚୀ, ବ୍ୟାଟେରୀ ସେଭର୍, ପାୱର୍ ସେଭର୍, ବ୍ୟାଟେରୀ, ସ୍ୱତଃ, ଶତକଡ଼ା"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, ଉନ୍ନତ କଲିଂ, 4g କଲିଂ"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"ଭାଷା ଯୋଗ କରନ୍ତୁ, ଏକ ଭାଷା ଯୋଗ କରନ୍ତୁ"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"ଅକ୍ଷର ଆକାର"</string>
     <string name="default_sound" msgid="6604374495015245195">"ପୂର୍ବ-ନିର୍ଦ୍ଧାରିତ ଶବ୍ଦ"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"ରିଙ୍ଗ ଏବଂ ବିଜ୍ଞପ୍ତି ଭଲ୍ୟୁମ୍ <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"ଭଲ୍ୟୁମ୍, ଭାଇବ୍ରେସନ୍, ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"ଚାଲୁ ହେବାର ଶବ୍ଦ"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"ଲାଇଭ୍ କ୍ୟାପ୍ସନ୍"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"ସ୍ବଚାଳିତ କ୍ୟାପ୍ସନ୍ ମିଡିଆ"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"କିଛି ନାହିଁ"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g>ଟି ସିଡୁଲ୍ ସେଟ୍ ହୋଇଛି</item>
-      <item quantity="one">1ଟି ସିଡୁଲ୍ ସେଟ୍ ହୋଇଛି</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{କିଛି ନାହିଁ}=1{1ଟି ସିଡୁଲ୍ ସେଟ୍ ହୋଇଛି}other{#ଟି ସିଡୁଲ୍ ସେଟ୍ ହୋଇଛି}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"କେବଳ ଗୁରୁତ୍ଵପୂର୍ଣ୍ଣ ଲୋକ ଏବଂ ଆପ୍ସ ଦ୍ୱାରା ସୂଚନା ପାଆନ୍ତୁ"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"ବ୍ୟାଘାତଗୁଡ଼ିକୁ ସୀମିତ କରନ୍ତୁ"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"କେବଳ ପ୍ରାଥମିକତା"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"ଅନ୍/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"ଅଫ୍/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"ବନ୍ଦ"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"ଚାଲୁ"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"ପ୍ରତ୍ୟେକ ଥର ପଚାରନ୍ତୁ"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"ଯେପର୍ଯ୍ୟନ୍ତ ଆପଣ ବନ୍ଦ କରି ନାହାଁନ୍ତି"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> ଘଣ୍ଟା</item>
-      <item quantity="one">1 ଘଣ୍ଟା</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> ମିନିଟ୍"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ସିଡୁଲ୍ ସ୍ଵଚାଳିତ ଭାବେ ଚାଲୁ କରାଯାଇପାରେ</item>
-      <item quantity="one">1 ସିଡୁଲ୍ ସ୍ଵଚାଳିତ ଭାବେ ଚାଲୁ କରାଯାଇପାରେ</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 ଘଣ୍ଟା}other{# ଘଣ୍ଟା}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 ମିନିଟ୍}other{# ମିନିଟ୍}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{ବନ୍ଦ ଅଛି}=1{ବନ୍ଦ ଅଛି / 1ଟି ସିଡୁଲ୍ ସ୍ୱଚାଳିତ ଭାବରେ ଚାଲୁ ହୋଇପାରିବ}other{ବନ୍ଦ ଅଛି / #ଟି ସିଡୁଲ୍ ସ୍ୱଚାଳିତ ଭାବରେ ଚାଲୁ ହୋଇପାରିବ}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"\'ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\' ମୋଡକୁ କଣ ବାଧା ଦେଇପାରେ"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"ଲୋକମାନେ"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"ଆପ୍ସ"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"ସ୍ୱଚାଳିତ ଭାବେ କମ୍ ପ୍ରାଥମିକତା ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ଜେଣ୍ଟଲ୍‌ରେ ସେଟ୍ କରନ୍ତୁ"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"ଆଡେପ୍ଟିଭ୍ ବିଜ୍ଞପ୍ତି ରେଙ୍କିଂ"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"ପ୍ରାସଙ୍ଗିକତା ହିସାବରେ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ସ୍ୱଚାଳିତ ଭାବେ ରାଙ୍କ୍ ଦେଇଥାଏ"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"ଆଡେପ୍ଟିଭ୍ ବିଜ୍ଞପ୍ତିର ମତାମତ"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"ଏହା ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକରେ କରାଯାଇଥିବା ଆଡଜଷ୍ଟମେଣ୍ଟଗୁଡ଼ିକୁ ସୂଚିତ କରେ ଏବଂ ସିଷ୍ଟମକୁ ମତାମତ ଦେବାର ବିକଳ୍ପ ଦେଖାଏ"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"ପ୍ରସ୍ତାବିତ କାର୍ଯ୍ୟ ଏବଂ ପ୍ରତ୍ୟୁତ୍ତରଗୁଡ଼ିକ"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"ସ୍ୱଚାଳିତ ଭାବେ ପରାମର୍ଶ କରାଯାଇଥିବା କାର୍ଯ୍ୟ ଏବଂ ଉତ୍ତରଗୁଡ଼ିକ ଦେଖାନ୍ତୁ"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"ବର୍ତ୍ତମାନର ଏବଂ ସ୍ନୁଜ୍ କରାଯାଇଥିବା ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ଦେଖାନ୍ତୁ"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"\"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\" ଆକ୍ସେସ୍"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"\"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\"କୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"ବ୍ୟସ୍ତ କରନ୍ତୁ ନାହିଁ ଆକ୍ସେସ୍‌ କୌଣସି ସଂସ୍ଥାପିତ ଆପ୍‌ଗୁଡ଼ିକ ଅନୁରୋଧ କରିନାହାଁନ୍ତି"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"ଆପ୍‌ଗୁଡ଼ିକୁ ଲୋଡ୍‌ କରାଯାଉଛି..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"ଆପଗୁଡ଼ିକ ଲୋଡ୍ ହେଉଛି…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"ଆପଣଙ୍କ ଅନୁରୋଧରେ Android, ଏହି ଆପ୍‌ର ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ, ଏହି ଡିଭାଇସ୍‌ରେ ଦେଖାଉନାହିଁ"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"ଆପଣଙ୍କ ଅନୁରୋଧରେ, Android, ବିଜ୍ଞପ୍ତିଗୁଡିର ଏହି ବର୍ଗକୁ ଏହି ଡିଭାଇସରେ ଦେଖାଦେବାରେ ଅବରୋଧ କରୁଛି"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"ଆପଣଙ୍କ ଅନୁରୋଧରେ, Android, ବିଜ୍ଞପ୍ତିଗୁଡିର ଏହି ଗୋଷ୍ଠୀକୁ ଏହି ଡିଭାଇସରେ ଦେଖାଦେବାରେ ଅବରୋଧ କରୁଛି"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"ସମସ୍ତ ବାର୍ତ୍ତାଳାପ"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"ପ୍ରାଥମିକତା ଦିଆଯାଇଥିବା ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକ"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"କିଛି ନାହିଁ"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g>ଟି ବାର୍ତ୍ତାଳାପ</item>
-      <item quantity="one">1ଟି ବାର୍ତ୍ତାଳାପ</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"କିଛି ନାହିଁ"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{କିଛି ନାହିଁ}=1{1ଟି ବାର୍ତ୍ତାଳାପ}other{#ଟି ବାର୍ତ୍ତାଳାପ}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"କିଏ ବାଧା ସୃଷ୍ଟି କରିପାରିବ"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"କଲ୍‌"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"କଲ୍‌ଗୁଡ଼ିକ"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"ଅନୁମତି ପ୍ରାପ୍ତ କଲଗୁଡ଼ିକ ଆସିଲେ ସାଉଣ୍ଡ ହେବାକୁ ସୁନିଶ୍ଚିତ କରିବା ପାଇଁ ଡିଭାଇସଟି ରିଂ ହେବା ମୋଡରେ ସେଟ୍ କରାଯାଇଛି ବୋଲି ଯାଞ୍ଚ କରନ୍ତୁ"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ ପାଇଁ ଇନକମିଂ କଲ୍‍‍‍‍‍‍‍‍ଗୁଡ଼ିକ ବ୍ଲକ୍ କରାଯାଇଛି। ସାଙ୍ଗ,ପରିବାର ଲୋକେ କିମ୍ବା ଅନ୍ୟ ଯୋଗାଯୋଗ ଆପଣଙ୍କୁ ସମ୍ପର୍କ କରିବା ପାଇଁ ଆପଣ ସେଟିଂସ୍‍କୁ ଆଡ୍‌ଜଷ୍ଟ କରିପାରିବେ।"</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"ତାରାଙ୍କିତ ଯୋଗାଯୋଗ"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g>ଟି ଅନ୍ୟ</item>
-      <item quantity="one">1ଟି ଅନ୍ୟ</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"କିଛି ନାହିଁ"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{କିଛି ନାହିଁ}=1{{contact_1}}=2{{contact_1} ଏବଂ {contact_2}}=3{{contact_1}, {contact_2} ଏବଂ {contact_3}}other{{contact_1}, {contact_2} ଏବଂ ଅନ୍ୟ #ଟି ଯୋଗାଯୋଗ}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Messages"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"ମେସେଜଗୁଡ଼ିକ"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Messages"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ ପାଇଁ ଇନକମିଂ ମେସେଜ୍‌ଗୁଡ଼ିକ ବ୍ଲକ୍ କରାଯାଇଛି। ଆପଣଙ୍କ ବନ୍ଧୁ, ପରିବାର ବର୍ଗ କିମ୍ବା ଅନ୍ୟ ଯୋଗାଯୋଗ ଆପଣଙ୍କୁ ସମ୍ପର୍କ କରିବା ପାଇଁ ଆପଣ ସେଟିଂସ୍‍କୁ ଆଡ୍‌ଜଷ୍ଟ କରିପାରିବେ।"</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"ସମସ୍ତ ମେସେଜ୍ ଆପଣଙ୍କ ପାଖରେ ପହଞ୍ଚିପାରିବ"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"ସମସ୍ତ କଲ୍ ଆପଣଙ୍କ ପାଖରେ ପହଞ୍ଚିପାରିବ"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"କିଛି ନାହିଁ"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g>ଟି ଯୋଗାଯୋଗ</item>
-      <item quantity="one">1ଟି ଯୋଗାଯୋଗ</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{କିଛି ନାହିଁ}=1{1ଟି ଯୋଗାଯୋଗ}other{#ଟି ଯୋଗାଯୋଗ}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"ଯେ କୌଣସି ବ୍ୟକ୍ତି"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"ଯୋଗାଯୋଗଗୁଡ଼ିକ"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"ତାରାଙ୍କିତ ଯୋଗାଯୋଗଗୁଡ଼ିକ"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"ସମସ୍ତ ବିଜ୍ଞପ୍ତି"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"କିଛି ବିଜ୍ଞପ୍ତି"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"ଆପଣ ଆପଗୁଡ଼ିକୁ ବାଧା ସୃଷ୍ଟି କରିବାକୁ ଅନୁମତି ନଦେଲେ ମଧ୍ୟ ଆପଣଙ୍କ ପାଖରେ ଚୟନିତ ଲୋକମାନେ ପହଞ୍ଚି ପାରିବେ"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> ବାଧା ଉପୁଯାଇପାରେ</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> ବାଧା ଉପୁଯାଇପାରେ</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g>ଟି ଅଧିକ"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{କୌଣସି ଆପ୍ ବାଧା ସୃଷ୍ଟି କରିପାରିବ ନାହିଁ}=1{{app_1} ବାଧା ସୃଷ୍ଟି କରିପାରିବ}=2{{app_1} ଏବଂ {app_2} ବାଧା ସୃଷ୍ଟି କରିପାରିବ}=3{{app_1}, {app_2} ଏବଂ {app_3} ବାଧା ସୃଷ୍ଟି କରିପାରିବ}other{{app_1}, {app_2}, ଏବଂ ଆହୁରି #ଟି ଆପ୍ ବାଧା ସୃଷ୍ଟି କରିପାରିବ}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"ଆପଗୁଡ଼ିକ"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"ସମସ୍ତ ବିଜ୍ଞପ୍ତି"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"କିଛି ବିଜ୍ଞପ୍ତି"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"ବାଧା ସୃଷ୍ଟି କରିପାରୁଥିବା ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"ସମସ୍ତ ବିଜ୍ଞପ୍ତିକୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> ବାଧା ଉପୁଯାଇପାରେ</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> ବାଧା ଉପୁଯାଇପାରେ</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"କିଛି ବାଧା ଉପୁଯାଇପାରିବ ନାହିଁ"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g>ଟି ଅଧିକ"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{କିଛି ବି ବାଧା ସୃଷ୍ଟି କରିପାରିବ ନାହିଁ}=1{{sound_category_1} ବାଧା ସୃଷ୍ଟି କରିପାରିବ}=2{{sound_category_1} ଏବଂ {sound_category_2} ବାଧା ସୃଷ୍ଟି କରିପାରିବ}=3{{sound_category_1}, {sound_category_2}, ଏବଂ {sound_category_3} ବାଧା ସୃଷ୍ଟି କରିପାରିବ}other{{sound_category_1}, {sound_category_2}, ଏବଂ ଆହୁରି #ଟି ଆପ୍ ବାଧା ସୃଷ୍ଟି କରିପାରିବ}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"କିଛି ବି ବାଧା ସୃଷ୍ଟି କରିପାରିବ ନାହିଁ"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"କେହି ବି ବାଧା ଉପୁଯାଇପାରିବେ ନାହିଁ"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"କିଛି ଲୋକ ବାଧା ଦେଇପାରନ୍ତି"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"ସବୁ ଲୋକ ବାଧା ଉପୁଯାଇପାରିବେ"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB ଏହା ଦ୍ୱାରା ନିୟନ୍ତ୍ରିତ"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"ସଂଯୁକ୍ତ ଡିଭାଇସ୍"</string>
     <string name="usb_control_device" msgid="527916783743021577">"ଏହି ଡିଭାଇସ୍‍"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"ବଦଳାଯାଉଛି..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"ସ୍ୱିଚ୍ କରାଯାଉଛି…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"ବଦଳ କରିହେଲା ନାହିଁ"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"ଏହି ଡିଭାଇସ୍‌ ଚାର୍ଜ ହେଉଛି"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"କନେକ୍ଟ ହୋଇଥିବା ଡିଭାଇସ୍‍ ଚାର୍ଜ ହେଉଛି"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"ବିବରଣୀ ଦେଖନ୍ତୁ"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"ଡାଟା ସେଭର୍‍"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"ଅପ୍ରତିବନ୍ଧିତ ଡାଟା"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"ବ୍ୟାକ୍‌ଗ୍ରାଉଣ୍ଡ ଡାଟା ବନ୍ଦ‌ ଅଛି"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"ପୃଷ୍ଠପଟ ଡାଟା ବନ୍ଦ କରାଯାଇଛି"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"ଚାଲୁ"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"ବନ୍ଦ"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"ଡାଟା ସେଭର୍ ବ୍ୟବହାର କରନ୍ତୁ"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"ଯଦି ଡିଭାଇସ୍‌ ଲକ୍‌ ହୋଇଥାଏ, ବିଜ୍ଞପ୍ତିରେ ପ୍ରତ୍ୟୁତ୍ତର କିମ୍ବା ଅନ୍ୟାନ୍ୟ ଟେକ୍ସଟ୍‌ ଟାଇପ କରିବା ପ୍ରତିରୋଧ କରେ"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"ଡିଫଲ୍ଟ ବନାନ ଯାଞ୍ଚକାରୀ"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"ବନାନ ଯାଞ୍ଚକାରୀ ବାଛନ୍ତୁ"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"ବନାନ୍ ଯାଞ୍ଚ କରୁଥିବା ଟୂଲ୍ ବ୍ୟବହାର କରନ୍ତୁ"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"ବନାନ ଯାଞ୍ଚକାରୀ ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"ଚୟନ କରାଯାଇନାହିଁ"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(କିଛି ନାହିଁ)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"ଷ୍ଟୋରେଜ୍‌ ସ୍ପେସ୍‌ ଖାଲି କରିବା ପାଇଁ, ଷ୍ଟୋରେଜ୍‌ ମ୍ୟାନେଜର୍‌ ଆପଣଙ୍କ ଡିଭାଇସ୍‌ରୁ ବ୍ୟାକ୍‌ଅପ୍‌ ନିଆଯାଇଥିବା ଫୋଟୋ ଏବଂ ଭିଡିଓଗୁଡ଼ିକ କାଢ଼ିଦେଇଥାଏ।"</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"ଫୋଟୋ ଓ ଭିଡିଓଗୁଡ଼ିକ କାଢ଼ିଦିଅନ୍ତୁ"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"ଷ୍ଟୋରେଜ୍‌ ମ୍ୟାନେଜର୍"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"ଷ୍ଟୋରେଜ୍ ମ୍ୟାନେଜର୍‌କୁ ବ୍ୟବହାର କରନ୍ତୁ"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"ଷ୍ଟୋରେଜ୍ ମ୍ୟାନେଜର୍ ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"ଅଟୋମେଟିକ୍‌"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"ମାନୁଆଲ୍‌"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"ବର୍ତ୍ତମାନ ସ୍ପେସ୍‌ ଖାଲି କରନ୍ତୁ"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"ଫୋନ୍‌ ଚେକ୍ କରିବାକୁ ଦୁଇଥର-ଟାପ୍‌ କରନ୍ତୁ"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"ଟାବ୍‌ଲେଟ୍‌ ଯାଞ୍ଚ କରିବାକୁ ଡବଲ୍‌-ଟାପ୍‌ କରନ୍ତୁ"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"ଡିଭାଇସ୍‌ ଯାଞ୍ଚ କରିବାକୁ ଡବଲ୍‌-ଟାପ୍‌ କରନ୍ତୁ"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"ବିଜ୍ଞପ୍ତି ପାଇଁ ସ୍ୱାଇପ୍ କର"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"ଆପଣଙ୍କ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ ଦେଖାଇବାକୁ ସ୍କ୍ରିନର ତଳ ପାର୍ଶ୍ୱରେ ତଳକୁ ସ୍ୱାଇପ୍ କରନ୍ତୁ"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"ଏକ-ହାତ ମୋଡ୍"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"ଏକ-ହାତ ମୋଡ୍ ବ୍ୟବହାର କରନ୍ତୁ"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"ଆପ୍ସ ସ୍ୱିଚ୍ କରିବା ବେଳେ ବାହାରି ଯାଆନ୍ତୁ"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"ସମୟ ସମାପ୍ତ"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 ସେକେଣ୍ଡ"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 ସେକେଣ୍ଡ"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 ସେକେଣ୍ଡ"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"ରିଚେବିଲିଟୀ"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"ସମୟ, ବିଜ୍ଞପ୍ତି, ଏବଂ ଅନ୍ୟ ସୂଚନା ଦେଖିବାକୁ, ଆପଣଙ୍କ ସ୍କ୍ରିନ୍‌କୁ ଦୁଇଥର ଟାପ୍‌ କରନ୍ତୁ।"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"ଫୋନ୍‌ ଚେକ୍ କରିବା ପାଇଁ ଉଠାନ୍ତୁ"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"ଟାବଲେଟ୍‌ ଯାଞ୍ଚ କରିବାକୁ ଉଠାନ୍ତୁ"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"ଟାବ୍‍‍ଲେଟ୍ ଯାଞ୍ଚ କରିବା ପାଇଁ ଟାପ୍ କରନ୍ତୁ"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"ଡିଭାଇସ୍ ଯାଞ୍ଚ କରିବାକୁ ଟାପ୍ କରନ୍ତୁ"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"ସମୟ, ବିଜ୍ଞପ୍ତି, ଏବଂ ଅନ୍ୟ ସୂଚନାର ଯାଞ୍ଚ କରିବା ପାଇଁ, ଆପଣଙ୍କ ସ୍କ୍ରିନ୍‌କୁ ଟାପ୍ କରନ୍ତୁ।"</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"ପ୍ୟାନିକ୍ ବଟନ୍"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"ଶୀଘ୍ର 5 ଥର ପାୱାର ବଟନକୁ ଦବାଇ ଜରୁରୀକାଳୀନ SOS କାର୍ଯ୍ୟଗୁଡ଼ିକ ଆରମ୍ଭ କରନ୍ତୁ।"</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"ଚେତାବନୀ ସାଉଣ୍ଡ"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"କାର୍ଯ୍ୟ ଆରମ୍ଭ କରିବା ପୂର୍ବରୁ ଆଲର୍ଟ କରନ୍ତୁ"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"ଜରୁରୀକାଳୀନ ଯୋଗାଯୋଗଗୁଡ଼ିକ"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"ବିଜ୍ଞପ୍ତି ପାଇଁ ଟିପଚିହ୍ନ ସ୍ୱାଇପ୍‌ କରନ୍ତୁ"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"ଟିପଚିହ୍ନ ସ୍ୱାଇପ୍‌ କରନ୍ତୁ"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ଦେଖିବା ପାଇଁ, ନିଜ ଫୋନ୍‌ ପଛପଟେ ଥିବା ଫିଙ୍ଗରପ୍ରିଣ୍ଟ ସେନ୍ସର୍‌ ଉପରେ ଆଙ୍ଗୁଠି ରଖି ତଳକୁ ସ୍ୱାଇପ୍‌ କରନ୍ତୁ।"</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"ସମସ୍ତ ଆପ୍ ପାଇଁ ସକ୍ଷମ କରନ୍ତୁ"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"ଗ୍ରାଫିକ୍ସ ଡ୍ରାଇଭର୍ ଚୟନ କରନ୍ତୁ"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"ଡିଫଲ୍ଟ"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"ଗେମ୍ ଡ୍ରାଇଭର୍"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"ଗେମ୍ ଡ୍ରାଇଭର୍"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"ଡେଭଲପର୍ ଡ୍ରାଇଭର୍"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"ସିଷ୍ଟମ୍ ଗ୍ରାଫିକ୍ସ ଡ୍ରାଇଭର୍"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"ନେଟ୍‌ୱର୍କ ମିଳୁନାହିଁ। ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ।"</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(ଅନୁମତିପ୍ରାପ୍ତ ନୁହେଁ)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"SIM କାର୍ଡ ନାହିଁ"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"କୌଣସି SIM ନାହିଁ"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"କିଛି ନାହିଁ"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"ସଂଯୋଗ କରିବା ପାଇଁ SIM ଆବଶ୍ୟକ"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"ସଂଯୋଗ କରିବା ପାଇଁ <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> SIM ଆବଶ୍ୟକ"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"ମନପସନ୍ଦର ନେଟ୍‌ୱର୍କ ମୋଡ୍: WCDMAକୁ ପସନ୍ଦ କରାଯାଇଛି"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"ମନପସନ୍ଦର ନେଟ୍‌ୱର୍କ ମୋଡ୍: GSM କେବଳ"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"ମନପସନ୍ଦର ନେଟ୍‌ୱର୍କ ମୋଡ୍: କେବଳ WCDMA"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"ମୋବାଇଲ୍ ଡାଟା"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"ମୋବାଇଲ୍ ନେଟ୍‌ୱର୍କକୁ ବ୍ୟବହାର କରି ଡାଟା ଆକ୍ସେସ୍ କରନ୍ତୁ"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"ରେଞ୍ଜରେ ରହିଲେ ଫୋନ୍ ସ୍ୱଚାଳିତ ଭାବେ ଏହି ବାହକକୁ ସ୍ବିଚ୍ ହୋଇଯିବ"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"କୌଣସି SIM କାର୍ଡ ଉପଲବ୍ଧ ନାହିଁ"</string>
     <string name="calls_preference" msgid="2166481296066890129">"କଲ୍‌ ପାଇଁ ଅଗ୍ରାଧିକାର"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS ଅଗ୍ରାଧିକାର"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"ପ୍ରତ୍ୟେକ ଥର ପଚାରନ୍ତୁ"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"ସେଟିଂସରେ ସ୍କ୍ରିନ୍ ଓଭରଲେକୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"ସେଟିଂସ୍ ସ୍କ୍ରିନଗୁଡ଼ିକୁ ଓଭରଲେ କରିବାକୁ ସେହି ଆପ୍ସକୁ ଅନୁମତି ଦିଅନ୍ତୁ ଯାହା ଅନ୍ୟ ଆପ୍ସ ଉପରେ ଡିସପ୍ଲେ ହୋଇପାରିବ"</string>
     <string name="media_controls_title" msgid="403271085636252597">"ମିଡିଆ"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"ମିଡିଆ ସେସନ୍ ଶେଷ ହେବା ପରେ ପ୍ଲେୟାରକୁ ଲୁଚାନ୍ତୁ"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"ପ୍ଲେୟାର୍ ଆପଣଙ୍କୁ ବିସ୍ତାରିତ ଦ୍ରୁତ ସେଟିଂସ୍ ପ୍ୟାନେଲରୁ କୌଣସି ସେସନ୍ ପୁଣି ଆରମ୍ଭ କରିବାକୁ ଅନୁମତି ଦିଏ।"</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"ଦ୍ରୁତ ସେଟିଂସରେ ମିଡିଆ ପ୍ଲେୟାର୍"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"ସହଜରେ ପ୍ଲେବ୍ୟାକ୍ ପୁଣି ଆରମ୍ଭ କରିବାକୁ ଏକ ସମ୍ପ୍ରସାରିତ ଅବଧି ପାଇଁ ମିଡିଆ ପ୍ଲେୟାର୍ ଦେଖାନ୍ତୁ"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"ପ୍ଲେୟାରକୁ ଲୁଚାନ୍ତୁ"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"ପ୍ଲେୟାର୍ ଦେଖାନ୍ତୁ"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"କୌଣସି ପ୍ଲେୟାର୍ ଉପଲବ୍ଧ ନାହିଁ"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"ଅନୁମତିପ୍ରାପ୍ତ ଆପଗୁଡ଼ିକ"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"ମିଡିଆ"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"ବ୍ଲୁଟୁଥ୍ ଚାଲୁ ହେବ"</string>
 </resources>
diff --git a/res/values-pa/arrays.xml b/res/values-pa/arrays.xml
index 8ae37b2..81cb0fc 100644
--- a/res/values-pa/arrays.xml
+++ b/res/values-pa/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"ਔਸਤਨ"</item>
     <item msgid="6740026006576843477">"ਜ਼ਿਆਦਾ"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"ਘੱਟ ਸਮੇਂ ਲਈ"</item>
+    <item msgid="7397961711906421599">"ਔਸਤ"</item>
+    <item msgid="4079132024502041928">"ਲੰਬੇ ਸਮੇਂ ਲਈ"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"ਪੂਰਵ-ਨਿਰਧਾਰਤ"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"ਗਲੋਬਲ"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"ਸਿਰਫ਼ TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"ਗਲੋਬਲ"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index f290c50..c51a9fa 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">" ਲਾਕ  ਸਕ੍ਰੀਨ ਤੇ ਪ੍ਰੋਫਾਈਲ ਜਾਣਕਾਰੀ ਦਿਖਾਓ"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"ਖਾਤੇ"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"ਟਿਕਾਣਾ"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"ਟਿਕਾਣੇ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"ਟਿਕਾਣਾ ਵਰਤੋ"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"ਬੰਦ"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">ਚਾਲੂ - <xliff:g id="COUNT_1">%1$d</xliff:g> ਐਪ ਕੋਲ ਟਿਕਾਣੇ ਤੱਕ ਪਹੁੰਚ ਹੈ</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"ਪ੍ਰਮਾਣਿਤ ਕਰਨ ਲਈ ਆਪਣੇ ਚਿਹਰੇ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"ਸ਼ੁਰੂ ਕਰੋ"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"ਜੇ ਪਹੁੰਚਯੋਗਤਾ ਵਾਲੀ ਚਿਹਰਾ ਅਣਲਾਕ ਵਿਸ਼ੇਸ਼ਤਾ ਬੰਦ ਹੈ, ਤਾਂ ਹੋ ਸਕਦਾ ਹੈ ਕਿ ਸੈੱਟਅੱਪ ਦੇ ਕੁਝ ਪੜਾਅ TalkBack ਨਾਲ ਸਹੀ ਢੰਗ ਨਾਲ ਕੰਮ ਨਾ ਕਰਨ।"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"ਵਾਪਸ ਜਾਓ"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"ਸੈੱਟਅੱਪ ਜਾਰੀ ਰੱਖੋ"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"ਪਹੁੰਚਯੋਗਤਾ ਦਾ ਸੈੱਟਅੱਪ ਵਰਤੋ"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="other"><xliff:g id="NUMBER_1">%d</xliff:g> ਤੋਂ ਵਧੇਰੇ ਘੱਟ ਅੰਕ ਹੋਣੇ ਚਾਹੀਦੇ ਹਨ</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"ਡੀਵਾਈਸ ਪ੍ਰਸ਼ਾਸਕ ਇੱਕ ਹਾਲੀਆ ਪਿੰਨ ਵਰਤਣ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਦਿੰਦਾ ਹੈ"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"ਆਮ ਪਿੰਨ ਤੁਹਾਡੇ IT ਪ੍ਰਸ਼ਾਸਕ ਵੱਲੋਂ ਬਲਾਕ ਕੀਤੇ ਗਏ ਹਨ। ਕੋਈ ਵੱਖਰਾ ਪਿੰਨ ਵਰਤੋ।"</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"ਇਸ ਵਿੱਚ ਇੱਕ ਅਵੈਧ ਅੱਖਰ-ਚਿੰਨ੍ਹ ਸ਼ਾਮਲ ਨਹੀਂ ਹੋ ਸਕਦਾ"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"ਘੱਟੋ-ਘੱਟ ਇੱਕ ਅੱਖਰ ਸ਼ਾਮਲ ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"ਘੱਟੋ-ਘੱਟ ਇੱਕ ਅੰਕ ਸ਼ਾਮਲ ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ"</string>
@@ -653,7 +655,6 @@
       <item quantity="other">ਘੱਟੋ-ਘੱਟ <xliff:g id="COUNT">%d</xliff:g> ਗੈਰ-ਸੰਖਿਆਵਾਚੀ ਅੱਖਰ-ਚਿੰਨ੍ਹ ਸ਼ਾਮਲ ਕਰਨੇ ਲਾਜ਼ਮੀ ਹਨ</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"ਡੀਵਾਈਸ ਪ੍ਰਸ਼ਾਸਕ ਇੱਕ ਹਾਲੀਆ ਪਾਸਵਰਡ ਵਰਤਣ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਦਿੰਦਾ ਹੈ।"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"ਆਮ ਪਾਸਵਰਡ ਤੁਹਾਡੇ IT ਪ੍ਰਸ਼ਾਸਕ ਵੱਲੋਂ ਬਲਾਕ ਕੀਤੇ ਗਏ ਹਨ। ਕੋਈ ਵੱਖਰਾ ਪਾਸਵਰਡ ਵਰਤੋ।"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"ਅੰਕਾਂ ਦਾ ਵਧਦਾ ਕ੍ਰਮ, ਘਟਦਾ ਕ੍ਰਮ, ਜਾਂ ਦੁਹਰਾਈ ਗਈ ਲੜੀ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਹੈ"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"ਪੁਸ਼ਟੀ ਕਰੋ"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"ਰੱਦ ਕਰੋ"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"ਵਾਈ‑ਫਾਈ"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"ਵਾਈ‑ਫਾਈ ਚਾਲੂ ਕਰੋ"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"ਵਾਈ‑ਫਾਈ"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"ਵਾਈ-ਫਾਈ ਵਰਤੋ"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"ਵਾਈ-ਫਾਈ ਵਰਤੋ"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"ਵਾਈ-ਫਾਈ ਸੈਟਿੰਗਾਂ"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"ਵਾਈ‑ਫਾਈ"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"ਵਾਇਰਲੈਸ ਐਕਸੈੱਸ ਪੁਆਇੰਟ ਸੈੱਟ ਅੱਪ &amp; ਵਿਵਸਥਿਤ ਕਰੋ"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"“<xliff:g id="SSID">%1$s</xliff:g>” ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਲਈ QR ਕੋਡ ਨੂੰ ਹੇਠਾਂ ਵਿਚਾਲੇ ਰੱਖੋ"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"QR ਕੋਡ ਸਕੈਨ ਕਰਕੇ ਵਾਈ-ਫਾਈ ਵਿੱਚ ਸ਼ਾਮਲ ਹੋਵੋ"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"ਵਾਈ-ਫਾਈ ਸਾਂਝਾ ਕਰੋ"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"“<xliff:g id="SSID">%1$s</xliff:g>” ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਲਈ ਇਹ QR ਕੋਡ ਸਕੈਨ ਕਰਕੇ ਪਾਸਵਰਡ ਸਾਂਝਾ ਕਰੋ"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"“<xliff:g id="SSID">%1$s</xliff:g>” ਵਿੱਚ ਸ਼ਾਮਲ ਹੋਣ ਲਈ ਕਿਸੇ ਹੋਰ ਡੀਵਾਈਸ ਨਾਲ ਇਹ QR ਕੋਡ ਸਕੈਨ ਕਰੋ"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"“<xliff:g id="SSID">%1$s</xliff:g>” ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਲਈ ਇਹ QR ਕੋਡ ਸਕੈਨ ਕਰੋ"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ। ਜੇ ਸਮੱਸਿਆ ਜਾਰੀ ਰਹਿੰਦੀ ਹੈ, ਤਾਂ ਡੀਵਾਈਸ ਉਤਪਾਦਕ ਨੂੰ ਸੰਪਰਕ ਕਰੋ"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"ਕੋਈ ਗੜਬੜ ਹੋਈ"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"ਵਾਈ-ਫਾਈ ਪਾਸਵਰਡ: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"ਹੌਟਸਪੌਟ ਪਾਸਵਰਡ: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"ਸਵੈ-ਕਨੈਕਟ ਕਰੋ"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"ਫ਼ੋਨ ਨੂੰ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਇਸ ਨੈੱਟਵਰਕ ਦੇ ਨੇੜੇ ਹੋਣ \'ਤੇ ਕਨੈਕਟ ਹੋਣ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"ਟੈਬਲੈੱਟ ਨੂੰ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਇਸ ਨੈੱਟਵਰਕ ਦੇ ਨੇੜੇ ਕਨੈਕਟ ਹੋਣ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"ਰੇਂਜ ਵਿੱਚ ਹੋਣ \'ਤੇ ਇਸ ਨੈੱਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਨਹੀਂ ਹੋਣ ਦਿਓ"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"ਡੀਵਾਈਸ ਸ਼ਾਮਲ ਕਰੋ"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"ਇਸ ਨੈੱਟਵਰਕ \'ਤੇ ਡੀਵਾਈਸ ਸ਼ਾਮਲ ਕਰਨ ਲਈ QR ਕੋਡ ਵਰਤੋ"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR ਕੋਡ ਵੈਧ ਫਾਰਮੈਟ ਨਹੀਂ ਹੈ"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"ਸਿਸਟਮ ਪ੍ਰਮਾਣ-ਪੱਤਰਾਂ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"ਮੁਹੱਈਆ ਨਾ ਕਰੋ"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"ਪ੍ਰਮਾਣਿਤ ਨਾ ਕਰੋ"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"ਕੋਈ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਨਿਰਧਾਰਤ ਨਹੀਂ ਕੀਤਾ ਗਿਆ। ਤੁਹਾਡਾ ਕਨੈਕਸ਼ਨ ਨਿੱਜੀ ਨਹੀਂ ਰਹੇਗਾ।"</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"ਨੈੱਟਵਰਕ ਦਾ ਨਾਮ ਬਹੁਤ ਹੀ ਵੱਡਾ ਹੈ।"</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"ਇੱਕ ਡੋਮੇਨ ਨਿਰਧਾਰਤ ਕਰਨਾ ਲਾਜ਼ਮੀ ਹੈ।"</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"ਪ੍ਰਮਾਣ-ਪੱਤਰ ਲੋੜੀਂਦਾ ਹੈ।"</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"ਕਨੈਕਟ ਕਰੋ"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"ਵਾਈ‑ਫਾਈ ਚਾਲੂ ਕੀਤਾ ਗਿਆ"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਹੈ"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"ਕਨੈਕਟ ਹੋ ਰਿਹਾ ਹੈ…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"ਨੈੱਟਵਰਕ ਕਨੈਕਟ ਕਰਨ ਵਿੱਚ ਅਸਫਲ"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"ਨੈੱਟਵਰਕ ਰੇਂਜ ਵਿੱਚ ਨਹੀਂ ਹੈ"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"ਐਪ ਸਮੱਗਰੀ ਨੂੰ ਸਾਂਝਾ ਕਰ ਰਹੀ ਹੈ। ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ ਸਾਂਝਾ ਕਰਨ ਲਈ, ਹੌਟਸਪੌਟ ਨੂੰ ਬੰਦ ਕਰਕੇ ਫਿਰ ਚਾਲੂ ਕਰੋ"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"ਕੋਈ ਪਾਸਵਰਡ ਸੈੱਟ ਨਹੀਂ ਹੈ"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"ਹੌਟਸਪੌਟ ਨਾਮ"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ਨੂੰ ਚਾਲੂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ਨੂੰ ਚਾਲੂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"ਹੋਰ ਡੀਵਾਈਸਾਂ <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਹੋ ਸਕਦੀਆਂ ਹਨ"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"ਹੌਟਸਪੌਟ ਪਾਸਵਰਡ"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP ਬੈਂਡ"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"ਸਮੂਥ ਡਿਸਪਲੇ"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਕੁਝ ਸਮੱਗਰੀਆਂ ਲਈ ਰਿਫ੍ਰੈਸ਼ ਦਰ ਨੂੰ 60 ਤੋਂ ਵਧਾ ਕੇ 90 Hz ਕਰ ਦਿੰਦਾ ਹੈ। ਬੈਟਰੀ ਵਰਤੋਂ ਵੱਧ ਜਾਂਦੀ ਹੈ।"</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"ਸਮੂਥ ਡਿਸਪਲੇ"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"90 Hz ਰਿਫ੍ਰੈਸ਼ ਦਰ ਸੈੱਟ ਕਰੋ"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"ਬਿਹਤਰ ਸਪਰਸ਼ ਪ੍ਰਤੀਕਿਰਿਆ ਅਤੇ ਐਨੀਮੇਸ਼ਨ ਕੁਆਲਿਟੀ ਲਈ ਉੱਚਤਮ ਰਿਫ੍ਰੈਸ਼ ਦਰ। ਬੈਟਰੀ ਵਰਤੋਂ ਵੱਧ ਜਾਂਦੀ ਹੈ।"</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"ਸਕ੍ਰੀਨ ਦਾ ਚੌਕੰਨਾਪਣ"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"ਚਾਲੂ / ਸਕ੍ਰੀਨ ਬੰਦ ਨਹੀਂ ਹੋਵੇਗੀ ਜੇ ਤੁਸੀਂ ਉਸ ਵੱਲ ਦੇਖ ਰਹੇ ਹੋ"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android ਵਰਜਨ"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android ਸੁਰੱਖਿਆ ਅੱਪਡੇਟ"</string>
     <string name="model_info" msgid="8997566254717810904">"ਮਾਡਲ"</string>
-    <string name="model_summary" msgid="2246651782442466213">"ਮਾਡਲ: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"ਮਾਡਲ ਅਤੇ ਹਾਰਡਵੇਅਰ"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"ਹਾਰਡਵੇਅਰ ਵਰਜਨ"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ਉਪਕਰਨ ਆਈ.ਡੀ."</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"ਨੈੱਟਵਰਕ ਸੈਟਿੰਗਾਂ ਰੀਸੈੱਟ ਕੀਤੀਆਂ ਗਈਆਂ ਹਨ"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"ਸਿਮ ਮਿਟਾਏ ਨਹੀਂ ਜਾ ਸਕਦੇ"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"ਡਾਊਨਲੋਡ ਕੀਤੇ ਸਿਮ ਕਿਸੇ ਗੜਬੜ ਕਰਕੇ ਮਿਟਾਏ ਨਹੀਂ ਜਾ ਸਕਦੇ।\n\nਆਪਣੇ ਡੀਵਾਈਸ ਨੂੰ ਮੁੜ-ਸ਼ੁਰੂ ਕਰਕੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"ਸਾਰਾ ਡਾਟਾ ਮਿਟਾਓ (ਫੈਕਟਰੀ ਰੀਸੈੱਟ)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"ਸਭ ਡਾਟਾ ਮਿਟਾਓ (ਫੈਕਟਰੀ ਰੀਸੈੱਟ)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"ਇਹ ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਦੀ "<b>"ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ"</b>" ਦਾ ਸਾਰਾ ਡਾਟਾ ਮਿਟਾ ਦੇਵੇਗਾ, ਜਿਸ ਵਿੱਚ ਸ਼ਾਮਲ ਹੈ:\n\n"<li>"ਤੁਹਾਡਾ Google ਖਾਤਾ"</li>\n<li>"ਸਿਸਟਮ ਅਤੇ ਐਪ ਡਾਟਾ ਅਤੇ ਸੈਟਿੰਗਾਂ"</li>\n<li>"ਡਾਊਨਲੋਡ ਕੀਤੀਆਂ ਐਪਾਂ"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"ਇਹ ਤੁਹਾਡੇ ਫ਼ੋਨ ਦੀ "<b>"ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ"</b>" ਦਾ ਸਾਰਾ ਡਾਟਾ ਮਿਟਾ ਦੇਵੇਗਾ, ਜਿਸ ਵਿੱਚ ਸ਼ਾਮਲ ਹੈ:\n\n"<li>"ਤੁਹਾਡਾ Google ਖਾਤਾ"</li>\n<li>"ਸਿਸਟਮ ਅਤੇ ਐਪ ਡਾਟਾ ਅਤੇ ਸੈਟਿੰਗਾਂ"</li>\n<li>"ਡਾਊਨਲੋਡ ਕੀਤੀਆਂ ਐਪਾਂ"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"ਤੁਸੀਂ ਇਸ ਵੇਲੇ ਇਹਨਾਂ ਖਾਤਿਆਂ \'ਤੇ ਸਾਈਨ-ਇਨ ਹੋ:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"ਇਸ ਡੀਵਾਈਸ ਤੇ ਹੋਰ ਵਰਤੋਂਕਾਰ ਮੌਜੂਦ ਨਹੀਂ ਹਨ।\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"ਸੰਗੀਤ"</li>\n<li>"ਫੋਟੋਆਂ"</li>\n<li>"ਹੋਰ ਵਰਤੋਂਕਾਰ ਡਾਟਾ"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"ਈ-ਸਿਮ"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"ਇਸ ਨਾਲ ਤੁਹਾਡਾ ਮੋਬਾਈਲ ਸੇਵਾ ਪਲਾਨ ਰੱਦ ਨਹੀਂ ਹੋਵੇਗਾ।"</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"ਸੰਗੀਤ, ਤਸਵੀਰਾਂ ਅਤੇ ਹੋਰ ਵਰਤੋਂਕਾਰ ਡਾਟਾ ਸਾਫ਼ ਕਰਨ ਲਈ, "<b>"USB ਸਟੋਰੇਜ"</b>" ਨੂੰ ਮਿਟਾਉਣ ਦੀ ਲੋੜ ਹੈ।"</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"ਸੰਗੀਤ, ਤਸਵੀਰਾਂ ਅਤੇ ਹੋਰ ਉਪਭੋਗਤਾ  ਡਾਟਾ  ਹਟਾਉਣ ਲਈ, "<b>"SD ਕਾਰਡ"</b>" ਨੂੰ ਮਿਟਾਉਣ ਦੀ ਲੋੜ ਹੈ।"</string>
+    <string name="main_clear_title" msgid="277664302144837723">"ਸਾਰਾ ਡਾਟਾ ਮਿਟਾਓ (ਫੈਕਟਰੀ ਰੀਸੈੱਟ)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"ਸਾਰਾ ਡਾਟਾ ਮਿਟਾਓ (ਫੈਕਟਰੀ ਰੀਸੈੱਟ)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"ਇਹ ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਦੀ "<b>"ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ"</b>" ਦਾ ਸਾਰਾ ਡਾਟਾ ਮਿਟਾ ਦੇਵੇਗਾ, ਜਿਸ ਵਿੱਚ ਸ਼ਾਮਲ ਹੈ:\n\n"<li>"ਤੁਹਾਡਾ Google ਖਾਤਾ"</li>\n<li>"ਸਿਸਟਮ ਅਤੇ ਐਪ ਡਾਟਾ ਅਤੇ ਸੈਟਿੰਗਾਂ"</li>\n<li>"ਡਾਊਨਲੋਡ ਕੀਤੀਆਂ ਐਪਾਂ"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"ਇਹ ਤੁਹਾਡੇ ਫ਼ੋਨ ਦੀ "<b>"ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ"</b>" ਦਾ ਸਾਰਾ ਡਾਟਾ ਮਿਟਾ ਦੇਵੇਗਾ, ਜਿਸ ਵਿੱਚ ਸ਼ਾਮਲ ਹੈ:\n\n"<li>"ਤੁਹਾਡਾ Google ਖਾਤਾ"</li>\n<li>"ਸਿਸਟਮ ਅਤੇ ਐਪ ਡਾਟਾ ਅਤੇ ਸੈਟਿੰਗਾਂ"</li>\n<li>"ਡਾਊਨਲੋਡ ਕੀਤੀਆਂ ਐਪਾਂ"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"ਤੁਸੀਂ ਇਸ ਵੇਲੇ ਇਹਨਾਂ ਖਾਤਿਆਂ \'ਤੇ ਸਾਈਨ-ਇਨ ਹੋ:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਹੋਰ ਵਰਤੋਂਕਾਰ ਮੌਜੂਦ ਹਨ।\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"ਸੰਗੀਤ"</li>\n<li>"ਫ਼ੋਟੋਆਂ"</li>\n<li>"ਹੋਰ ਵਰਤੋਂਕਾਰ ਡਾਟਾ"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"ਈ-ਸਿਮ"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"ਇਸ ਨਾਲ ਤੁਹਾਡਾ ਮੋਬਾਈਲ ਸੇਵਾ ਪਲਾਨ ਰੱਦ ਨਹੀਂ ਹੋਵੇਗਾ।"</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"ਸੰਗੀਤ, ਤਸਵੀਰਾਂ ਅਤੇ ਹੋਰ ਵਰਤੋਂਕਾਰ ਡਾਟਾ ਕਲੀਅਰ ਕਰਨ ਲਈ, "<b>"USB ਸਟੋਰੇਜ"</b>" ਨੂੰ ਮਿਟਾਉਣ ਦੀ ਲੋੜ ਹੈ।"</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"ਸੰਗੀਤ, ਤਸਵੀਰਾਂ ਅਤੇ ਹੋਰ ਵਰਤੋਂਕਾਰ ਡਾਟਾ ਕਲੀਅਰ ਕਰਨ ਲਈ, "<b>"SD ਕਾਰਡ"</b>" ਨੂੰ ਮਿਟਾਉਣ ਦੀ ਲੋੜ ਹੈ।"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USB ਸਟੋਰੇਜ ਮਿਟਾਓ"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SD ਕਾਰਡ ਮਿਟਾਓ"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"ਅੰਦਰੂਨੀ USB ਸਟੋਰੇਜ ਤੇ ਸਾਰਾ ਡਾਟਾ ਮਿਟਾਓ, ਜਿਵੇਂ ਸੰਗੀਤ ਜਾਂ ਫ਼ੋਟੋਆਂ"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"SD ਕਾਰਡ ਦਾ ਸਾਰਾ  ਡਾਟਾ  ਮਿਟਾਓ, ਜਿਵੇਂ ਸੰਗੀਤ ਜਾਂ ਫ਼ੋਟੋਆਂ"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"ਸਾਰਾ ਡਾਟਾ ਮਿਟਾਓ"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"ਸਾਰਾ ਡਾਟਾ ਮਿਟਾਓ"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"ਤੁਹਾਡੀ ਸਾਰੀ ਨਿੱਜੀ ਜਾਣਕਾਰੀ ਅਤੇ ਡਾਊਨਲੋਡ ਕੀਤੀਆਂ ਐਪਾਂ ਨੂੰ ਮਿਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ। ਤੁਸੀਂ ਇਸ ਕਾਰਵਾਈ ਨੂੰ ਅਣਕੀਤਾ ਨਹੀਂ ਕਰ ਸਕਦੇ।"</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"ਡਾਊਨਲੋਡ ਕੀਤੀਆਂ ਐਪਾਂ ਅਤੇ ਸਿਮਾਂ ਸਮੇਤ ਤੁਹਾਡੀ ਸਾਰੀ ਨਿੱਜੀ ਜਾਣਕਾਰੀ ਮਿਟਾ ਦਿੱਤੀ ਜਾਵੇਗੀ। ਤੁਸੀਂ ਇਸ ਕਾਰਵਾਈ ਨੂੰ ਅਣਕੀਤਾ ਨਹੀਂ ਕਰ ਸਕਦੇ।"</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"ਸਭ ਕੁਝ ਮਿਟਾਓ"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"ਕੋਈ ਰੀਸੈੱਟ ਪਰਫੌਰਮ ਨਹੀਂ ਕੀਤਾ ਗਿਆ ਸੀ ਕਿਉਂਕਿ ਸਿਸਟਮ ਕਲੀਅਰ ਸੇਵਾ ਉਪਲਬਧ ਨਹੀਂ ਹੈ।"</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"ਕੀ ਸਾਰਾ ਡਾਟਾ ਮਿਟਾਉਣਾ ਹੈ?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"ਇਸ ਉਪਭੋਗਤਾ ਲਈ ਫੈਕਟਰੀ ਰੀਸੈੱਟ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"ਮਿਟਾ ਰਿਹਾ ਹੈ"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"ਕਿਰਪਾ ਕਰਕੇ ਠਹਿਰੋ..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"ਸਾਰਾ ਡਾਟਾ ਮਿਟਾਓ"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"ਸਾਰਾ ਡਾਟਾ ਮਿਟਾਓ"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"ਤੁਹਾਡੀ ਸਾਰੀ ਨਿੱਜੀ ਜਾਣਕਾਰੀ ਅਤੇ ਡਾਊਨਲੋਡ ਕੀਤੀਆਂ ਐਪਾਂ ਨੂੰ ਮਿਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ। ਤੁਸੀਂ ਇਸ ਕਾਰਵਾਈ ਨੂੰ ਅਣਕੀਤਾ ਨਹੀਂ ਕਰ ਸਕਦੇ।"</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"ਡਾਊਨਲੋਡ ਕੀਤੀਆਂ ਐਪਾਂ ਅਤੇ ਸਿਮਾਂ ਸਮੇਤ ਤੁਹਾਡੀ ਸਾਰੀ ਨਿੱਜੀ ਜਾਣਕਾਰੀ ਮਿਟਾ ਦਿੱਤੀ ਜਾਵੇਗੀ। ਤੁਸੀਂ ਇਸ ਕਾਰਵਾਈ ਨੂੰ ਅਣਕੀਤਾ ਨਹੀਂ ਕਰ ਸਕਦੇ।"</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"ਕੀ ਸਾਰਾ ਡਾਟਾ ਮਿਟਾਉਣਾ ਹੈ?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"ਇਸ ਵਰਤੋਂਕਾਰ ਲਈ ਫੈਕਟਰੀ ਰੀਸੈੱਟ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"ਮਿਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"ਕਿਰਪਾ ਕਰਕੇ ਉਡੀਕ ਕਰੋ…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"ਕਾਲ ਸੈਟਿੰਗਾਂ"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"ਵੌਇਸਮੇਲ, ਕਾਲ ਫਾਰਵਰਡਿੰਗ, ਕਾਲ ਵੇਟਿੰਗ, ਕਾਲਰ ਆਈ.ਡੀ. ਸੈੱਟ ਅੱਪ ਕਰੋ"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB ਟੈਦਰਿੰਗ"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> ਤੋਂ ਵੱਧ ਡਿਵਾਈਸਾਂ ਨਾਲ ਟੀਥਰ ਨਹੀਂ ਕਰ ਸਕਦਾ।"</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਅਨਟੀਥਰ ਹੋ ਜਾਏਗਾ।"</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"ਈਥਰਨੈੱਟ ਟੈਦਰਿੰਗ"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"ਫ਼ੋਨ ਦੇ ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ ਨੂੰ USB ਈਥਰਨੈੱਟ ਰਾਹੀਂ ਸਾਂਝਾ ਕਰੋ"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"ਫ਼ੋਨ ਦੇ ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ ਨੂੰ ਈਥਰਨੈੱਟ ਰਾਹੀਂ ਸਾਂਝਾ ਕਰੋ"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"ਆਪਣੇ ਮੋਬਾਈਲ ਡਾਟਾ ਕਨੈਕਸ਼ਨ ਦੇ ਰਾਹੀਂ ਦੂਜਿਆਂ ਡੀਵਾਈਸਾਂ ਨੂੰ ਇੰਟਰਨੈੱਟ ਮੁਹੱਈਆ ਕਰਵਾਉਣ ਲਈ ਹੌਟਸਪੌਟ ਅਤੇ ਟੈਦਰਿੰਗ ਦੀ ਵਰਤੋਂ ਕਰੋ। ਨੇੜਲੇ ਡੀਵਾਈਸਾਂ ਨਾਲ ਸਮੱਗਰੀ ਨੂੰ ਸਾਂਝਾ ਕਰਨ ਲਈ ਐਪਾਂ ਵੀ ਇੱਕ ਹੌਟਸਪੌਟ ਬਣਾ ਸਕਦੀਆਂ ਹਨ।"</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"ਹੋਰਾਂ ਡੀਵਾਈਸਾਂ ਨੂੰ ਆਪਣੇ ਵਾਈ-ਫਾਈ ਜਾਂ ਮੋਬਾਈਲ ਡਾਟਾ ਕਨੈਕਸ਼ਨ ਰਾਹੀਂ ਇੰਟਰਨੈੱਟ ਮੁਹੱਈਆ ਕਰਵਾਉਣ ਲਈ ਹੌਟਸਪੌਟ ਅਤੇ ਟੈਦਰਿੰਗ ਵਰਤੋ। ਐਪਾਂ ਨਜ਼ਦੀਕੀ ਡੀਵਾਈਸਾਂ ਨਾਲ ਸਮੱਗਰੀ ਸਾਂਝਾ ਕਰਨ ਲਈ ਇੱਕ ਹੌਟਸਪੌਟ ਵੀ ਬਣਾ ਸਕਦੀਆਂ ਹਨ।"</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"ਮਦਦ"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"ਸੁਰਖੀ ਤਰਜੀਹਾਂ"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"ਵੱਡਦਰਸ਼ੀਕਰਨ"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"ਵੱਡਦਰਸ਼ੀਕਰਨ ਖੇਤਰ"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"ਵੱਡਦਰਸ਼ੀਕਰਨ ਚਾਲੂ ਕਰੋ"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"ਉਹਨਾਂ ਵੱਡਦਰਸ਼ੀਕਰਨ ਖੇਤਰ(ਰਾਂ) ਨੂੰ ਚੁਣੋ ਜਿਹਨਾਂ ਨੂੰ ਤੁਸੀਂ ਸਕ੍ਰੀਨ ਨੂੰ ਵੱਡਾ ਕਰਨ ਦੌਰਾਨ ਵਰਤਣਾ ਚਾਹੁੰਦੇ ਹੋ"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"ਪੂਰੀ ਸਕ੍ਰੀਨ"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"ਸਕ੍ਰੀਨ ਦਾ ਹਿੱਸਾ"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"ਪੂਰੀ ਸਕ੍ਰੀਨ &amp; ਸਕ੍ਰੀਨ ਦਾ ਹਿੱਸਾ"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"ਸਾਰੀ ਸਕ੍ਰੀਨ ਨੂੰ ਵੱਡਾ ਕਰੋ"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"ਸਕ੍ਰੀਨ ਦੇ ਹਿੱਸੇ ਨੂੰ ਵੱਡਾ ਕਰੋ"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"ਕੀ ਪਹੁੰਚਯੋਗਤਾ ਬਟਨ \'ਤੇ ਜਾਣਾ ਹੈ?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"ਸਕ੍ਰੀਨ ਦੇ ਕਿਸੇ ਹਿੱਸੇ ਦਾ ਵੱਡਦਰਸ਼ੀਕਰਨ ਕਰਨ ਲਈ ਟ੍ਰਿਪਲ ਟੈਪ ਨੂੰ ਵਰਤਣ ਨਾਲ, ਟਾਇਪਿੰਗ ਅਤੇ ਹੋਰ ਕਾਰਵਾਈਆਂ ਧੀਮੀਆਂ ਹੋ ਜਾਣਗੀਆਂ।\n\nਕੀ ਤੁਸੀਂ ਵੱਡਦਰਸ਼ੀਕਰਨ ਕਰਨ ਲਈ ਪਹੁੰਚਯੋਗਤਾ ਬਟਨ ਨੂੰ ਵਰਤਣਾ ਚਾਹੁੰਦੇ ਹੋ?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"ਪਹੁੰਚਯੋਗਤਾ ਬਟਨ \'ਤੇ ਜਾਓ"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"ਵੱਡਦਰਸ਼ੀਕਰਨ ਕਰਨ ਲਈ ਟ੍ਰਿਪਲ ਟੈਪ ਨੂੰ ਜਾਰੀ ਰੱਖੋ"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"ਵੱਡਦਰਸ਼ੀਕਰਨ ਸੈਟਿੰਗਾਂ"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"ਤਿੰਨ-ਟੈਪਾਂ ਨਾਲ ਵੱਡਾ ਕਰੋ"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"ਸ਼ਾਰਟਕੱਟ ਨਾਲ ਵੱਡਾ ਕਰੋ"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"ਪਾਵਰ ਬਟਨ ਨਾਲ ਕਾਲ ਕੱਟਣਾ"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"ਵੱਡਾ ਮਾਊਸ ਪੁਆਇੰਟਰ"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"ਐਨੀਮੇਸ਼ਨਾਂ ਹਟਾਓ"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"ਮੋਨੋ ਆਡੀਓ"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"ਆਡੀਓ ਚਲਾਉਣ ਦੌਰਾਨ ਚੈਨਲਾਂ ਨੂੰ ਇਕੱਠਾ ਕਰੋ"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"ਆਡੀਓ ਸੰਤੁਲਨ"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"ਖੱਬਾ"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"ਸੱਜਾ"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"ਮੋਨੋ ਆਡੀਓ"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"ਆਡੀਓ ਚਲਾਉਣ ਦੌਰਾਨ ਚੈਨਲਾਂ ਨੂੰ ਇਕੱਠਾ ਕਰੋ"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"ਆਡੀਓ ਸੰਤੁਲਨ"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"ਖੱਬਾ"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"ਸੱਜਾ"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"ਪੂਰਵ-ਨਿਰਧਾਰਤ"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 ਸਕਿੰਟ"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 ਸਕਿੰਟ"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"ਸੂਚਨਾ ਦੀ ਥਰਥਰਾਹਟ"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"ਘੰਟੀ ਦੀ ਥਰਥਰਾਹਟ"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"ਸਪਰਸ਼ ਸੰਬੰਧੀ ਪ੍ਰਤੀਕਰਮ"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ਵਰਤੋ"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ਖੋਲ੍ਹੋ"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"ਰੰਗ ਸੁਧਾਈ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"ਸੁਰਖੀਆਂ ਦਿਖਾਓ"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"ਸਿਰਫ਼ ਸਮਰਥਿਤ ਐਪ ਲਈ"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ਵਰਤੋ"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ਖੋਲ੍ਹੋ"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"ਰੰਗ ਸੁਧਾਈ ਵਰਤੋ"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"ਸੁਰਖੀਆਂ ਦਿਖਾਓ"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"ਸਿਰਫ਼ ਸਮਰਥਿਤ ਐਪ ਲਈ"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"ਸੁਰਖੀ ਦਾ ਆਕਾਰ ਅਤੇ ਸ਼ੈਲੀ"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> ਲਿਖਤ ਆਕਾਰ"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"ਹੋਰ ਵਿਕਲਪ"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"ਡਿਊਟ੍ਰੈਨੋਮਲੀ"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"ਪ੍ਰੋਟੈਨੋਮਲੀ"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"ਰੰਗ ਅਸਪਸ਼ਟਤਾ"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"ਗ੍ਰੇਸਕੇਲ"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"ਲਾਲ-ਹਰਾ"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"ਲਾਲ-ਹਰਾ"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"ਨੀਲਾ-ਪੀਲਾ"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"ਬੈਕਗ੍ਰਾਊਂਡ ਪਾਬੰਦੀ"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"ਐਪ ਨੂੰ ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਚੱਲਣ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"ਐਪ ਨੂੰ ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਚੱਲਣ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"ਬੈਕਗ੍ਰਾਊਂਡ ਵਰਤੋਂ \'ਤੇ ਪਾਬੰਦੀ ਨਹੀਂ ਲਗਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"ਬੈਕਗ੍ਰਾਊਂਡ ਵਰਤੋਂ \'ਤੇ ਪਾਬੰਦੀ ਨਹੀਂ ਲਗਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"ਕੀ ਬੈਕਗ੍ਰਾਊਂਡ ਸਰਗਰਮੀ ਸੀਮਿਤ ਕਰਨੀ ਹੈ?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"ਜੇਕਰ ਤੁਸੀਂ ਕਿਸੇ ਐਪ ਦੀ ਬੈਕਗ੍ਰਾਊਂਡ ਸਰਗਰਮੀ ਨੂੰ ਸੀਮਿਤ ਕਰਦੇ ਹੋ, ਤਾਂ ਉਹ ਅਜੀਬ ਢੰਗ ਨਾਲ ਵਰਤਾਅ ਕਰ ਸਕਦੀ ਹੈ"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"ਇਹ ਐਪ ਬੈਟਰੀ ਨੂੰ ਸੁਯੋਗ ਕਰੋ \'ਤੇ ਸੈੱਟ ਨਾ ਕੀਤੀ ਹੋਣ ਕਰਕੇ, ਤੁਸੀਂ ਇਸ \'ਤੇ ਪਾਬੰਧੀ ਨਹੀਂ ਲਗਾ ਸਕਦੇ।\n\nਐਪ \'ਤੇ ਪਾਬੰਧੀ ਲਗਾਉਣ ਲਈ, ਪਹਿਲਾਂ ਬੈਟਰੀ ਸੁਯੋਗਕਰਨ ਨੂੰ ਚਾਲੂ ਕਰੋ।"</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"ਕੋਈ ਸਮਾਂ-ਸੂਚੀ ਸੈੱਟ ਕਰੋ"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"ਬੈਟਰੀ ਲਾਈਫ਼ ਵਧਾਓ"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"ਚਾਰਜ ਹੋਣ \'ਤੇ ਬੰਦ ਕਰੋ"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"ਤੁਹਾਡਾ ਫ਼ੋਨ <xliff:g id="PERCENT">%1$s</xliff:g> \'ਤੇ ਹੋਣ ਉਪਰੰਤ ਬੈਟਰੀ ਸੇਵਰ ਬੰਦ ਹੋ ਜਾਂਦਾ ਹੈ"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ <xliff:g id="PERCENT">%1$s</xliff:g> \'ਤੇ ਹੋਣ ਉਪਰੰਤ ਬੈਟਰੀ ਸੇਵਰ ਬੰਦ ਹੋ ਜਾਂਦਾ ਹੈ"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"ਤੁਹਾਡਾ ਡੀਵਾਈਸ <xliff:g id="PERCENT">%1$s</xliff:g> \'ਤੇ ਹੋਣ ਉਪਰੰਤ ਬੈਟਰੀ ਸੇਵਰ ਬੰਦ ਹੋ ਜਾਂਦਾ ਹੈ"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"ਜਦੋਂ ਤੁਹਾਡਾ ਫ਼ੋਨ <xliff:g id="PERCENT">%1$s</xliff:g> ਤੋਂ ਵੱਧ ਚਾਰਜ ਹੋ ਜਾਂਦਾ ਹੈ ਤਾਂ ਬੈਟਰੀ ਸੇਵਰ ਮੋਡ ਬੰਦ ਹੋ ਜਾਂਦਾ ਹੈ"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"ਜਦੋਂ ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ <xliff:g id="PERCENT">%1$s</xliff:g> ਤੋਂ ਵੱਧ ਚਾਰਜ ਹੋ ਜਾਂਦਾ ਹੈ ਤਾਂ ਬੈਟਰੀ ਸੇਵਰ ਮੋਡ ਬੰਦ ਹੋ ਜਾਂਦਾ ਹੈ"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"ਜਦੋਂ ਤੁਹਾਡਾ ਡੀਵਾਈਸ <xliff:g id="PERCENT">%1$s</xliff:g> ਤੋਂ ਵੱਧ ਚਾਰਜ ਹੋ ਜਾਂਦਾ ਹੈ ਤਾਂ ਬੈਟਰੀ ਸੇਵਰ ਮੋਡ ਬੰਦ ਹੋ ਜਾਂਦਾ ਹੈ"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"ਚਾਲੂ ਕਰੋ"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"ਰੀਸੈੱਟ ਕਰੋ"</string>
     <string name="tts_play" msgid="2945513377250757221">"ਚਲਾਓ"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"ਅਡੈਪਟਿਵ ਕਨੈਕਟੀਵਿਟੀ"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"ਇਹ ਤੁਹਾਡੇ ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨਾਂ ਦਾ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਪ੍ਰਬੰਧਨ ਕਰਕੇ, ਬੈਟਰੀ ਲਾਈਫ਼ ਨੂੰ ਵਧਾਉਂਦੀ ਹੈ ਅਤੇ ਡੀਵਾਈਸ ਦੀ ਕਾਰਗੁਜ਼ਾਰੀ ਵਿੱਚ ਸੁਧਾਰ ਕਰਦੀ ਹੈ"</string>
     <string name="credentials_title" msgid="7535942196886123656">"ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਸਟੋਰੇਜ"</string>
     <string name="credentials_install" msgid="3933218407598415827">"ਪ੍ਰਮਾਣ-ਪੱਤਰ ਸਥਾਪਤ ਕਰੋ"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"ਸਟੋਰੇਜ ਤੋਂ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਸਥਾਪਤ ਕਰੋ"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"ਵਰਤੋਂਕਾਰ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"ਸਟੋਰ ਕੀਤੇ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਦੇਖੋ ਅਤੇ ਸੋਧੋ"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"ਵਿਕਸਿਤ"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"ਸਟੋਰੇਜ ਦੀ ਕਿਸਮ"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"ਹਾਰਡਵੇਅਰ-ਸਮਰਥਿਤ"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"ਕੇਵਲ ਸਾਫਟਵੇਅਰ"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"ਇਸ ਵਰਤੋਂਕਾਰ ਲਈ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਉਪਲਬਧ ਨਹੀਂ ਹਨ"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN ਅਤੇ ਐਪਾਂ ਲਈ ਸਥਾਪਤ ਕੀਤਾ ਗਿਆ"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"ਵਾਈ-ਫਾਈ ਲਈ ਸਥਾਪਤ ਕੀਤਾ ਗਿਆ"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"ਟਰਮੀਨਲ \'ਤੇ ਭੁਗਤਾਨ ਕਰਨਾ"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"ਇੱਕ ਭੁਗਤਾਨ ਐਪ ਸੈੱਟ ਅੱਪ ਕਰੋ। ਫਿਰ ਸੰਪਰਕ-ਰਹਿਤ ਚਿੰਨ੍ਹ ਵਾਲੇ ਕਿਸੇ ਵੀ ਟਰਮੀਨਲ ਵੱਲ ਨੂੰ ਆਪਣੇ ਫ਼ੋਨ ਦਾ ਪਿਛਲਾ ਪਾਸਾ ਸਿਰਫ਼ ਫੜ੍ਹ ਕੇ ਰੱਖੋ।"</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"ਸਮਝ ਲਿਆ"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"ਹੋਰ..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"ਹੋਰ…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਭੁਗਤਾਨ ਐਪ ਸੈੱਟ ਕਰੋ"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਭੁਗਤਾਨ ਐਪ ਨੂੰ ਅੱਪਡੇਟ ਕਰੋ"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"ਸੰਪਰਕ-ਰਹਿਤ ਟਰਮੀਨਲ ਵਿਖੇ, <xliff:g id="APP">%1$s</xliff:g> ਨਾਲ ਭੁਗਤਾਨ ਕਰੋ"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"ਕਾਲਾਂ ਲਈ ਹਮੇਸ਼ਾਂ ਇਹ ਵਰਤੋ"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">" ਡਾਟਾ  ਲਈ ਇੱਕ SIM ਚੁਣੋ"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"SMS ਲਈ ਕੋਈ ਸਿਮ ਚੁਣੋ"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">" ਡਾਟਾ  SIM ਸਵਿਚ ਕਰਦੇ ਹੋਏ, ਇਸ ਵਿੱਚ ਇੱਕ ਮਿੰਟ ਲੱਗ ਸਕਦਾ ਹੈ..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"ਡਾਟਾ ਸਿਮ ਬਦਲਣ ਵਿੱਚ ਕੁਝ ਸਮਾਂ ਲੱਗ ਸਕਦਾ ਹੈ…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"ਇਸਦੇ ਨਾਲ ਕਾਲ ਕਰੋ"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"ਇੱਕ SIM ਕਾਰਡ ਚੁਣੋ"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"ਨਿਯਮਬੱਧ ਕੰਮ, ਸਮਾਂ-ਸੂਚੀ, ਬੈਟਰੀ ਸੇਵਰ, ਪਾਵਰ ਸੇਵਰ, ਬੈਟਰੀ, ਸਵੈਚਲਿਤ, ਫ਼ੀਸਦ"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, ਉੱਨਤ ਕਾਲਿੰਗ, 4g ਕਾਲਿੰਗ"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"ਭਾਸ਼ਾ ਸ਼ਾਮਲ ਕਰੋ, ਕੋਈ ਭਾਸ਼ਾ ਸ਼ਾਮਲ ਕਰੋ"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"ਲਿਖਤ ਦਾ ਆਕਾਰ"</string>
     <string name="default_sound" msgid="6604374495015245195">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਧੁਨੀ"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"ਘੰਟੀ ਅਤੇ ਸੂਚਨਾ ਦੀ ਅਵਾਜ਼ <xliff:g id="PERCENTAGE">%1$s</xliff:g> ਹੈ"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"ਅਵਾਜ਼, ਥਰਥਰਾਹਟ, ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"ਚਾਲੂ ਹੋਣ \'ਤੇ ਵੱਜਣ ਵਾਲੀਆਂ ਧੁਨੀਆਂ"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"ਲਾਈਵ ਸੁਰਖੀਆਂ"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"ਸਵੈਚਲਿਤ ਸੁਰਖੀ ਮੀਡੀਆ"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"ਕੋਈ ਨਹੀਂ"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> ਸਮਾਂ-ਸੂਚੀ ਸੈੱਟ ਕੀਤੀ ਗਈ</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ਸਮਾਂ-ਸੂਚੀਆਂ ਸੈੱਟ ਕੀਤੀਆਂ ਗਈਆਂ</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{ਕੋਈ ਨਹੀਂ}=1{1 ਸਮਾਂ-ਸੂਚੀ ਸੈੱਟ ਕੀਤੀ ਗਈ}other{# ਸਮਾਂ-ਸੂਚੀਆਂ ਸੈੱਟ ਕੀਤੀਆਂ ਗਈਆਂ}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"ਸਿਰਫ਼ ਮਹੱਤਵਪੂਰਨ ਲੋਕਾਂ ਅਤੇ ਐਪਾਂ ਵੱਲੋਂ ਸੂਚਨਾ ਪ੍ਰਾਪਤ ਕਰੋ"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"ਰੁਕਾਵਟਾਂ ਸੀਮਤ ਕਰੋ"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"ਸਿਰਫ਼ ਤਰਜੀਹੀ"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>। <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"ਚਾਲੂ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"ਬੰਦ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"ਬੰਦ"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"ਚਾਲੂ"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"ਹਰ ਵਾਰ ਪੁੱਛੋ"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ ਬੰਦ ਨਹੀਂ ਕਰਦੇ"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> ਘੰਟਾ</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> ਘੰਟੇ</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> ਮਿੰਟ"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> ਸਮਾਂ-ਸੂਚੀ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਚਾਲੂ ਹੋ ਸਕਦੀ ਹੈ</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ਸਮਾਂ-ਸੂਚੀਆਂ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਚਾਲੂ ਹੋ ਸਕਦੀਆਂ ਹਨ</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 ਘੰਟਾ}one{# ਘੰਟਾ}other{# ਘੰਟੇ}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 ਮਿੰਟ}one{# ਮਿੰਟ}other{# ਮਿੰਟ}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{ਬੰਦ}=1{ਬੰਦ / 1 ਸਮਾਂ-ਸੂਚੀ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਚਾਲੂ ਹੋ ਸਕਦੀ ਹੈ}other{ਬੰਦ / # ਸਮਾਂ-ਸੂਚੀਆਂ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਚਾਲੂ ਹੋ ਸਕਦੀਆਂ ਹਨ}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"\'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਮੋਡ ਵਿੱਚ ਕਿਹੜੀਆਂ ਚੀਜ਼ਾਂ ਵਿਘਨ ਪਾ ਸਕਦੀਆਂ ਹਨ"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"ਲੋਕ"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"ਐਪਾਂ"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"ਘੱਟ ਤਰਜੀਹ ਵਾਲੀਆਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ \'ਸਰਲ\' \'ਤੇ ਸੈੱਟ ਕਰੋ"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"ਅਨੁਕੂਲ ਸੂਚਨਾ ਦਰਜਾ"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"ਢੁਕਵੇਂਪਣ ਮੁਤਾਬਕ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਦਰਜਾਬੰਦ ਕੀਤੀਆਂ ਸੂਚਨਾਵਾਂ"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"ਅਨੁਕੂਲ ਸੂਚਨਾ ਸੰਬੰਧੀ ਵਿਚਾਰ"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"ਸੂਚਨਾ ਵਿੱਚ ਕੀਤੀਆਂ ਗਈਆਂ ਵਿਵਸਥਾਵਾਂ ਬਾਰੇ ਸੂਚਿਤ ਕਰੋ ਅਤੇ ਸਿਸਟਮ ਨੂੰ ਵਿਚਾਰ ਮੁਹੱਈਆ ਕਰਨ ਦਾ ਵਿਕਲਪ ਦਿਖਾਓ"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"ਸੁਝਾਈਆਂ ਗਈਆਂ ਕਾਰਵਾਈਆਂ ਅਤੇ ਜਵਾਬ"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਸੁਝਾਈਆਂ ਗਈਆਂ ਕਾਰਵਾਈਆਂ ਅਤੇ ਜਵਾਬਾਂ ਨੂੰ ਦਿਖਾਓ"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"ਹਾਲੀਆਂ ਅਤੇ ਸਨੂਜ਼ ਕੀਤੀਆਂ ਸੂਚਨਾਵਾਂ ਦਿਖਾਓ"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"\'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਤੱਕ ਪਹੁੰਚ"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"\'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਨੂੰ ਚਾਲੂ ਕਰਨ ਦਿਓ"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"ਕਿਸੇ ਵੀ ਸਥਾਪਤ ਐਪਾਂ ਨੇ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਪਹੁੰਚ ਦੀ ਬੇਨਤੀ ਨਹੀਂ ਕੀਤੀ ਹੈ"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"ਐਪਸ ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"ਐਪਾਂ ਨੂੰ ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"ਤੁਹਾਡੀ ਬੇਨਤੀ ਕਾਰਨ, Android ਵੱਲੋਂ ਇਸ ਐਪ ਦੀਆਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਦਿਖਾਏ ਜਾਣ ਤੋਂ ਬਲਾਕ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"ਤੁਹਾਡੀ ਬੇਨਤੀ ਕਾਰਨ, Android ਵੱਲੋਂ ਸੂਚਨਾਵਾਂ ਦੀ ਇਸ ਸ਼੍ਰੇਣੀ ਨੂੰ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਦਿਖਾਏ ਜਾਣ ਤੋਂ ਬਲਾਕ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"ਤੁਹਾਡੀ ਬੇਨਤੀ ਕਾਰਨ, Android ਵੱਲੋਂ ਸੂਚਨਾਵਾਂ ਦੇ ਇਸ ਗਰੁੱਪ ਨੂੰ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਦਿਖਾਏ ਜਾਣ ਤੋਂ ਬਲਾਕ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"ਸਾਰੀਆਂ ਗੱਲਾਂਬਾਤਾਂ"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"ਤਰਜੀਹੀ ਗੱਲਾਂਬਾਤਾਂ"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"ਕੋਈ ਨਹੀਂ"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> ਗੱਲਬਾਤ</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> ਗੱਲਾਂਬਾਤਾਂ</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"ਕੋਈ ਨਹੀਂ"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{ਕੋਈ ਨਹੀਂ}=1{1 ਗੱਲਬਾਤ}other{# ਗੱਲਾਂਬਾਤਾਂ}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"ਕੌਣ ਵਿਘਨ ਪਾ ਸਕਦਾ ਹੈ"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"ਕਾਲਾਂ"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"ਕਾਲਾਂ"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"ਇਹ ਪੱਕਾ ਕਰਨ ਲਈ ਕਿ ਮਨਜ਼ੂਰਸ਼ੁਦਾ ਕਾਲਾਂ ਲਈ ਧੁਨੀ ਵਜਦੀ ਹੈ, ਜਾਂਚ ਕਰੋ ਕਿ ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਘੰਟੀ \'ਤੇ ਸੈੱਟ ਹੈ"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ ਲਈ ਆਉਣ ਵਾਲੀਆਂ ਕਾਲਾਂ ਬਲਾਕ ਕੀਤੀਆਂ ਗਈਆਂ ਹਨ। ਤੁਸੀਂ ਆਪਣੇ ਦੋਸਤਾਂ, ਪਰਿਵਾਰਕ ਮੈਂਬਰਾਂ ਜਾਂ ਹੋਰ ਸੰਪਰਕਾਂ ਨੂੰ ਤੁਹਾਨੂੰ ਸੰਪਰਕ ਕਰਨ ਦੇਣ ਲਈ ਸੈਟਿੰਗਾਂ ਨੂੰ ਵਿਵਸਥਿਤ ਕਰ ਸਕਦੇ ਹੋ।"</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"ਤਾਰਾਬੱਧ ਸੰਪਰਕ"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one"><xliff:g id="NUM_PEOPLE">%d</xliff:g> ਹੋਰ</item>
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> ਹੋਰ</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"ਕੋਈ ਨਹੀਂ"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{ਕੋਈ ਨਹੀਂ}=1{{contact_1}}=2{{contact_1} ਅਤੇ {contact_2}}=3{{contact_1}, {contact_2}, ਅਤੇ {contact_3}}other{{contact_1}, {contact_2}, ਅਤੇ # ਹੋਰ}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Messages"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"ਸੁਨੇਹੇ"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"ਸੁਨੇਹੇ"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ ਲਈ ਇਨਕਮਿੰਗ ਸੁਨੇਹੇ ਬਲਾਕ ਕੀਤੇ ਗਏ ਹਨ। ਤੁਸੀਂ ਆਪਣੇ ਦੋਸਤਾਂ, ਪਰਿਵਾਰਕ ਮੈਂਬਰਾਂ ਜਾਂ ਹੋਰ ਸੰਪਰਕਾਂ ਨੂੰ ਤੁਹਾਨੂੰ ਸੰਪਰਕ ਕਰਨ ਦੇਣ ਲਈ ਸੈਟਿੰਗਾਂ ਨੂੰ ਵਿਵਸਥਿਤ ਕਰ ਸਕਦੇ ਹੋ।"</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"ਸਾਰੇ ਸੁਨੇਹੇ ਤੁਹਾਡੇ ਤੱਕ ਪਹੁੰਚ ਕਰ ਸਕਦੇ ਹਨ"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"ਸਾਰੀਆਂ ਕਾਲਾਂ ਤੁਹਾਡੇ ਤੱਕ ਪਹੁੰਚ ਕਰ ਸਕਦੀਆਂ ਹਨ"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"ਕੋਈ ਨਹੀਂ"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> ਸੰਪਰਕ</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> ਸੰਪਰਕ</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{ਕੋਈ ਨਹੀਂ}=1{1 ਸੰਪਰਕ}other{# ਸੰਪਰਕ}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"ਕੋਈ ਵੀ"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"ਸੰਪਰਕ"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"ਤਾਰਾਬੱਧ ਸੰਪਰਕ"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"ਸਭ ਸੂਚਨਾਵਾਂ"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"ਕੁਝ ਸੂਚਨਾਵਾਂ"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"ਚੁਣੇ ਗਏ ਲੋਕ ਹਾਲੇ ਵੀ ਤੁਹਾਡੇ ਤੱਕ ਪਹੁੰਚ ਕਰ ਸਕਦੇ ਹਨ, ਭਾਵੇਂ ਤੁਸੀਂ ਐਪਾਂ ਨੂੰ ਵਿਘਨ ਪਾਉਣ ਦੀ ਆਗਿਆ ਨਹੀਂ ਦਿੰਦੇ"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one"><xliff:g id="APP_NAMES">%s</xliff:g> ਕਰਕੇ ਵਿਘਨ ਪੈ ਸਕਦਾ ਹੈ</item>
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> ਕਰਕੇ ਵਿਘਨ ਪੈ ਸਕਦਾ ਹੈ</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> ਹੋਰ"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{ਕੋਈ ਵੀ ਐਪ ਵਿਘਨ ਨਹੀਂ ਪਾ ਸਕਦੀ}=1{{app_1} ਕਰਕੇ ਵਿਘਨ ਪੈ ਸਕਦਾ ਹੈ}=2{{app_1} ਅਤੇ {app_2} ਕਰਕੇ ਵਿਘਨ ਪੈ ਸਕਦਾ ਹੈ}=3{{app_1}, {app_2}, ਅਤੇ {app_3} ਕਰਕੇ ਵਿਘਨ ਪੈ ਸਕਦਾ ਹੈ}other{{app_1}, {app_2}, ਅਤੇ # ਹੋਰ ਐਪਾਂ ਕਰਕੇ ਵਿਘਨ ਪੈ ਸਕਦਾ ਹੈ}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"ਐਪਾਂ"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"ਸਭ ਸੂਚਨਾਵਾਂ"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"ਕੁਝ ਸੂਚਨਾਵਾਂ"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"ਸੂਚਨਾਵਾਂ ਜੋ ਵਿਘਨ ਪਾ ਸਕਦੀਆਂ ਹਨ"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"ਸਭ ਸੂਚਨਾਵਾਂ ਨੂੰ ਇਜਾਜ਼ਤ ਦਿਓ"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> ਕਰਕੇ ਵਿਘਨ ਪੈ ਸਕਦਾ ਹੈ</item>
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> ਕਰਕੇ ਵਿਘਨ ਪੈ ਸਕਦਾ ਹੈ</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"ਕੋਈ ਵੀ ਚੀਜ਼ ਵਿਘਨ ਨਹੀਂ ਪਾ ਸਕਦੀ"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> ਹੋਰ"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{ਕੋਈ ਵੀ ਚੀਜ਼ ਵਿਘਨ ਨਹੀਂ ਪਾ ਸਕਦੀ}=1{{sound_category_1} ਕਰਕੇ ਵਿਘਨ ਪੈ ਸਕਦਾ ਹੈ}=2{{sound_category_1} ਅਤੇ {sound_category_2} ਕਰਕੇ ਵਿਘਨ ਪੈ ਸਕਦਾ ਹੈ}=3{{sound_category_1}, {sound_category_2}, ਅਤੇ{sound_category_3} ਕਰਕੇ ਵਿਘਨ ਪੈ ਸਕਦਾ ਹੈ}other{{sound_category_1}, {sound_category_2}, ਅਤੇ # ਹੋਰ ਚੀਜ਼ਾਂ ਕਰਕੇ ਵਿਘਨ ਪੈ ਸਕਦਾ ਹੈ}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"ਕੋਈ ਵੀ ਚੀਜ਼ ਵਿਘਨ ਨਹੀਂ ਪਾ ਸਕਦੀ"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"ਕੋਈ ਵੀ ਵਿਘਨ ਨਹੀਂ ਪਾ ਸਕਦਾ"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"ਕੁਝ ਲੋਕ ਵਿਘਨ ਪਾ ਸਕਦੇ ਹਨ"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"ਸਾਰੇ ਲੋਕ ਵਿਘਨ ਪਾ ਸਕਦੇ ਹਨ"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"ਇਸ ਵੱਲੋਂ USB ਨੂੰ ਕੰਟਰੋਲ ਕੀਤਾ ਜਾਂਦਾ ਹੈ"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"ਕਨੈਕਟ ਕੀਤਾ ਡੀਵਾਈਸ"</string>
     <string name="usb_control_device" msgid="527916783743021577">"ਇਹ ਡੀਵਾਈਸ"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"ਬਦਲਿਆ ਜਾ ਰਿਹਾ ਹੈ..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"ਬਦਲਿਆ ਜਾ ਰਿਹਾ ਹੈ…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"ਬਦਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਚਾਰਜ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"ਕਨੈਕਟ ਕੀਤੇ ਡੀਵਾਈਸ ਨੂੰ ਚਾਰਜ ਕਰਨਾ"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"ਵੇਰਵੇ ਦੇਖੋ"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"ਡਾਟਾ ਸੇਵਰ"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"ਅਣ-ਪ੍ਰਤੀਬੰਧਿਤ ਡਾਟਾ ਤੱਕ ਪਹੁੰਚ"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"ਪਿਛੋਕੜ  ਡਾਟਾ  ਬੰਦ ਕੀਤਾ ਗਿਆ ਹੈ"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"ਬੈਕਗ੍ਰਾਊਂਡ ਡਾਟਾ ਬੰਦ ਕੀਤਾ ਗਿਆ ਹੈ"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"ਚਾਲੂ"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"ਬੰਦ"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"ਡਾਟਾ ਸੇਵਰ ਵਰਤੋ"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"ਜੇਕਰ ਡੀਵਾਈਸ ਲਾਕ ਹੈ, ਤਾਂ ਸੂਚਨਾਵਾਂ ਵਿੱਚ ਜਵਾਬਾਂ ਜਾਂ ਹੋਰ ਲਿਖਤੀ ਸੁਨੇਹਿਆਂ ਨੂੰ ਟਾਈਪ ਕਰਨ ਤੋਂ ਰੋਕੋ"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਸਪੈੱਲ-ਚੈਕਰ"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"ਸਪੈੱਲ ਚੈਕਰ ਚੁਣੋ"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"ਸਪੈੱਲ-ਚੈਕਰ ਵਰਤੋ"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"ਸਪੈੱਲ-ਚੈਕਰ ਵਰਤੋ"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"ਚੁਣਿਆ ਨਹੀਂ ਗਿਆ"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(ਕੋਈ ਨਹੀਂ)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"ਸਟੋਰੇਜ ਦੀ ਜਗ੍ਹਾ ਖਾਲੀ ਕਰਨ ਵਿੱਚ ਮਦਦ ਲਈ, ਸਟੋਰੇਜ ਪ੍ਰਬੰਧਕ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਤੋਂ ਬੈਕਅੱਪ ਲਈਆਂ ਗਈਆਂ ਫ਼ੋਟੋਆਂ ਅਤੇ ਵੀਡੀਓ ਹਟਾਉਂਦਾ ਹੈ।"</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"ਫੋਟੋਆਂ ਅਤੇ ਵੀਡੀਓ ਹਟਾਓ"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"ਸਟੋਰੇਜ ਪ੍ਰਬੰਧਕ"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"ਸਟੋਰੇਜ ਪ੍ਰਬੰਧਕ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"ਸਟੋਰੇਜ ਪ੍ਰਬੰਧਕ ਵਰਤੋ"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"ਸਵੈਚਾਲਿਤ"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"ਦਸਤੀ"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"ਹੁਣੇ ਜਗ੍ਹਾ ਖਾਲੀ ਕਰੋ"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"ਫ਼ੋਨ ਚੈੱਕ ਕਰਨ ਲਈ ਡਬਲ ਟੈਪ ਕਰੋ"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"ਸੂਚਨਾਵਾਂ ਦੇਖਣ ਲਈ ਟੈਬਲੈੱਟ \'ਤੇ ਦੋ ਵਾਰ ਟੈਪ ਕਰੋ"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"ਸੂਚਨਾਵਾਂ ਦੇਖਣ ਲਈ ਡੀਵਾਈਸ \'ਤੇ ਦੋ ਵਾਰ ਟੈਪ ਕਰੋ"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"ਸੂਚਨਾਵਾਂ ਲਈ ਸਵਾਈਪ ਕਰੋ"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"ਆਪਣੀਆਂ ਸੂਚਨਾਵਾਂ ਦਿਖਾਉਣ ਲਈ ਸਕ੍ਰੀਨ ਦੇ ਹੇਠਲੇ ਕਿਨਾਰੇ \'ਤੇ ਸਵਾਈਪ ਕਰੋ"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"ਇੱਕ ਹੱਥ ਮੋਡ"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"ਇੱਕ ਹੱਥ ਮੋਡ ਵਰਤੋ"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"ਐਪਾਂ ਵਿਚਾਲੇ ਅਦਲਾ-ਬਦਲੀ ਕਰਨ ਵੇਲੇ ਇੱਕ ਹੱਥ ਮੋਡ ਤੋਂ ਬਾਹਰ ਜਾਓ"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"ਸਮਾਂ ਸਮਾਪਤ"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 ਸਕਿੰਟ"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 ਸਕਿੰਟ"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 ਸਕਿੰਟ"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"ਅੱਪੜਨਯੋਗਤਾ"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"ਸਮਾਂ, ਸੂਚਨਾਵਾਂ ਅਤੇ ਹੋਰ ਜਾਣਕਾਰੀ ਦੇਖਣ ਲਈ ਆਪਣੀ ਸਕ੍ਰੀਨ \'ਤੇ ਡਬਲ ਟੈਪ ਕਰੋ।"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"ਫ਼ੋਨ ਦੇਖਣ ਲਈ ਚੁੱਕੋ"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"ਸੂਚਨਾਵਾਂ ਦੇਖਣ ਲਈ ਟੈਬਲੈੱਟ ਨੂੰ ਚੁੱਕੋ"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"ਟੈਬਲੈੱਟ ਦੇਖਣ ਲਈ ਟੈਪ ਕਰੋ"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"ਡੀਵਾਈਸ ਦੇਖਣ ਲਈ ਟੈਪ ਕਰੋ"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"ਸਮਾਂ, ਸੂਚਨਾਵਾਂ ਅਤੇ ਹੋਰ ਜਾਣਕਾਰੀ ਦੇਖਣ ਲਈ ਆਪਣੀ ਸਕ੍ਰੀਨ \'ਤੇ ਟੈਪ ਕਰੋ।"</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"ਖਤਰੇ ਦੀ ਸੂਚਨਾ ਸੰਬੰਧੀ ਬਟਨ"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"ਪਾਵਰ ਬਟਨ ਨੂੰ ਤੇਜ਼ੀ ਨਾਲ 5 ਵਾਰ ਦੱਬ ਕੇ ਸੰਕਟਕਾਲੀਨ SOS ਕਾਰਵਾਈਆਂ ਸ਼ੁਰੂ ਕਰੋ।"</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"ਚਿਤਾਵਨੀ ਧੁਨੀ"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"ਕਾਰਵਾਈਆਂ ਸ਼ੁਰੂ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਸੁਚੇਤਨਾ ਦਿਓ"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"ਸੰਕਟਕਾਲੀਨ ਸੰਪਰਕ"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"ਸੂਚਨਾਵਾਂ ਲਈ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸਵਾਈਪ ਕਰੋ"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਨੂੰ ਸਵਾਈਪ ਕਰੋ"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"ਆਪਣੀਆਂ ਸੂਚਨਾਵਾਂ ਦੇਖਣ ਲਈ, ਆਪਣੇ ਫ਼ੋਨ ਦੇ ਪਿਛਲੇ ਪਾਸੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਂਸਰ \'ਤੇ ਹੇਠਾਂ ਨੂੰ ਸਵਾਈਪ ਕਰੋ।"</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"ਸਾਰੀਆਂ ਐਪਾਂ ਲਈ ਚਾਲੂ ਕਰੋ"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"ਗ੍ਰਾਫ਼ਿਕ ਡਰਾਈਵਰ ਚੁਣੋ"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"ਪੂਰਵ-ਨਿਰਧਾਰਤ"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"ਗੇਮ ਡਰਾਈਵਰ"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"ਗੇਮ ਡਰਾਈਵਰ"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"ਵਿਕਾਸਕਾਰ ਡਰਾਈਵਰ"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"ਸਿਸਟਮ ਗ੍ਰਾਫ਼ਿਕ ਡਰਾਈਵਰ"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"ਨੈੱਟਵਰਕ ਨਹੀਂ ਮਿਲ ਸਕੇ। ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(ਵਰਜਿਤ)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"ਕੋਈ ਸਿਮ ਕਾਰਡ ਨਹੀਂ"</string>
+    <string name="sim_card" msgid="6381158752066377709">"ਸਿਮ"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"ਸਿਮ ਨਹੀਂ ਹੈ"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"ਕੋਈ ਨਹੀਂ"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"ਕਨੈਕਟ ਕਰਨ ਲਈ ਸਿਮ ਲੋੜੀਂਦਾ ਹੈ"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"ਕਨੈਕਟ ਕਰਨ ਲਈ <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> ਸਿਮ ਲੋੜੀਂਦਾ ਹੈ"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"ਤਰਜੀਹੀ ਨੈੱਟਵਰਕ ਮੋਡ: ਤਰਜੀਹੀ WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"ਤਰਜੀਹੀ ਨੈੱਟਵਰਕ ਮੋਡ: ਸਿਰਫ਼ GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"ਤਰਜੀਹੀ ਨੈੱਟਵਰਕ ਮੋਡ: ਸਿਰਫ਼ WCDMA"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"ਮੋਬਾਈਲ ਡਾਟਾ"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਡਾਟੇ ਤੱਕ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕਰੋ"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"ਰੇਂਜ ਵਿੱਚ ਹੋਣ \'ਤੇ ਫ਼ੋਨ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਇਸ ਕੈਰੀਅਰ \'ਤੇ ਜਾਵੇਗਾ"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"ਕੋਈ ਸਿਮ ਕਾਰਡ ਉਪਲਬਧ ਨਹੀਂ"</string>
     <string name="calls_preference" msgid="2166481296066890129">"ਕਾਲਾਂ ਦੀ ਤਰਜੀਹ"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS ਦੀ ਤਰਜੀਹ"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"ਹਰ ਵਾਰ ਪੁੱਛੋ"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"\'ਸੈਟਿੰਗਾਂ\' \'ਤੇ ਸਕ੍ਰੀਨ ਓਵਰਲੇ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"ਉਹਨਾਂ ਐਪਾਂ ਨੂੰ ਇਜਾਜ਼ਤ ਦਿਓ ਜੋ \'ਸੈਟਿੰਗਾਂ\' ਸਕ੍ਰੀਨਾਂ ਨੂੰ ਓਵਰਲੇ ਕਰਨ ਲਈ ਦੂਜੀਆਂ ਐਪਾਂ ਦੇ ਉੱਪਰ ਪ੍ਰਦਰਸ਼ਿਤ ਹੋ ਸਕਦੀਆਂ ਹਨ"</string>
     <string name="media_controls_title" msgid="403271085636252597">"ਮੀਡੀਆ"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"ਮੀਡੀਆ ਸੈਸ਼ਨ ਸਮਾਪਤ ਹੋਣ \'ਤੇ ਪਲੇਅਰ ਨੂੰ ਲੁਕਾਓ"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"ਪਲੇਅਰ ਤੁਹਾਨੂੰ ਵਿਸਤ੍ਰਿਤ ਤਤਕਾਲ ਸੈਟਿੰਗਾਂ ਪੈਨਲ ਤੋਂ ਸੈਸ਼ਨ ਨੂੰ ਮੁੜ-ਚਾਲੂ ਕਰਨ ਦਿੰਦਾ ਹੈ।"</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"ਤਤਕਾਲ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਮੀਡੀਆ ਪਲੇਅਰ"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"ਆਸਾਨੀ ਨਾਲ ਪਲੇਬੈਕ ਨੂੰ ਮੁੜ-ਚਾਲੂ ਕਰਨ ਲਈ ਮੀਡੀਆ ਪਲੇਅਰ ਨੂੰ ਲੰਮੇ ਸਮੇਂ ਲਈ ਦਿਖਾਓ"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"ਪਲੇਅਰ ਲੁਕਾਓ"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"ਪਲੇਅਰ ਦਿਖਾਓ"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"ਕੋਈ ਪਲੇਅਰ ਉਪਲਬਧ ਨਹੀਂ"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"ਮਨਜ਼ੂਰਸ਼ੁਦਾ ਐਪਾਂ"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"ਮੀਡੀਆ"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"ਬਲੂਟੁੱਥ ਚਾਲੂ ਹੋਵੇਗਾ"</string>
 </resources>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index c2c4ed0..9f14c8f 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Średni"</item>
     <item msgid="6740026006576843477">"Długi"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Krótko"</item>
+    <item msgid="7397961711906421599">"Średnio"</item>
+    <item msgid="4079132024502041928">"Długo"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Domyślna"</item>
     <item msgid="4234707448428002595">"Bezszeryfowa"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Globalny"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Tylko TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Globalne"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 021398e..f983a4d 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -300,7 +300,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Pokaż informacje o profilu na ekranie blokady"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Konta"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Lokalizacja"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Włącz lokalizację"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Użyj lokalizacji"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Wyłączono"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="few">Włączono – <xliff:g id="COUNT_1">%1$d</xliff:g> aplikacje mają dostęp do lokalizacji</item>
@@ -335,6 +335,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Użyj własnej twarzy do uwierzytelniania"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Rozpocznij"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Jeśli rozpoznawanie twarzy w ułatwieniach dostępu jest wyłączone, niektóre kroki konfiguracji mogą nie działać prawidłowo w przypadku TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Wstecz"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Kontynuuj"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Użyj konfiguracji ułatwień dostępu"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -635,7 +638,6 @@
       <item quantity="one">Musi mieć mniej niż <xliff:g id="NUMBER_0">%d</xliff:g> cyfrę</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Administrator urządzenia nie zezwala na ustawianie niedawno używanego kodu PIN"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Popularne kody PIN zostały zablokowane przez administratora. Spróbuj użyć innego kodu PIN."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Nie może zawierać nieprawidłowego znaku"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Musi zawierać co najmniej jedną literę"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Musi zawierać co najmniej jedną cyfrę"</string>
@@ -683,7 +685,6 @@
       <item quantity="one">Musi zawierać co najmniej 1 znak niebędący cyfrą</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Administrator urządzenia nie zezwala na ustawianie niedawno używanego hasła"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Popularne hasła zostały zablokowane przez administratora. Spróbuj użyć innego hasła."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Ciąg cyfr rosnących, malejących lub powtarzających się jest niedozwolony"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Potwierdź"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Anuluj"</string>
@@ -829,7 +830,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Włącz Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Użyj Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Użyj Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Ustawienia Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Konfiguruj punkty dostępowe sieci bezprzewodowej i zarządzaj nimi"</string>
@@ -937,7 +938,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Wyśrodkuj kod QR poniżej, by połączyć się z siecią „<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Zeskanuj kod QR i połącz się z siecią Wi-Fi"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Udostępnij Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Zeskanuj ten kod QR, by połączyć się z siecią „<xliff:g id="SSID">%1$s</xliff:g>” i skorzystać z udostępnionego hasła"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Zeskanuj ten kod QR przy użyciu innego urządzenia, by połączyć się z siecią „<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Zeskanuj ten kod QR, by połączyć się z siecią „<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Spróbuj ponownie. Jeśli problem się powtórzy, skontaktuj się z producentem urządzenia"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Coś poszło nie tak"</string>
@@ -963,8 +964,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Hasło do Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Hasło do hotspota: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Łącz automatycznie"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Pozwól telefonowi automatycznie łączyć się w pobliżu tej sieci"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Pozwól tabletowi automatycznie łączyć się w pobliżu tej sieci"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Zezwalaj na połączenie z tą siecią, gdy będziesz w jej zasięgu"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Dodaj urządzenie"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Dodaj urządzenie do tej sieci, używając kodu QR"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"Nieprawidłowy format kodu QR"</string>
@@ -976,7 +976,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Użyj certyfikatów systemowych"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Nie podawaj"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Nie sprawdzaj poprawności"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Nie określono certyfikatu. Twoje połączenie nie będzie prywatne."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Nazwa sieci jest zbyt długa."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Musisz określić domenę."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Wymagany certyfikat."</string>
@@ -1003,6 +1002,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Połącz"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi włączone"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Połączono z siecią <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Łączę z: <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Łączę…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Nie można nawiązać połączenia z siecią"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Poza zasięgiem sieci"</string>
@@ -1080,7 +1080,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Aplikacja udostępnia treści. Aby udostępnić połączenie z internetem, wyłącz i ponownie włącz hostpot"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Nie ustawiono hasła"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Nazwa hotspota"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Włączam: <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Włączam <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Inne urządzenia mogą łączyć się z: <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Hasło do hotspota"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Pasmo punktu dostępu"</string>
@@ -1230,7 +1230,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Płynne wyświetlanie"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"W przypadku niektórych treści automatycznie podwyższa częstotliwość odświeżania z 60 na 90 Hz. Zwiększa zużycie baterii."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Płynne wyświetlanie"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Wymuś częstotliwość odświeżania na poziomie 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Najszybsza częstotliwość odświeżania zapewnia szybszą reakcję na dotyk i wyższą jakość animacji. Zwiększa zużycie baterii."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Aktywność ekranu"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Włączone / Ekran nie wyłączy się, jeśli na niego patrzysz"</string>
@@ -1371,7 +1371,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Wersja Androida"</string>
     <string name="security_patch" msgid="4071756145347865382">"Aktualizacja zabezpieczeń Androida"</string>
     <string name="model_info" msgid="8997566254717810904">"Model"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Model: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Model i sprzęt"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Wersja sprzętu"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Identyfikator sprzętu"</string>
@@ -1646,31 +1645,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Ustawienia sieciowe zostały zresetowane"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Nie można usunąć danych z kart SIM"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Z powodu błędu nie można usunąć pobranych kart SIM.\n\nUruchom urządzenie ponownie i spróbuj jeszcze raz."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Wykasuj wszystkie dane (przywróć dane fabryczne)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Wykasuj wszystkie dane (przywróć dane fabryczne)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Zostaną usunięte wszystkie dane z "<b>"pamięci wewnętrznej"</b>" tabletu, w tym:\n\n"<li>"dane konta Google,"</li>\n<li>"dane i ustawienia systemu oraz aplikacji,"</li>\n<li>"pobrane aplikacje."</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Zostaną usunięte wszystkie dane z "<b>"pamięci wewnętrznej"</b>" telefonu, w tym:\n\n"<li>"dane konta Google"</li>\n<li>"dane i ustawienia systemu oraz aplikacji"</li>\n<li>"pobrane aplikacje"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"W tej chwili używasz kont:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Z tego urządzenia korzystają inni użytkownicy.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"muzyka"</li>\n<li>"zdjęcia"</li>\n<li>"inne dane użytkownika"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"karty eSIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Nie spowoduje to anulowania Twojego abonamentu w sieci komórkowej."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Aby usunąć muzykę, zdjęcia i inne dane użytkownika, należy wymazać "<b>"nośnik USB"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Aby usunąć muzykę, zdjęcia i inne dane użytkownika, należy wymazać "<b>"kartę SD"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Wykasuj wszystkie dane (przywróć dane fabryczne)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Wykasuj wszystkie dane (przywróć dane fabryczne)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Zostaną usunięte wszystkie dane z "<b>"pamięci wewnętrznej"</b>" tabletu, w tym:\n\n"<li>"dane konta Google,"</li>\n<li>"dane i ustawienia systemu oraz aplikacji,"</li>\n<li>"pobrane aplikacje."</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Zostaną usunięte wszystkie dane z "<b>"pamięci wewnętrznej"</b>" telefonu, w tym:\n\n"<li>"dane konta Google"</li>\n<li>"dane i ustawienia systemu oraz aplikacji"</li>\n<li>"pobrane aplikacje"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"W tej chwili używasz kont:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Z tego urządzenia korzystają inni użytkownicy.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"muzyka"</li>\n<li>"zdjęcia"</li>\n<li>"inne dane użytkownika"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"karty eSIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Nie spowoduje to anulowania Twojego abonamentu w sieci komórkowej."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Aby usunąć muzykę, zdjęcia i inne dane użytkownika, należy wymazać "<b>"nośnik USB"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Aby usunąć muzykę, zdjęcia i inne dane użytkownika, należy wymazać "<b>"kartę SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Wyczyść nośnik USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Wymaż kartę SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Usuń z wewnętrznego nośnika USB wszystkie dane, takie jak pliki muzyczne i zdjęcia"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Usuń z karty SD wszystkie dane, takie jak pliki muzyczne i zdjęcia"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Usuń wszystkie dane"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Usuń wszystkie dane"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Wszystkie Twoje dane osobowe oraz pobrane aplikacje zostaną usunięte. Nie można cofnąć tej czynności."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Wszystkie Twoje dane osobowe, w tym pobrane aplikacje i karty SIM, zostaną usunięte. Nie można cofnąć tej czynności."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Wymaż wszystko"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Nie wykonano resetowania, ponieważ usługa czyszczenia systemu jest niedostępna."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Usunąć wszystkie dane?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Przywracanie ustawień fabrycznych nie jest dostępne dla tego użytkownika"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Wymazuję"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Zaczekaj..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Usuń wszystkie dane"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Usuń wszystkie dane"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Wszystkie Twoje dane osobowe oraz pobrane aplikacje zostaną usunięte. Nie można cofnąć tej czynności."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Wszystkie Twoje dane osobowe, w tym pobrane aplikacje i karty SIM, zostaną usunięte. Nie można cofnąć tej czynności."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Usunąć wszystkie dane?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Przywracanie ustawień fabrycznych nie jest dostępne dla tego użytkownika"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Kasuję"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Zaczekaj…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Ustawienia połączeń"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Poczta głosowa, przekierowanie połączeń, poł. oczekujące, ID rozmówcy"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Tethering przez USB"</string>
@@ -1718,7 +1715,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Nie można powiązać więcej niż <xliff:g id="MAXCONNECTION">%1$d</xliff:g> urządzeń."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Powiązanie z urządzeniem <xliff:g id="DEVICE_NAME">%1$s</xliff:g> zostanie anulowane."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ethernet - tethering"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Udostępniaj połączenie telefonu z internetem przez Ethernet USB"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Udostępniaj połączenie telefonu z internetem przez Ethernet USB"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Funkcje hotspotu i tetheringu pozwalają zapewnić połączenie z internetem innym urządzeniom z wykorzystaniem komórkowego połączenia do transmisji danych. Aplikacje mogą też utworzyć hotspot, by udostępniać treści urządzeniom w pobliżu."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Funkcje hotspotu i tetheringu pozwalają zapewnić połączenie z internetem innym urządzeniom za pomocą Wi-Fi lub komórkowego połączenia transmisji danych. Aplikacje mogą też utworzyć hotspot, by udostępniać treści urządzeniom w pobliżu."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Pomoc"</string>
@@ -2165,13 +2162,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Ustawienia napisów"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Powiększenie"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Obszar powiększenia"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Włączanie powiększenia"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Wybierz obszar ekranu, który chcesz powiększyć"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Pełny ekran"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Część ekranu"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Pełny ekran i część ekranu"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Powiększ cały ekran"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Powiększ część ekranu"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Zmienić na przycisk ułatwień dostępu?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Trzykrotne klikanie, by powiększyć część ekranu, opóźnia pisanie i inne działania.\n\nCzy chcesz używać przycisku ułatwień dostępu do powiększania?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Zmień na przycisk ułatwień dostępu"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Pozostaw trzykrotnie klikanie, by powiększyć"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Ustawienia powiększenia"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Powiększ 3-krotnym kliknięciem"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Powiększanie skrótem"</string>
@@ -2225,11 +2225,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Przycisk zasilania rozłącza"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Duży wskaźnik myszy"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Usuń animacje"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Dźwięk mono"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Połącz kanały podczas odtwarzania dźwięku"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Balans dźwięku"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Lewa"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Prawa"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Dźwięk mono"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Połącz kanały podczas odtwarzania dźwięku"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Balans dźwięku"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Lewy"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Prawy"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Domyślny"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 sekund"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 sekund"</string>
@@ -2259,11 +2259,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Wibracja przy powiadomieniu"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Wibracja przy dzwonku"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Reakcja na dotyk"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Używanie aplikacji <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Otwórz aplikację <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Użyj korekcji kolorów"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Pokaż napisy"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Tylko w obsługiwanych aplikacjach"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Użyj usługi <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Otwórz <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Użyj korekcji kolorów"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Pokaż napisy"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Tylko w obsługiwanych aplikacjach"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Rozmiar i styl napisów"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> rozmiar tekstu"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Więcej opcji"</string>
@@ -2295,6 +2295,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomalia"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomalia"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomalia"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Tryb szarości"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Czerwony-zielony"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Czerwony-zielony"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Niebieski-żółty"</string>
@@ -2436,7 +2437,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Ograniczenie działania w tle"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Pozwól aplikacji działać w tle"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Aplikacja nie może działać w tle"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Nie można ograniczyć działania w tle"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Nie można ograniczyć działania w tle"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Ograniczyć aktywność w tle?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Jeśli ograniczysz aktywność aplikacji w tle, może ona działać nieprawidłowo"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Ta aplikacja nie jest skonfigurowana do optymalnego wykorzystywania baterii, więc nie możesz wprowadzić dla niej ograniczeń.\n\nAby wprowadzić ograniczenia dla aplikacji, najpierw włącz optymalizację baterii."</string>
@@ -2667,9 +2668,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Ustaw harmonogram"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Wydłużanie czasu pracy na baterii"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Wyłącz po naładowaniu"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Oszczędzanie baterii wyłączy się, gdy poziom naładowania telefonu wyniesie <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Oszczędzanie baterii wyłączy się, gdy poziom naładowania tabletu wyniesie <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Oszczędzanie baterii wyłączy się, gdy poziom naładowania urządzenia wyniesie <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Oszczędzanie baterii wyłączy się, gdy poziom naładowania telefonu przekroczy <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Oszczędzanie baterii wyłączy się, gdy poziom naładowania tabletu przekroczy <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Oszczędzanie baterii wyłączy się, gdy poziom naładowania urządzenia przekroczy <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Włącz"</string>
@@ -2734,6 +2735,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Resetuj"</string>
     <string name="tts_play" msgid="2945513377250757221">"Odtwórz"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Połączenie adaptacyjne"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Wydłuża czas pracy na baterii i poprawia wydajność urządzenia dzięki automatycznemu zarządzaniu połączeniami sieciowymi"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Magazyn danych logowania"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Zainstaluj certyfikat"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Zainstaluj certyfikaty z nośnika"</string>
@@ -2745,9 +2748,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Dane logowania użytkownika"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Wyświetl i zmień zapisane dane logowania"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Zaawansowane"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Typ pamięci"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Wspomagana sprzętowo"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Tylko programowa"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Ten użytkownik nie ma dostępu do poświadczeń"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Zainstalowane dla VPN i aplikacji"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Zainstalowane dla Wi-Fi"</string>
@@ -3146,7 +3146,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Płacenie na terminalu"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Skonfiguruj aplikację płatniczą, a później przyłóż tylną część telefonu do terminala z symbolem płatności zbliżeniowej."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"OK"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Więcej..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Więcej…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Ustaw domyślną aplikację do obsługi płatności"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Zmień domyślną aplikację do obsługi płatności"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Na terminalu zbliżeniowym płać przy użyciu: <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3230,7 +3230,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Zawsze używaj do połączeń"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Wybierz kartę SIM do transmisji danych"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Wybierz kartę SIM do SMS-ów"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Przełączanie karty SIM do transmisji danych. Może to potrwać do minuty..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Przełączanie karty SIM do transmisji danych. Może to potrwać do minuty…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Zadzwoń, używając karty:"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Wybierz kartę SIM"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"Karta SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3375,6 +3375,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"rutyna, harmonogram, oszczędzanie baterii, oszczędzanie energii, bateria, automatycznie, procent"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, połączenia zaawansowane, połączenia 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"dodaj język, dodawanie języka"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"rozmiar tekstu"</string>
     <string name="default_sound" msgid="6604374495015245195">"Dźwięk domyślny"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Głośność dzwonka i powiadomień na poziomie <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Głośność, wibracje, Nie przeszkadzać"</string>
@@ -3414,13 +3415,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Włącz dźwięki"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Napisy na żywo"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Automatycznie wyświetlaj napisy do multimediów"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Brak"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="few">Ustawiono <xliff:g id="ON_COUNT">%d</xliff:g> harmonogramy</item>
-      <item quantity="many">Ustawiono <xliff:g id="ON_COUNT">%d</xliff:g> harmonogramów</item>
-      <item quantity="other">Ustawiono <xliff:g id="ON_COUNT">%d</xliff:g> harmonogramu</item>
-      <item quantity="one">Ustawiono 1 harmonogram</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Brak}=1{Ustawiono 1 harmonogram}few{Ustawiono # harmonogramy}many{Ustawiono # harmonogramów}other{Ustawiono # harmonogramu}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Nie przeszkadzać"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Otrzymuj powiadomienia tylko od ważnych osób i z kluczowych aplikacji"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Ograniczanie powiadomień"</string>
@@ -3488,24 +3483,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Tylko priorytet"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Wł. / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Wyłączono / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Wyłączone"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Wł."</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Zawsze pytaj"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Dopóki nie wyłączysz"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="few"><xliff:g id="NUM_HOURS">%d</xliff:g> godziny</item>
-      <item quantity="many"><xliff:g id="NUM_HOURS">%d</xliff:g> godzin</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> godziny</item>
-      <item quantity="one">1 godzina</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> min"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="few"><xliff:g id="ON_COUNT">%d</xliff:g> harmonogramy mogą włączać się automatycznie</item>
-      <item quantity="many"><xliff:g id="ON_COUNT">%d</xliff:g> harmonogramów może włączać się automatycznie</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> harmonogramu może włączać się automatycznie</item>
-      <item quantity="one">1 harmonogram może włączać się automatycznie</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 godzina}few{# godziny}many{# godzin}other{# godziny}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minuta}few{# minuty}many{# minut}other{# minuty}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Wyłączono}=1{Wyłączono / 1 harmonogram może włączać się automatycznie}few{Wyłączono / # harmonogramy mogą włączać się automatycznie}many{Wyłączono / # harmonogramów może włączać się automatycznie}other{Wyłączono / # harmonogramu może włączać się automatycznie}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Ignorowanie trybu Nie przeszkadzać"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Osoby"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Aplikacje"</string>
@@ -3551,6 +3534,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Automatycznie kategoryzuj powiadomienia o niższym priorytecie jako subtelne"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Adaptacyjne porządkowanie powiadomień"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Automatycznie porządkuj powiadomienia według trafności"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Opinia na temat powiadomień adaptacyjnych"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Pokaż zmiany w ustawieniach powiadomień oraz wyświetl opcję przesyłania opinii do systemu"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Sugerowane działania i odpowiedzi"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Automatycznie pokazuj sugerowane działania i odpowiedzi"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Pokaż ostatnie i odłożone powiadomienia"</string>
@@ -3757,7 +3742,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Dostęp do „Nie przeszkadzać”"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Zezwól na dostęp do trybu Nie przeszkadzać"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Żadne zainstalowane aplikacje nie prosiły o dostęp do funkcji „Nie przeszkadzać”."</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Wczytuję aplikacje..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Ładuję aplikacje…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Android na żądanie blokuje powiadomienia z tej aplikacji na urządzeniu"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Android na żądanie blokuje tę kategorię powiadomień na urządzeniu"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Android na żądanie blokuje tę grupę powiadomień na urządzeniu"</string>
@@ -3855,13 +3840,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Wszystkie rozmowy"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Rozmowy priorytetowe"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Brak"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="few"><xliff:g id="CONVERSATIONS">%d</xliff:g> rozmowy</item>
-      <item quantity="many"><xliff:g id="CONVERSATIONS">%d</xliff:g> rozmów</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> rozmowy</item>
-      <item quantity="one">1 rozmowa</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Brak"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Brak}=1{1 rozmowa}few{# rozmowy}many{# rozmów}other{# rozmowy}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Osoby, które mogą ignorować tryb Nie przeszkadzać"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Połączenia"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Połączenia"</string>
@@ -3870,13 +3849,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Aby mieć pewność, że dopuszczone połączenia będą sygnalizowane dźwiękowo, sprawdź, czy urządzenie ma włączony dzwonek"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"W harmonogramie „<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>” połączenia przychodzące są zablokowane. Możesz dostosować ustawienia, tak by znajomi, rodzina i inne osoby z kontaktów mogły do Ciebie pisać."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Kontakty oznaczone gwiazdką"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="few"><xliff:g id="NUM_PEOPLE">%d</xliff:g> inne osoby</item>
-      <item quantity="many"><xliff:g id="NUM_PEOPLE">%d</xliff:g> innych osób</item>
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> innej osoby</item>
-      <item quantity="one">1 inna osoba.</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Brak"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Brak}=1{{contact_1}}=2{{contact_1} i {contact_2}}=3{{contact_1}, {contact_2} i {contact_3}}few{{contact_1}, {contact_2}i jeszcze # inne}many{{contact_1}, {contact_2}i jeszcze # innych}other{{contact_1}, {contact_2}i jeszcze # innego}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Wiadomości"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"wiadomości"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Wiadomości"</string>
@@ -3885,13 +3858,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"W harmonogramie „<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>” powiadomienia o SMS-ach przychodzących są zablokowane. Możesz dostosować ustawienia, tak by znajomi, rodzina i inne osoby z kontaktów mogły się z Tobą skontaktować."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Dotrą do Ciebie wszystkie wiadomości"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Dotrą do Ciebie wszystkie połączenia"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Brak"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="few"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontakty</item>
-      <item quantity="many"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontaktów</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontaktu</item>
-      <item quantity="one">1 kontakt</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Brak}=1{1 kontakt}few{# kontakty}many{# kontaktów}other{# kontaktu}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Wszyscy"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Kontakty"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Kontakty oznaczone gwiazdką"</string>
@@ -3929,26 +3896,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Wszystkie powiadomienia"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Kilka powiadomień"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Wybrane osoby mogą nadal się z Tobą kontaktować, nawet jeśli nie zezwolisz aplikacjom na ignorowanie trybu Nie przeszkadzać"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="few">Aplikacje <xliff:g id="APP_NAMES">%s</xliff:g> mogą ignorować tryb Nie przeszkadzać</item>
-      <item quantity="many">Aplikacje <xliff:g id="APP_NAMES">%s</xliff:g> mogą ignorować tryb Nie przeszkadzać</item>
-      <item quantity="other">Aplikacje <xliff:g id="APP_NAMES">%s</xliff:g> mogą ignorować tryb Nie przeszkadzać</item>
-      <item quantity="one">Aplikacja <xliff:g id="APP_NAME_0">%s</xliff:g> może ignorować tryb Nie przeszkadzać</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"Jeszcze <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Żadna aplikacja nie może ignorować trybu Nie przeszkadzać}=1{Aplikacja {app_1} może ignorować tryb Nie przeszkadzać}=2{Aplikacje {app_1} i {app_2} mogą ignorować tryb Nie przeszkadzać}=3{{app_1}, {app_2} i {app_3} mogą ignorować tryb Nie przeszkadzać}few{Aplikacje {app_1}, {app_2} i jeszcze # mogą ignorować tryb Nie przeszkadzać}many{Aplikacje {app_1}, {app_2} i jeszcze # mogą ignorować tryb Nie przeszkadzać}other{Aplikacje {app_1}, {app_2} i jeszcze # mogą ignorować tryb Nie przeszkadzać}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Aplikacje"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Wszystkie powiadomienia"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Kilka powiadomień"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Które powiadomienia mogą ignorować tryb Nie przeszkadzać"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Zezwalaj na wszystkie powiadomienia"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="few">Dźwięki z kategorii <xliff:g id="SOUND_CATEGORIES">%s</xliff:g> mogą ignorować tryb Nie przeszkadzać</item>
-      <item quantity="many">Dźwięki z kategorii <xliff:g id="SOUND_CATEGORIES">%s</xliff:g> mogą ignorować tryb Nie przeszkadzać</item>
-      <item quantity="other">Dźwięki z kategorii <xliff:g id="SOUND_CATEGORIES">%s</xliff:g> mogą ignorować tryb Nie przeszkadzać</item>
-      <item quantity="one">Dźwięki z kategorii <xliff:g id="SOUND_CATEGORY">%s</xliff:g> mogą ignorować tryb Nie przeszkadzać</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Nic nie może ignorować trybu Nie przeszkadzać"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"Jeszcze <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Nic nie może ignorować trybu Nie przeszkadzać}=1{Dźwięki z kategorii {sound_category_1} mogą ignorować tryb Nie przeszkadzać}=2{Dźwięki z kategorii {sound_category_1} i {sound_category_2} mogą ignorować tryb Nie przeszkadzać}=3{Dźwięki z kategorii {sound_category_1}, {sound_category_2} i {sound_category_3} mogą ignorować tryb Nie przeszkadzać}few{Dźwięki z kategorii {sound_category_1}, {sound_category_2} i jeszcze # mogą ignorować tryb Nie przeszkadzać}many{Dźwięki z kategorii {sound_category_1}, {sound_category_2} i jeszcze # mogą ignorować tryb Nie przeszkadzać}other{Dźwięki z kategorii {sound_category_1}, {sound_category_2} i jeszcze # mogą ignorować tryb Nie przeszkadzać}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Nic nie może ignorować trybu Nie przeszkadzać"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Nikt nie może ignorować trybu Nie przeszkadzać"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Niektóre osoby mogą ignorować tryb Nie przeszkadzać"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Wszyscy mogą ignorować tryb Nie przeszkadzać"</string>
@@ -4212,7 +4167,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB sterowane przez"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Połączone urządzenie"</string>
     <string name="usb_control_device" msgid="527916783743021577">"To urządzenie"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Przełączam..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Przełączam…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Nie udało się przełączyć"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Ładowanie tego urządzenia"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Ładowanie podłączonego urządzenia"</string>
@@ -4473,7 +4428,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Wyświetl szczegóły"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Oszczędzanie danych"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Dane bez limitu"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Dane w tle są wyłączone"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Dane w tle są wyłączone"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Wł."</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Wyłączone"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Użyj Oszczędzania danych"</string>
@@ -4496,7 +4451,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Uniemożliwiaj wpisywanie tekstu w obszarze powiadomień, gdy urządzenie jest zablokowane"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Domyślne sprawdzanie pisowni"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Wybierz sprawdzanie pisowni"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Sprawdzaj pisownię"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Sprawdzaj pisownię"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Nie wybrano"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(brak)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4594,7 +4549,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Aby pomóc zwolnić miejsce, Menedżer miejsca usuwa z urządzenia kopie zapasowe zdjęć i filmów."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Usuń zdjęcia i filmy"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Menedżer miejsca"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Użyj Menedżera miejsca"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Użyj Menedżera miejsca"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automatyczne"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Instrukcja"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Zwolnij miejsce teraz"</string>
@@ -4632,6 +4587,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Kliknij dwukrotnie, by sprawdzić telefon"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Kliknij dwukrotnie, by sprawdzić tablet"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Kliknij dwukrotnie, by sprawdzić urządzenie"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Wyświetlanie powiadomień"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Przewiń w dół w dolnej części ekranu, by wyświetlić powiadomienia"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Tryb jednej ręki"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Korzystaj z trybu jednej ręki"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Zamknij przy przełączaniu aplikacji"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Limit czasu"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 sekundy"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 sekund"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 sekund"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"osiągalność"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Aby sprawdzić godzinę, powiadomienia i inne informacje, kliknij ekran dwukrotnie."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Podnieś, by sprawdzić telefon"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Podnieś, by sprawdzić tablet"</string>
@@ -4644,6 +4609,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Kliknij, by sprawdzić tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Kliknij, by sprawdzić urządzenie"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Aby sprawdzić godzinę, powiadomienia i inne informacje, kliknij ekran."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Przycisk alarmu antywłamaniowego"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Uruchom działania alarmowe, naciskając przycisk zasilania 5 razy."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Dźwięk ostrzegawczy"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Alert przed rozpoczęciem działania"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Kontakty alarmowe"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Sprawdzanie powiadomień odciskiem palca"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Przesuwanie po czytniku"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Aby sprawdzić powiadomienia, przesuń palcem w dół po czytniku linii papilarnych z tyłu telefonu."</string>
@@ -4812,7 +4782,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Włącz dla wszystkich aplikacji"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Wybierz sterownik grafiki"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Domyślny"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Sterownik gry"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Sterownik gry"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Sterownik dewelopera"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Systemowy sterownik grafiki"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4881,6 +4851,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Nie udało się znaleźć sieci. Spróbuj ponownie."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(dostęp zabroniony)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Brak karty SIM"</string>
+    <string name="sim_card" msgid="6381158752066377709">"Karta SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Brak karty SIM"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Brak"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Połączenie wymaga karty SIM"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Połączenie wymaga karty SIM operatora <xliff:g id="WIRELESS_CARRIER">%s</xliff:g>"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Preferowany tryb sieci: preferowany WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Preferowany tryb sieci: tylko GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Preferowany tryb sieci: tylko WCDMA"</string>
@@ -4934,6 +4909,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobilna transmisja danych"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Korzystaj z danych przez sieć komórkową"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Telefon automatycznie przełączy się na tego operatora, gdy będziesz w zasięgu"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Brak dostępnej karty SIM"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Ustawienie połączeń"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Ustawienia SMS-ów"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Zawsze pytaj"</string>
@@ -5122,10 +5098,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Zezwól na nakładki ekranowe w ustawieniach"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Zezwól aplikacjom, które mogą wyświetlać się nad innymi, aby nakładały ekrany ustawień"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Multimedia"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Ukryj odtwarzacz po zakończeniu sesji multimediów"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Odtwarzacz umożliwia wznowienie sesji w rozwiniętym panelu Szybkich ustawień."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Odtwarzacz w Szybkich ustawieniach"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Pokazuj Odtwarzacz przez dłuższy czas, by łatwo wznowić odtwarzanie"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Ukryj odtwarzacz"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Pokaż odtwarzacz"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Brak dostępnych graczy"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Aplikacje dozwolone"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"multimedia"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Zostanie włączony Bluetooth"</string>
 </resources>
diff --git a/res/values-pt-rBR/arrays.xml b/res/values-pt-rBR/arrays.xml
index 389a7d8..3881d46 100644
--- a/res/values-pt-rBR/arrays.xml
+++ b/res/values-pt-rBR/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Médio"</item>
     <item msgid="6740026006576843477">"Longo"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Curto"</item>
+    <item msgid="7397961711906421599">"Médio"</item>
+    <item msgid="4079132024502041928">"Longo"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Padrão"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"Somente TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Global"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index b21eff1..60b0a54 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Mostrar informações do perfil na tela de bloqueio"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Contas"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Localização"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Usar local"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Usar local"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Configuração desativada"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">Ativado: <xliff:g id="COUNT_1">%1$d</xliff:g> app tem acesso à localização</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Usar seu rosto para autenticar"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Iniciar"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Se o desbloqueio facial de acessibilidade estiver desativado, algumas etapas da configuração poderão não funcionar com o TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Voltar"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Continuar config."</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Usar config. de Acessibilidade"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="other">Precisa ter menos de <xliff:g id="NUMBER_1">%d</xliff:g> dígitos</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"O administrador do dispositivo não permite o uso de um PIN recente"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"PINs comuns foram bloqueados pelo seu administrador de TI. Tente um PIN diferente."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Não pode incluir um caractere inválido"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Deve conter pelo menos uma letra"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Deve conter pelo menos um dígito"</string>
@@ -653,7 +655,6 @@
       <item quantity="other">Precisa ter pelo menos <xliff:g id="COUNT">%d</xliff:g> caracteres não numéricos</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"O administrador do dispositivo não permite usar uma senha recente"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Senhas comuns foram bloqueadas pelo seu administrador de TI. Tente uma senha diferente."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Não é permitido usar uma sequência de dígitos em ordem crescente, decrescente ou repetidos"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Confirmar"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Cancelar"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Ativar o Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Usar Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Usar Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Configurações de Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Configurar e gerenciar pontos de acesso sem fio"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Centralize o código QR abaixo para conectar a “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Para entrar na rede Wi-Fi, faça a leitura de um código QR"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Compartilhar Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Faça a leitura deste código QR para conectar-se a “<xliff:g id="SSID">%1$s</xliff:g>” e compartilhar a senha"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Faça a leitura deste código QR com outro dispositivo para entrar na rede “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Faça a leitura deste código QR para conectar-se a “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Tente novamente. Se o problema persistir, entre em contato com o fabricante do dispositivo"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Algo deu errado"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Senha do Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Senha do ponto de acesso: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Conexão automática"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Permitir que o smartphone conecte automaticamente a essa rede quando estiver perto dela"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Permita que o tablet se conecte automaticamente quando estiver perto dessa rede"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Permitir conexão com esta rede quando ela estiver ao alcance"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Adicionar dispositivo"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Use um código QR para adicionar um dispositivo a esta rede"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"O código QR não está em um formato válido"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Usar certificados do sistema"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Não fornecer"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Não validar"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Nenhum certificado especificado. Sua conexão não será particular."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"O nome da rede é muito longo."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"É necessário especificar um domínio."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Certificado obrigatório."</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Conectar"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi ativado"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Conectado a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Conectando a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Conectando…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Falha ao conectar à rede"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Rede fora do alcance"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"O app está compartilhando conteúdo. Para compartilhar a conexão com a Internet, desative e ative o ponto de acesso"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Nenhuma senha definida"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Nome do ponto de acesso"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Ativando <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Ativando <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Outros dispositivos podem se conectar a <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Senha do ponto de acesso"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Banda do ponto de acesso"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Aumenta automaticamente a taxa de atualização de 60 para 90 Hz para alguns conteúdos. Maior uso da bateria."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Forçar a taxa de atualização de 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Maior taxa de atualização para melhoria na resposta tátil e na qualidade das animações. Maior uso da bateria."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Reconhecimento de tela em uso"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Ativado / A tela não será desativada se você estiver olhando para ela"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Versão do Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Atualização de segurança do Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Modelo"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Modelo: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Modelo e hardware"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Versão do hardware"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ID do equipamento"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"As configurações de rede foram redefinidas"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Não é possível limpar chips"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Os chips transferidos por download não podem ser limpos devido a um erro.\n\nReinicie o dispositivo e tente novamente."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Limpar todos os dados (redefinir para a configuração original)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Limpar todos os dados"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Essa ação limpará todos os dados do "<b>"armazenamento interno"</b>" do seu tablet, incluindo:\n\n"<li>"sua Conta do Google;"</li>\n<li>"configurações e dados do sistema e dos apps;"</li>\n<li>"apps transferidos."</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Essa ação limpará todos os dados do "<b>"armazenamento interno"</b>" do seu smartphone, incluindo:\n\n"<li>"Sua Conta do Google"</li>\n<li>"Configurações e dados do sistema e dos apps"</li>\n<li>"Apps transferidos"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"No momento você está conectado às seguintes contas:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Há outros usuários presentes neste dispositivo.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Músicas"</li>\n<li>"Fotos"</li>\n<li>"Outros dados do usuário"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIMs"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Esta ação não cancelará seu plano de serviços móveis."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Para limpar músicas, fotos e outros dados de usuário, o "<b>"armazenamento USB"</b>" precisa ser apagado."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Para limpar músicas, imagens e outros dados de usuário, o conteúdo do "<b>"cartão SD"</b>" precisa ser apagado."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Limpar todos os dados (redefinir para a configuração original)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Limpar todos os dados"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Essa ação limpará todos os dados do "<b>"armazenamento interno"</b>" do seu tablet, incluindo:\n\n"<li>"sua Conta do Google;"</li>\n<li>"configurações e dados do sistema e dos apps;"</li>\n<li>"apps transferidos por download."</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Essa ação limpará todos os dados do "<b>"armazenamento interno"</b>" do seu smartphone, incluindo:\n\n"<li>"sua Conta do Google;"</li>\n<li>"configurações e dados do sistema e dos apps;"</li>\n<li>"apps transferidos por download."</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"No momento, as seguintes contas estão conectadas:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Há outros usuários presentes neste dispositivo.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Músicas"</li>\n<li>"Fotos"</li>\n<li>"Outros dados do usuário"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIMs"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Essa ação não cancelará seu plano de serviços móveis."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Para limpar músicas, imagens e outros dados de usuário, o "<b>"armazenamento USB"</b>" precisa ser apagado."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Para limpar músicas, imagens e outros dados de usuário, o conteúdo do "<b>"cartão SD"</b>" precisa ser apagado."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Apagar armazenamento USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Apagar cartão SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Apagar todos os dados do armazenamento USB interno, como músicas e fotos"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Apagar todos os dados do cartão SD, como músicas e fotos"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Limpar todos os dados"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Limpar todos os dados"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Todas as informações pessoais e apps transferidos por download serão excluídos. Não é possível desfazer essa ação."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Todas as suas informações pessoais, inclusive apps e chips transferidos por download, serão excluídas. Não é possível desfazer essa ação."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Apagar tudo"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Nenhuma redefinição foi realizada porque o serviço de Limpeza do sistema não está disponível."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Limpar todos os dados?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"A configuração original não está disponível para esse usuário"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Apagando"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Aguarde..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Limpar todos os dados"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Limpar todos os dados"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Todas as informações pessoais e os apps transferidos por download serão excluídos. Não é possível desfazer essa ação."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Todas as suas informações pessoais, inclusive apps e chips transferidos por download, serão excluídas. Não é possível desfazer essa ação."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Limpar todos os dados?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"A redefinição para a configuração original não está disponível para este usuário"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Limpando"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Aguarde…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Conf. de chamada"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Configurar correio voz, encaminhamento, espera etc."</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Tethering USB"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Não é possível vincular a mais de <xliff:g id="MAXCONNECTION">%1$d</xliff:g> dispositivos."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será vinculado."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ethernet tethering"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Compartilhar conexão de Internet do smartphone via USB Ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Compartilhar a conexão de Internet do smartphone via Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Use o ponto de acesso e tethering para fornecer Internet a outros dispositivos por meio da sua conexão de dados móveis. Os apps também podem criar um ponto de acesso para compartilhar conteúdo com dispositivos por perto."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Use o ponto de acesso e tethering para fornecer Internet a outros dispositivos por meio da sua conexão Wi-Fi ou de dados móveis. Os apps também podem criar um ponto de acesso para compartilhar conteúdo com dispositivos próximos."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Ajuda"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Preferências de legenda"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Ampliação"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Área de ampliação"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Ampliação ativada"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Escolha a área de ampliação que você quer usar ao ampliar a tela"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Tela cheia"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Parte da tela"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Tela cheia e parte da tela"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Ampliar toda a tela"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Ampliar parte da tela"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Mudar para o botão de acessibilidade?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"O uso do toque triplo para ampliar parte da tela fará com que a digitação e outras ações fiquem mais lentas.\n\nQuer passar a usar o botão de acessibilidade para ampliar a tela?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Mudar para o botão de acessibilidade"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Manter o toque triplo para ampliar"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Configurações de ampliação"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Ampliar com toque triplo"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Ampliar com atalho"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Botão liga/desliga encerra chamadas"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Cursor do mouse grande"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Remover animações"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Áudio mono"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Combinar canais ao reproduzir áudio"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Balanço de áudio"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Esquerda"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Direita"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Áudio mono"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Combinar canais ao tocar áudio"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Balanço de áudio"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Esquerdo"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Direito"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Padrão"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 segundos"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 segundos"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Vibração de notificação"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Vibração do toque"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Feedback por toque"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Usar <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Abrir <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Usar correção de cor"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Mostrar legendas"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Apenas para apps compatíveis"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Usar <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Abrir <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Usar correção de cor"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Mostrar legendas"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Apenas para apps compatíveis"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Tamanho e estilo das legendas"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Tamanho do texto: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Mais opções"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomalia"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomalia"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomalia"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Escala de cinza"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Vermelho-verde"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Vermelho-verde"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Azul-amarelo"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Restrição em segundo plano"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Permitir que o app seja executado em segundo plano"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Execução do app em segundo plano não permitida"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Não é possível restringir o uso em segundo plano"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Não é possível restringir o uso em segundo plano"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Limitar atividade em segundo plano?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Se você limitar as atividades em segundo plano de um app, ele poderá apresentar mau funcionamento"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Como o app não está configurado para otimizar bateria, não é possível restringi-lo.\n\nPara restringir, ative a otimização."</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Definir uma programação"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Prolongar a duração da bateria"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Desativar quando estiver carregado"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"A Economia de bateria é desativada quando a carga do smartphone chega a <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"A Economia de bateria é desativada quando a carga do tablet chega a <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"A Economia de bateria é desativada quando a carga da bateria do dispositivo chega a <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"A Economia de bateria é desativada quando a carga do smartphone chega a mais de <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"A Economia de bateria é desativada quando a carga do tablet chega a mais de <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"A Economia de bateria é desativada quando a carga do dispositivo chega a mais de <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Ativar"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Redefinir"</string>
     <string name="tts_play" msgid="2945513377250757221">"Reproduzir"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Conectividade adaptável"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Aumenta a duração da bateria e melhora o desempenho do dispositivo ao gerenciar suas conexões de rede automaticamente"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Armazenamento de credenciais"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Instalar um certificado"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Instalar certificados do armazenamento"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Credenciais do usuário"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Ver e modificar as credenciais armazenadas"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Avançado"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Tipo de armazenamento"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"No hardware"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Somente software"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"As credenciais não estão disponíveis para este usuário"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Instalada para VPN e apps"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Instalada para Wi-Fi"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Como pagar no terminal"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Configure um app de pagamento. Em seguida, basta segurar a parte traseira do seu smartphone em direção a qualquer terminal com o símbolo indicando pagamento por aproximação."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Entendi"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Mais..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Mais…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Definir app de pagamento padrão"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Atualizar app de pagamento padrão"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Em um terminal por aproximação, pagar com <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Sempre usar esta opção para chamadas"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Selecionar um chip de dados"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Selecione um chip para SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Trocando chip de dados. Isso pode demorar um pouco..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Trocando chip de dados. Isso pode demorar um minuto…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Ligar com"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Selecionar um chip"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"Chip <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"rotina, agenda, economia de bateria, economia de energia, bateria, automático, percentagem"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, chamada avançada, chamadas por 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"adicionar idioma, adicionar um idioma"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"tamanho do texto"</string>
     <string name="default_sound" msgid="6604374495015245195">"Som padrão"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Volume de toque e notificação em <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Volume, vibração, Não perturbe"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Ativar sons"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Legenda Instantânea"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Legendar mídias automaticamente"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Nenhuma"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> programação definida</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> programações definidas</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Nenhum}=1{1 programação definida}one{# programação definida}other{# programações definidas}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Não perturbe"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Receber notificações apenas de pessoas e apps importantes"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limitar interrupções"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Somente prioridade"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Ativado / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Desativado / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Desativado"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Ativado"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Perguntar sempre"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Até você desativar"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> hora</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> horas</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minutos"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> programação pode ser ativada automaticamente</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> programações podem ser ativadas automaticamente</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 hora}one{# hora}other{# horas}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minuto}one{# minuto}other{# minutos}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Desativado}=1{Desativado / 1 programação pode ser ativada automaticamente}one{Desativado / # programação pode ser ativada automaticamente}other{Desativado / # programações podem ser ativadas automaticamente}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"O que pode interromper o \"Não perturbe\""</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Pessoas"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Apps"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Definir automaticamente as notificações de prioridade baixa como \"Discretas\""</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Classificação adaptativa de notificações"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Classificar notificações automaticamente por relevância"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Feedback de notificação adaptável"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Indicar os ajustes feitos nas notificações e mostrar a opção de enviar feedback ao sistema"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Respostas e ações sugeridas"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Mostrar automaticamente as respostas e ações sugeridas"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Mostrar notificações recentes e adiadas"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Acesso ao Não perturbe"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Permitir o Não perturbe"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Nenhum app instalado solicitou o acesso \"Não perturbe\""</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Carregando apps…"</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Carregando apps…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"O Android está bloqueando as notificações desse app neste dispositivo, conforme você pediu"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"O Android está bloqueando essa categoria de notificações neste dispositivo, conforme você pediu"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"O Android está bloqueando esse grupo de notificações neste dispositivo, conforme seu pedido"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Todas as conversas"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Conversas prioritárias"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Nenhuma"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> conversa</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> conversas</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Nenhuma"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Nenhum}=1{1 conversa}one{# conversa}other{# conversas}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Quem pode interromper"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Chamadas"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Chamadas"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Para garantir que as chamadas permitidas emitam sons, verifique se o dispositivo está configurado para tocar"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Durante a programação \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\", as chamadas recebidas são bloqueadas. Você pode ajustar as configurações para permitir que seus amigos, familiares ou outros contatos falem com você."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Contatos marcados com estrela"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one">mais <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="other">mais <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Nenhum"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Nenhum}=1{{contact_1}}=2{{contact_1} e {contact_2}}=3{{contact_1}, {contact_2} e {contact_3}}one{{contact_1}, {contact_2} e mais #}other{{contact_1}, {contact_2} e mais #}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Mensagens"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"mensagens"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Mensagens"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Durante \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\", as mensagens recebidas são bloqueadas. Você pode ajustar as configurações para permitir que seus amigos, familiares ou outros contatos falem com você."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Você pode receber todas as mensagens"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Você pode receber todas as chamadas"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Nenhum"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> contato</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> contatos</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Nenhum}=1{1 contato}one{# contato}other{# contatos}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Qualquer pessoa"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Contatos"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Contatos marcados com estrela"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Todas as notificações"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Algumas notificações"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Algumas pessoas ainda podem entrar em contato com você, mesmo que você não permita a interrupção por apps"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one"><xliff:g id="APP_NAMES">%s</xliff:g> pode interromper</item>
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> podem interromper</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"mais <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Nenhum app pode interromper}=1{{app_1} pode interromper}=2{{app_1} e {app_2} podem interromper}=3{{app_1}, {app_2} e {app_3} podem interromper}one{{app_1}, {app_2} e mais # podem interromper}other{{app_1}, {app_2} e mais # podem interromper}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Apps"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Todas as notificações"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Algumas notificações"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Notificações que podem interromper"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Permitir todas as notificações"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> pode interromper</item>
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> podem interromper</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Nada pode interromper"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"mais <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Nada pode interromper}=1{{sound_category_1} pode interromper}=2{{sound_category_1} e {sound_category_2} podem interromper}=3{{sound_category_1}, {sound_category_2} e {sound_category_3} podem interromper}one{{sound_category_1}, {sound_category_2} e mais # podem interromper}other{{sound_category_1}, {sound_category_2} e mais # podem interromper}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Nada pode interromper"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Ninguém pode interromper"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Algumas pessoas podem interromper"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Todas as pessoas podem interromper"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB controlado por"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Dispositivo conectado"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Este dispositivo"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Alternando..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Alternando…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Não foi possível alternar"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Para carregamento do dispositivo"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Carregando dispositivo conectado"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Ver detalhes"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Economia de dados"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Dados ilimitados"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Os dados em segundo plano estão desativados"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Os dados em segundo plano estão desativados"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Ativada"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Desativada"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Usar o recurso Economia de dados"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Se o dispositivo estiver bloqueado, impedir a digitação de respostas ou outros textos nas notificações"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Corretor ortográfico padrão"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Escolher corretor ortográfico"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Usar o corretor ortográfico"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Usar o corretor ortográfico"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Não selecionado"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(nenhum)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Para ajudar a liberar espaço de armazenamento, o gerenciador de armazenamento remove fotos e vídeos do seu dispositivo salvos em backup."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Remover fotos e vídeos"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Gerenciador de armazenamento"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Usar gerenciador de armazenamento"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Usar gerenciador de armazenamento"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Modo automático"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Modo manual"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Liberar espaço agora"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Tocar duas vezes na tela para verificar o smartphone"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Tocar duas vezes na tela para verificar o tablet"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Tocar duas vezes na tela para verificar o dispositivo"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Deslizar para ver notif."</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Deslize para baixo no canto inferior da tela para mostrar as notificações"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Modo para uma mão"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Usar o \"modo para uma mão\""</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Sair ao alternar entre apps"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Tempo limite"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 segundos"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 segundos"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 segundos"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"acesso com uma mão"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Para verificar a hora, as notificações e outras informações, toque duas vezes na tela."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Levantar o smartphone para verificá-lo"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Levantar o tablet para verificá-lo"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Tocar para verificar o tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Tocar para verificar o dispositivo"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Para verificar a hora, as notificações e outras informações, toque na tela."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Botão de pânico"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Pressione rapidamente o botão liga/desliga cinco vezes para iniciar as ações de emergência."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Som de alerta"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Emitir alerta antes de iniciar as ações"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Contatos de emergência"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Deslizar para baixo no sensor de impressão digital para ver as notificações"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Usar impressão digital"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Para ver suas notificações, deslize o dedo indicador para baixo no sensor de impressão digital localizado na parte traseira do smartphone."</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Ativar para todos os apps"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Selecionar driver gráfico"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Padrão"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Driver de jogo"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Driver de jogo"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Developer Driver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Driver gráfico do sistema"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Não foi possível encontrar redes. Tente novamente."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(proibida)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Sem chip"</string>
+    <string name="sim_card" msgid="6381158752066377709">"Chip"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Sem chip"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Nenhuma"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Chip necessário para se conectar"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Chip da <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> necessário para se conectar"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Modo de rede preferencial: WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Modo de rede preferencial: somente GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Modo de rede preferencial: somente WCDMA"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Dados móveis"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Acessar os dados pela rede móvel"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"O smartphone mudará automaticamente para esta operadora quando estiver dentro do alcance"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Nenhum chip disponível"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Preferência de chamadas"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Preferência de SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Perguntar sempre"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Permitir sobreposições de tela no app Config."</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Permita que apps que podem ser sobrepostos a outros sejam abertos sobre telas de configuração"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Mídia"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Ocultar player quando a sessão de mídia terminar"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"O player permite que você retome uma sessão do painel \"Configurações rápidas\" expandido."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Player de mídia nas Configurações rápidas"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Mostrar player de mídia por um longo período para retomar a reprodução com facilidade"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Ocultar player"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Mostrar player"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Nenhum player disponível"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Apps permitidos"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"mídia"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"O Bluetooth será ativado"</string>
 </resources>
diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
index 319ef23..dd28b3f 100644
--- a/res/values-pt-rPT/arrays.xml
+++ b/res/values-pt-rPT/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Médio"</item>
     <item msgid="6740026006576843477">"Longa"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Curto"</item>
+    <item msgid="7397961711906421599">"Médio"</item>
+    <item msgid="4079132024502041928">"Longo"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Predefinição"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Apenas TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Global"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 8ed929c..336b539 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Mostrar informação do perfil no ecrã de bloqueio"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Contas"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Localização"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Utilizar a localização"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Utilizar a localização"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Desativada"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">Ativada – <xliff:g id="COUNT_1">%1$d</xliff:g> apps têm acesso à localização</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Utilize o rosto para autenticação"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Iniciar"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Se o desbloqueio facial da acessibilidade estiver desativado, alguns passos de configuração podem não funcionar corretamente com o TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Voltar"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Continuar config."</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Utiliz. config. acessibilidade"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="one">Tem de ter menos de <xliff:g id="NUMBER_0">%d</xliff:g> dígito.</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"O gestor do dispositivo não permite utilizar um PIN recente"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Os PINs comuns estão bloqueados pelo seu gestor de TI. Experimente outro PIN."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Não pode incluir um caráter inválido"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Tem de incluir, pelo menos, uma letra"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Tem de incluir, pelo menos, um dígito"</string>
@@ -653,7 +655,6 @@
       <item quantity="one">Tem de incluir, pelo menos, 1 caráter que não seja um número.</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"O admin. do disp. não permite a utilização de uma palavra-passe recente"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"As palavras-passe comuns estão bloqueadas pelo seu gestor de TI. Experimente outra palavra-passe."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Não é permitida uma sequência de dígitos ascendente, descendente ou repetida"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Confirmar"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Cancelar"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Ativar Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Utilizar o Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Utilizar o Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Definições de Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Configurar e gerir pontos de acesso sem fios"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Centre o código QR abaixo para estabelecer ligação a “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Estabeleça ligação ao Wi-Fi ao ler um código QR."</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Partilhar Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Leia este código QR para se ligar a \"<xliff:g id="SSID">%1$s</xliff:g>\" e partilhar a palavra-passe"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Leia este código QR com outro dispositivo para estabelecer ligação a “<xliff:g id="SSID">%1$s</xliff:g>”."</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Leia este código QR para se ligar a \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Tente novamente. Se o problema persistir, contacte o fabricante do dispositivo."</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Ocorreu um erro."</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Palavra-passe de Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Palavra-passe da zona Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Ligação automática"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Permitir que o telemóvel estabeleça ligação automaticamente quando estiver perto desta rede"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Permitir que o tablet estabeleça ligação automaticamente quando estiver perto desta rede"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Permita a ligação a esta rede quando estiver ao alcance."</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Adicionar dispositivo"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Utilize um código QR para adicionar um dispositivo a esta rede"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"O código QR não é um formato válido."</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Utilizar certificados do sistema"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Não fornecer"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Não validar"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Nenhum certificado especificado. A sua ligação não será privada."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"O nome da rede é demasiado longo."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"É necessário especificar um domínio."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Certificado obrigatório."</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Ligar"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi ativado"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Ligado a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"A ligar a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"A ligar…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Não foi possível estabelecer ligação à rede"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"A rede não está ao alcance"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"A aplicação está a partilhar conteúdo. Para partilhar a ligação à Internet, desative e volte a ativar a zona Wi-Fi."</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Nenhuma palavra-passe definida."</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Nome da zona Wi-Fi"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"A ativar <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"A ativar <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Podem ser ligados outros dispositivos a <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Palavra-passe da zona Wi-Fi"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Banda do PA"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Aumenta automaticamente a taxa de atualização de 60 para 90 Hz para algum conteúdo. Aumenta a utilização da bateria."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Forçar taxa de atualização de 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"A taxa de atualização mais elevada para uma capacidade de resposta tátil e uma qualidade de animação melhoradas. Aumenta a utilização da bateria."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Atenção ao ecrã"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Ativada/O ecrã não se desliga se estiver a olhar para o mesmo"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Versão do Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Atualização de segurança do Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Modelo"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Modelo: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Modelo e hardware"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Versão do hardware"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ID do Equipamento"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"As definições de rede foram repostas"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Não é possível apagar os SIMs"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Não é possível apagar os SIMs transferidos devido a um erro.\n\nReinicie o dispositivo e tente novamente."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Apagar todos os dados (reposição de dados de fábrica)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Apagar todos os dados (repor)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Serão apagados todos os dados da "<b>"memória de armazenamento interno"</b>" do tablet, incluindo:\n\n"<li>"A Conta Google"</li>\n<li>"Dados e definições do sistema e da aplicação"</li>\n<li>"Aplicações transferidas"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Serão apagados todos os dados do "<b>"armazenamento interno"</b>" do telemóvel, incluindo:\n\n"<li>"A Conta Google"</li>\n<li>"Dados e definições do sistema e da aplicação"</li>\n<li>"Aplicações transferidas"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Actualmente, tem sessão iniciada nas seguintes contas:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Existem outros utilizadores presentes neste dispositivo.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Música"</li>\n<li>"Fotos"</li>\n<li>"Outros dados do utilizador"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIMs"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Esta ação não cancela o seu plano de serviços móveis."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Para limpar músicas, imagens e outros dados do utilizador, é necessário apagar a "<b>"memória de armazenamento USB"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Para limpar também músicas, imagens e outros dados do utilizador, é necessário apagar o "<b>"cartão SD"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Apagar todos os dados (repor)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Apagar todos os dados (repor)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Esta ação vai apagar todos os dados da "<b>"memória de armazenamento interno"</b>" do tablet, incluindo:\n\n"<li>"A sua Conta Google"</li>\n<li>"Dados e definições do sistema e de apps"</li>\n<li>"Apps transferidas"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Esta ação vai apagar todos os dados da "<b>"memória de armazenamento interno"</b>" do telemóvel, incluindo:\n\n"<li>"A sua Conta Google"</li>\n<li>"Dados e definições do sistema e de apps"</li>\n<li>"Apps transferidas"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Atualmente, tem sessão iniciada nas seguintes contas:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Existem outros utilizadores presentes neste dispositivo.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Música"</li>\n<li>"Fotos"</li>\n<li>"Outros dados do utilizador"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIMs"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Esta ação não cancela o seu plano de serviços móveis."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Para limpar músicas, imagens e outros dados do utilizador, é necessário apagar a "<b>"memória USB"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Para limpar músicas, imagens e outros dados do utilizador, é necessário apagar o "<b>"cartão SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Apagar armazenamento USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Apagar cartão SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Apagar todos os dados da memória de armazenamento USB interna, como músicas ou fotos"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Apagar todos os dados do cartão SD, como músicas ou fotos"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Apagar todos os dados"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Apagar todos os dados"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Serão eliminadas todas as informações pessoais e as aplicações transferidas. Não é possível anular esta ação."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Todas as suas informações pessoais, incluindo aplicações e SIMs transferidos, serão eliminadas. Não é possível anular esta ação."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Apagar tudo"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Não foi efetuada nenhuma reposição porque o serviço System Clear não está disponível."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Apagar todos os dados?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"A reposição de fábrica não está disponível para este utilizador"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"A apagar"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Aguarde..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Apagar todos os dados"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Apagar todos os dados"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Serão eliminadas todas as informações pessoais e apps transferidas. Não é possível anular esta ação."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Todas as suas informações pessoais, incluindo apps e SIMs transferidos, serão eliminadas. Não é possível anular esta ação."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Pretende apagar todos os dados?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"A reposição de fábrica não está disponível para este utilizador."</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"A apagar…"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Aguarde…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Definições de chamadas"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Configurar correio de voz, encaminhamento de chamadas, chamada em espera, ID do autor da chamada"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Ligação USB"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Não é possível ligar mais de <xliff:g id="MAXCONNECTION">%1$d</xliff:g> aparelhos."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será desligado."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ligação Ethernet via tlm."</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Partilhar a ligação à Internet do telemóvel através de Ethernet USB"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Partilhe a ligação à Internet do telemóvel através de Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Utilize uma zona Wi-Fi e uma ligação via telemóvel para disponibilizar Internet a outros dispositivos através da sua ligação móvel de dados. As aplicações podem igualmente criar uma zona Wi-Fi para partilhar conteúdo com dispositivos próximos."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Utilize uma zona Wi-Fi e uma ligação (à Internet) via telemóvel para disponibilizar Internet a outros dispositivos através de Wi-Fi ou da sua ligação móvel de dados. As apps também podem criar uma zona Wi-Fi para partilhar conteúdo com dispositivos próximos."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Ajuda"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Preferências de legendas"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Ampliação"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Área de ampliação"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Ativar ampliação"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Escolha a(s) área(s) de ampliação que pretende utilizar ao ampliar o ecrã."</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Ecrã inteiro"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Parte do ecrã"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Ecrã inteiro e parte do ecrã"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Ampliar o ecrã inteiro"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Ampliar parte do ecrã"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Pretende mudar para o botão Acessibilidade?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Utilizar a ação de tocar três vezes para ampliar parte do ecrã fará com que a escrita e outras ações fiquem mais lentas.\n\nPretende passar a utilizar o botão Acessibilidade para ampliar?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Mudar para o botão Acessibilidade"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Manter a ação de tocar três vezes para ampliar"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Definições de ampliação"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Ampliar com três toques"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Amplie com um atalho"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Botão de ligar termina chamada"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Ponteiro do rato grande"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Remover animações"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Áudio mono"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Combine canais ao reproduzir áudio"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Equilíbrio de áudio"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Esquerda"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Direita"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Áudio mono"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Combine canais ao reproduzir áudio"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Equilíbrio de áudio"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Lado esquerdo"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Lado direito"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Predefinição"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 segundos"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 segundos"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Vibração de notificações"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Vibração do toque"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Respostas por toque"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Utilizar <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Abra a app <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Utilizar a correção da cor"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Mostrar legendas"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Apenas para a app suportada."</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Utilizar <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Abrir <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Utilizar a correção da cor"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Mostrar legendas"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Apenas para a app suportada."</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Tamanho e estilo das legendas"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Tamanho do texto: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Mais opções"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomalia"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomalia"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomalia"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Escala de cinzentos"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Vermelho-verde"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Vermelho-verde"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Azul-amarelo"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Restrição de execução em segundo plano"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Permitir que a aplicação seja executada em segundo plano"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"A aplicação não tem autorização para ser executada em segundo plano"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"A utilização em segundo plano não pode ser restringida."</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"A utilização em segundo plano não pode ser restringida."</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Pretende limitar a atividade em segundo plano?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Se limitar a atividade em segundo plano de uma aplicação, esta pode apresentar um comportamento anormal."</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"A app não está def. p/ otimizar a bateria, não a pode restringir.\n\nP/ restringir a app, ative a otimiz. da bateria."</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Definir um horário"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Prolongue a autonomia da bateria"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Desativar após o carregamento"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"A Poupança de bateria é desativada quando o telemóvel estiver com <xliff:g id="PERCENT">%1$s</xliff:g>."</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"A Poupança de bateria é desativada quando o tablet estiver com <xliff:g id="PERCENT">%1$s</xliff:g>."</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"A Poupança de bateria é desativada quando o dispositivo estiver com <xliff:g id="PERCENT">%1$s</xliff:g>."</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"A Poupança de bateria é desativada quando o telemóvel estiver com mais de <xliff:g id="PERCENT">%1$s</xliff:g> de bateria."</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"A Poupança de bateria é desativada quando o tablet estiver com mais de <xliff:g id="PERCENT">%1$s</xliff:g> de bateria."</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"A Poupança de bateria é desativada quando o dispositivo estiver com mais de <xliff:g id="PERCENT">%1$s</xliff:g> de bateria."</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Ativar"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Repor"</string>
     <string name="tts_play" msgid="2945513377250757221">"Reproduzir"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Conetividade adaptável"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Prolonga a autonomia da bateria e melhora o desempenho do dispositivo ao gerir as suas ligações de rede automaticamente."</string>
     <string name="credentials_title" msgid="7535942196886123656">"Armazenamento de credenciais"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Instalar um certificado"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Instalar certificados a partir do armazenamento"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Credenciais de utilizador"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Ver e modificar credenciais de utilizador"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Avançadas"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Tipo de armazenamento"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Suportado por hardware"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Apenas software"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"As credenciais não estão disponíveis para este utilizador"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Instalada para VPN e aplicações"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Instalada para Wi-Fi"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Como pagar num terminal"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Configure uma aplicação de pagamento. Em seguida, basta aproximar a parte de trás do telemóvel a um terminal com o símbolo de pagamento sem contacto."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"OK"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Mais..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Mais…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Predefina a app de pagamento"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Atualize a app de pagamento predefinida"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Num terminal sem contacto, pague com a app <xliff:g id="APP">%1$s</xliff:g>."</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Utilizar sempre este para chamadas"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Selecionar um SIM para dados"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Selecione um SIM para SMS."</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"A mudar o SIM de dados. Esta ação pode demorar, no máximo, 1 minuto..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"A mudar o SIM de dados. Esta ação pode demorar, no máximo, 1 minuto…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Telefonar com"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Selecionar um cartão SIM"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"rotina, horário, poupança de bateria, poupança de energia, bateria, automática, percentagem"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, chamadas avançadas, chamadas 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"adicionar idioma, adicionar um idioma"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"tamanho do texto"</string>
     <string name="default_sound" msgid="6604374495015245195">"Som predefinido"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Volume de notificação e de toque a <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Volume, vibração, Não incomodar"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Ativar sons"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Legendas instantâneas"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Multimédia com legendas automáticas"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Nenhum"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> horários definidos</item>
-      <item quantity="one">1 horário definido</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Nenhum}=1{1 horário definido}other{# horários definidos}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Não incomodar"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Receber notificações apenas de pessoas e apps importantes"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limite as interrupções"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Apenas prioridade"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Ativado/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Desativado/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Desativado"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Ativado"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Perguntar sempre"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Até desativar"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> horas</item>
-      <item quantity="one">1 hora</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minutos"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> horários podem ser ativados automaticamente</item>
-      <item quantity="one">1 horário pode ser ativado automaticamente</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 hora}other{# horas}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minuto}other{# minutos}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Desativado}=1{Desativado/1 horário pode ser ativado automaticamente}other{Desativado/# horários podem ser ativados automaticamente}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"O que pode interromper o modo Não incomodar"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Pessoas"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Apps"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Defina automaticamente as notificações de prioridade mais baixa como discretas."</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Classificação das notificações adaptável"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Classifique as notificações por relevância automaticamente."</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Feedback sobre as notificações adaptáveis"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Indicar ajustes efetuados às notificações e mostrar a opção para fornecer feedback ao sistema"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Respostas e ações sugeridas"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"São apresentadas automaticamente respostas e ações sugeridas."</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Apresentar notificações recentes e suspensas"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Acesso Não incomodar"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Permitir o modo Não incomodar"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Nenhuma app instalada solicitou acesso Não incomodar"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"A carregar aplicações..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"A carregar apps…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"A seu pedido, o Android está a bloquear a apresentação das notificações desta aplicação neste dispositivo."</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"A seu pedido, o Android está a bloquear a apresentação desta categoria de notificações neste dispositivo."</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"A seu pedido, o Android está a bloquear a apresentação deste grupo de notificações neste dispositivo."</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Todas as conversas"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Conversas com prioridade"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Nenhuma"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> conversas</item>
-      <item quantity="one">1 conversa</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Nenhuma"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Nenhuma}=1{1 conversa}other{# conversas}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Quem pode interromper"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Chamadas"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Chamadas"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Para garantir que as chamadas permitidas emitem som, verifique se o dispositivo está definido para tocar."</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"As chamadas recebidas são bloqueadas no horário \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\". Pode ajustar as definições para permitir que os seus amigos, a sua família ou outras pessoas o contactem."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Contactos com estrela"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other">Mais <xliff:g id="NUM_PEOPLE">%d</xliff:g> pessoas</item>
-      <item quantity="one">Mais 1 pessoa</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Nenhum"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Nenhum}=1{{contact_1}}=2{{contact_1} e {contact_2}}=3{{contact_1}, {contact_2} e {contact_3}}other{{contact_1}, {contact_2} e mais #}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Mensagens"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"mensagens"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Mensagens"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Para \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\", as mensagens recebidas estão bloqueadas. Pode ajustar as definições para permitir que os seus amigos, família ou outras pessoas o contactem."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Recebe todas as mensagens"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Recebe todas as chamadas"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Nenhum"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> contactos</item>
-      <item quantity="one">1 contacto</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Nenhum}=1{1 contacto}other{# contactos}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Qualquer pessoa"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Contactos"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Contactos marcados com estrela"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Todas as notificações"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Algumas notificações"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"As pessoas selecionadas podem continuar a entrar em contacto consigo, mesmo que não permita que as apps interrompam."</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other">As apps <xliff:g id="APP_NAMES">%s</xliff:g> podem interromper.</item>
-      <item quantity="one">A app <xliff:g id="APP_NAME_0">%s</xliff:g> pode interromper.</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"Mais <xliff:g id="NUMBER">%d</xliff:g>."</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Nenhuma app pode interromper}=1{A app {app_1} pode interromper}=2{As apps {app_1} e {app_2} podem interromper}=3{As apps {app_1}, {app_2} e {app_3} podem interromper}other{As apps {app_1}, {app_2} e mais # podem interromper}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Apps"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Todas as notificações"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Algumas notificações"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Notificações que podem interromper"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Permitir todas as notificações"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other">Os sons <xliff:g id="SOUND_CATEGORIES">%s</xliff:g> podem interromper.</item>
-      <item quantity="one">O som de <xliff:g id="SOUND_CATEGORY">%s</xliff:g> pode interromper.</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Nada pode interromper."</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"Mais <xliff:g id="NUMBER">%d</xliff:g>."</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Nada pode interromper}=1{O som de {sound_category_1} pode interromper}=2{Os sons de {sound_category_1} e {sound_category_2} podem interromper}=3{Os sons de {sound_category_1}, {sound_category_2} e {sound_category_3} podem interromper}other{Os sons de {sound_category_1}, {sound_category_2} e mais # podem interromper}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Nada pode interromper"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Ninguém pode interromper"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Algumas pessoas podem interromper"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Todas as pessoas podem interromper"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB controlado por"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Dispositivo associado"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Este dispositivo"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"A mudar..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"A mudar…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Não foi possível mudar."</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"A carregar o dispositivo"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Carregar o dispositivo ligado"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Ver detalhes"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Poupança de dados"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Dados sem restrições"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Os dados de segundo plano estão desativados"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Os dados de segundo plano estão desativados"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Ativada"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Desativada"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Utilizar Poupança de dados"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Se o dispositivo estiver bloqueado, impedir a introdução de respostas ou de outro texto nas notificações"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Corretor ortográfico predefinido"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Escolher corretor ortográfico"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Utilizar o corretor ortográfico"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Utilize o corretor ortográfico"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Não selecionado"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(nenhum)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Para ajudar a libertar espaço de armazenamento, o gestor de armazenamento remove cópias de segurança de fotos e vídeos do dispositivo."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Remover fotos e vídeos"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Gestor de armazenamento"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Utilizar o Gestor de armazenamento"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Utilizar o gestor de armazenamento"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automático"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Libertar espaço agora"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Tocar duas vezes para verificar o telemóvel"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Tocar duas vezes para verificar o tablet"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Tocar duas vezes para verificar o dispositivo"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Deslize para notificações"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Deslize para baixo na parte inferior do ecrã para ver as notificações."</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Modo para uma mão"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Utilizar o modo para uma mão"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Sair ao mudar de app"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Limite de tempo"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 segundos"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 segundos"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 segundos"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"acessibilidade"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Para consultar a hora, as notificações e outras informações, toque duas vezes no ecrã."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Levantar para verificar o telemóvel"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Levantar para verificar o tablet"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Toque para verificar o tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Toque para verificar o dispositivo"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Para consultar a hora, as notificações e outras informações, toque no ecrã."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Botão de pânico"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Inicie as ações SOS de emergência ao premir o botão ligar/desligar rapidamente 5 vezes."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Som de aviso"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Alertar antes de iniciar as ações"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Contactos de emergência"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Utilizar impressão digital para ver as notificações"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Usar impressão digital"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Para verificar as suas notificações, deslize rapidamente para baixo no sensor de impressões digitais situado na parte posterior do telemóvel."</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Ative para todas as apps"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Selecione a placa gráfica"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Predefinição"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Controlador de jogos"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Controlador de jogos"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Placa gráfica para programadores"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Controlador da placa gráfica do sistema"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Não foi possível encontrar qualquer rede. Tente novamente."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(proibida)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Nenhum cartão SIM"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Nenhum cartão SIM"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Nenhum"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Requer o SIM para estabelecer ligação"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Requer o SIM do operador <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> para estabelecer ligação"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Modo de rede preferido: apenas WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Modo de rede preferido: apenas GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Modo de rede preferido: apenas WCDMA"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Dados móveis"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Aceder aos dados através de rede móvel"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"O telemóvel irá mudar automaticamente para este operador quando estiver ao alcance."</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Nenhum cartão SIM disponível."</string>
     <string name="calls_preference" msgid="2166481296066890129">"Preferência de chamadas"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Preferência de SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Perguntar sempre"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Permitir sobreposições de ecrãs nas Definições"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Permita que as apps que se podem sobrepor a outras apps se sobreponham a ecrãs de Definições."</string>
     <string name="media_controls_title" msgid="403271085636252597">"Multimédia"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Oculte o leitor quando sessão multimédia terminar"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"O leitor permite-lhe retomar uma sessão a partir do painel Definições rápidas expandido."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Leitor de Multimédia nas Definições rápidas"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Mostre o Leitor de Multimédia por um período alargado para retomar facilmente a reprodução"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Ocultar leitor"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Mostrar leitor"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Nenhum leitor disponível."</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Apps permitidas"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"multimédia"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"O Bluetooth será ativado"</string>
 </resources>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index 389a7d8..3881d46 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Médio"</item>
     <item msgid="6740026006576843477">"Longo"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Curto"</item>
+    <item msgid="7397961711906421599">"Médio"</item>
+    <item msgid="4079132024502041928">"Longo"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Padrão"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"Somente TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Global"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index b21eff1..60b0a54 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Mostrar informações do perfil na tela de bloqueio"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Contas"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Localização"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Usar local"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Usar local"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Configuração desativada"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">Ativado: <xliff:g id="COUNT_1">%1$d</xliff:g> app tem acesso à localização</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Usar seu rosto para autenticar"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Iniciar"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Se o desbloqueio facial de acessibilidade estiver desativado, algumas etapas da configuração poderão não funcionar com o TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Voltar"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Continuar config."</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Usar config. de Acessibilidade"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="other">Precisa ter menos de <xliff:g id="NUMBER_1">%d</xliff:g> dígitos</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"O administrador do dispositivo não permite o uso de um PIN recente"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"PINs comuns foram bloqueados pelo seu administrador de TI. Tente um PIN diferente."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Não pode incluir um caractere inválido"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Deve conter pelo menos uma letra"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Deve conter pelo menos um dígito"</string>
@@ -653,7 +655,6 @@
       <item quantity="other">Precisa ter pelo menos <xliff:g id="COUNT">%d</xliff:g> caracteres não numéricos</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"O administrador do dispositivo não permite usar uma senha recente"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Senhas comuns foram bloqueadas pelo seu administrador de TI. Tente uma senha diferente."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Não é permitido usar uma sequência de dígitos em ordem crescente, decrescente ou repetidos"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Confirmar"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Cancelar"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Ativar o Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Usar Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Usar Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Configurações de Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Configurar e gerenciar pontos de acesso sem fio"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Centralize o código QR abaixo para conectar a “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Para entrar na rede Wi-Fi, faça a leitura de um código QR"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Compartilhar Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Faça a leitura deste código QR para conectar-se a “<xliff:g id="SSID">%1$s</xliff:g>” e compartilhar a senha"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Faça a leitura deste código QR com outro dispositivo para entrar na rede “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Faça a leitura deste código QR para conectar-se a “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Tente novamente. Se o problema persistir, entre em contato com o fabricante do dispositivo"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Algo deu errado"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Senha do Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Senha do ponto de acesso: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Conexão automática"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Permitir que o smartphone conecte automaticamente a essa rede quando estiver perto dela"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Permita que o tablet se conecte automaticamente quando estiver perto dessa rede"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Permitir conexão com esta rede quando ela estiver ao alcance"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Adicionar dispositivo"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Use um código QR para adicionar um dispositivo a esta rede"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"O código QR não está em um formato válido"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Usar certificados do sistema"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Não fornecer"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Não validar"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Nenhum certificado especificado. Sua conexão não será particular."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"O nome da rede é muito longo."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"É necessário especificar um domínio."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Certificado obrigatório."</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Conectar"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi ativado"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Conectado a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Conectando a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Conectando…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Falha ao conectar à rede"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Rede fora do alcance"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"O app está compartilhando conteúdo. Para compartilhar a conexão com a Internet, desative e ative o ponto de acesso"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Nenhuma senha definida"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Nome do ponto de acesso"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Ativando <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Ativando <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Outros dispositivos podem se conectar a <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Senha do ponto de acesso"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Banda do ponto de acesso"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Aumenta automaticamente a taxa de atualização de 60 para 90 Hz para alguns conteúdos. Maior uso da bateria."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Forçar a taxa de atualização de 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Maior taxa de atualização para melhoria na resposta tátil e na qualidade das animações. Maior uso da bateria."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Reconhecimento de tela em uso"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Ativado / A tela não será desativada se você estiver olhando para ela"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Versão do Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Atualização de segurança do Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Modelo"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Modelo: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Modelo e hardware"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Versão do hardware"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ID do equipamento"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"As configurações de rede foram redefinidas"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Não é possível limpar chips"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Os chips transferidos por download não podem ser limpos devido a um erro.\n\nReinicie o dispositivo e tente novamente."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Limpar todos os dados (redefinir para a configuração original)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Limpar todos os dados"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Essa ação limpará todos os dados do "<b>"armazenamento interno"</b>" do seu tablet, incluindo:\n\n"<li>"sua Conta do Google;"</li>\n<li>"configurações e dados do sistema e dos apps;"</li>\n<li>"apps transferidos."</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Essa ação limpará todos os dados do "<b>"armazenamento interno"</b>" do seu smartphone, incluindo:\n\n"<li>"Sua Conta do Google"</li>\n<li>"Configurações e dados do sistema e dos apps"</li>\n<li>"Apps transferidos"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"No momento você está conectado às seguintes contas:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Há outros usuários presentes neste dispositivo.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Músicas"</li>\n<li>"Fotos"</li>\n<li>"Outros dados do usuário"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIMs"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Esta ação não cancelará seu plano de serviços móveis."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Para limpar músicas, fotos e outros dados de usuário, o "<b>"armazenamento USB"</b>" precisa ser apagado."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Para limpar músicas, imagens e outros dados de usuário, o conteúdo do "<b>"cartão SD"</b>" precisa ser apagado."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Limpar todos os dados (redefinir para a configuração original)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Limpar todos os dados"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Essa ação limpará todos os dados do "<b>"armazenamento interno"</b>" do seu tablet, incluindo:\n\n"<li>"sua Conta do Google;"</li>\n<li>"configurações e dados do sistema e dos apps;"</li>\n<li>"apps transferidos por download."</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Essa ação limpará todos os dados do "<b>"armazenamento interno"</b>" do seu smartphone, incluindo:\n\n"<li>"sua Conta do Google;"</li>\n<li>"configurações e dados do sistema e dos apps;"</li>\n<li>"apps transferidos por download."</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"No momento, as seguintes contas estão conectadas:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Há outros usuários presentes neste dispositivo.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Músicas"</li>\n<li>"Fotos"</li>\n<li>"Outros dados do usuário"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIMs"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Essa ação não cancelará seu plano de serviços móveis."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Para limpar músicas, imagens e outros dados de usuário, o "<b>"armazenamento USB"</b>" precisa ser apagado."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Para limpar músicas, imagens e outros dados de usuário, o conteúdo do "<b>"cartão SD"</b>" precisa ser apagado."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Apagar armazenamento USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Apagar cartão SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Apagar todos os dados do armazenamento USB interno, como músicas e fotos"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Apagar todos os dados do cartão SD, como músicas e fotos"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Limpar todos os dados"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Limpar todos os dados"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Todas as informações pessoais e apps transferidos por download serão excluídos. Não é possível desfazer essa ação."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Todas as suas informações pessoais, inclusive apps e chips transferidos por download, serão excluídas. Não é possível desfazer essa ação."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Apagar tudo"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Nenhuma redefinição foi realizada porque o serviço de Limpeza do sistema não está disponível."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Limpar todos os dados?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"A configuração original não está disponível para esse usuário"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Apagando"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Aguarde..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Limpar todos os dados"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Limpar todos os dados"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Todas as informações pessoais e os apps transferidos por download serão excluídos. Não é possível desfazer essa ação."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Todas as suas informações pessoais, inclusive apps e chips transferidos por download, serão excluídas. Não é possível desfazer essa ação."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Limpar todos os dados?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"A redefinição para a configuração original não está disponível para este usuário"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Limpando"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Aguarde…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Conf. de chamada"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Configurar correio voz, encaminhamento, espera etc."</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Tethering USB"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Não é possível vincular a mais de <xliff:g id="MAXCONNECTION">%1$d</xliff:g> dispositivos."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será vinculado."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ethernet tethering"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Compartilhar conexão de Internet do smartphone via USB Ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Compartilhar a conexão de Internet do smartphone via Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Use o ponto de acesso e tethering para fornecer Internet a outros dispositivos por meio da sua conexão de dados móveis. Os apps também podem criar um ponto de acesso para compartilhar conteúdo com dispositivos por perto."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Use o ponto de acesso e tethering para fornecer Internet a outros dispositivos por meio da sua conexão Wi-Fi ou de dados móveis. Os apps também podem criar um ponto de acesso para compartilhar conteúdo com dispositivos próximos."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Ajuda"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Preferências de legenda"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Ampliação"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Área de ampliação"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Ampliação ativada"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Escolha a área de ampliação que você quer usar ao ampliar a tela"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Tela cheia"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Parte da tela"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Tela cheia e parte da tela"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Ampliar toda a tela"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Ampliar parte da tela"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Mudar para o botão de acessibilidade?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"O uso do toque triplo para ampliar parte da tela fará com que a digitação e outras ações fiquem mais lentas.\n\nQuer passar a usar o botão de acessibilidade para ampliar a tela?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Mudar para o botão de acessibilidade"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Manter o toque triplo para ampliar"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Configurações de ampliação"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Ampliar com toque triplo"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Ampliar com atalho"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Botão liga/desliga encerra chamadas"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Cursor do mouse grande"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Remover animações"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Áudio mono"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Combinar canais ao reproduzir áudio"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Balanço de áudio"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Esquerda"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Direita"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Áudio mono"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Combinar canais ao tocar áudio"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Balanço de áudio"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Esquerdo"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Direito"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Padrão"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 segundos"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 segundos"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Vibração de notificação"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Vibração do toque"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Feedback por toque"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Usar <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Abrir <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Usar correção de cor"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Mostrar legendas"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Apenas para apps compatíveis"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Usar <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Abrir <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Usar correção de cor"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Mostrar legendas"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Apenas para apps compatíveis"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Tamanho e estilo das legendas"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Tamanho do texto: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Mais opções"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomalia"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomalia"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomalia"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Escala de cinza"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Vermelho-verde"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Vermelho-verde"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Azul-amarelo"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Restrição em segundo plano"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Permitir que o app seja executado em segundo plano"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Execução do app em segundo plano não permitida"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Não é possível restringir o uso em segundo plano"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Não é possível restringir o uso em segundo plano"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Limitar atividade em segundo plano?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Se você limitar as atividades em segundo plano de um app, ele poderá apresentar mau funcionamento"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Como o app não está configurado para otimizar bateria, não é possível restringi-lo.\n\nPara restringir, ative a otimização."</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Definir uma programação"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Prolongar a duração da bateria"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Desativar quando estiver carregado"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"A Economia de bateria é desativada quando a carga do smartphone chega a <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"A Economia de bateria é desativada quando a carga do tablet chega a <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"A Economia de bateria é desativada quando a carga da bateria do dispositivo chega a <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"A Economia de bateria é desativada quando a carga do smartphone chega a mais de <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"A Economia de bateria é desativada quando a carga do tablet chega a mais de <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"A Economia de bateria é desativada quando a carga do dispositivo chega a mais de <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Ativar"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Redefinir"</string>
     <string name="tts_play" msgid="2945513377250757221">"Reproduzir"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Conectividade adaptável"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Aumenta a duração da bateria e melhora o desempenho do dispositivo ao gerenciar suas conexões de rede automaticamente"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Armazenamento de credenciais"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Instalar um certificado"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Instalar certificados do armazenamento"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Credenciais do usuário"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Ver e modificar as credenciais armazenadas"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Avançado"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Tipo de armazenamento"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"No hardware"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Somente software"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"As credenciais não estão disponíveis para este usuário"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Instalada para VPN e apps"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Instalada para Wi-Fi"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Como pagar no terminal"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Configure um app de pagamento. Em seguida, basta segurar a parte traseira do seu smartphone em direção a qualquer terminal com o símbolo indicando pagamento por aproximação."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Entendi"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Mais..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Mais…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Definir app de pagamento padrão"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Atualizar app de pagamento padrão"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Em um terminal por aproximação, pagar com <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Sempre usar esta opção para chamadas"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Selecionar um chip de dados"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Selecione um chip para SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Trocando chip de dados. Isso pode demorar um pouco..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Trocando chip de dados. Isso pode demorar um minuto…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Ligar com"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Selecionar um chip"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"Chip <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"rotina, agenda, economia de bateria, economia de energia, bateria, automático, percentagem"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, chamada avançada, chamadas por 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"adicionar idioma, adicionar um idioma"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"tamanho do texto"</string>
     <string name="default_sound" msgid="6604374495015245195">"Som padrão"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Volume de toque e notificação em <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Volume, vibração, Não perturbe"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Ativar sons"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Legenda Instantânea"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Legendar mídias automaticamente"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Nenhuma"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> programação definida</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> programações definidas</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Nenhum}=1{1 programação definida}one{# programação definida}other{# programações definidas}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Não perturbe"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Receber notificações apenas de pessoas e apps importantes"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limitar interrupções"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Somente prioridade"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Ativado / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Desativado / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Desativado"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Ativado"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Perguntar sempre"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Até você desativar"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> hora</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> horas</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minutos"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> programação pode ser ativada automaticamente</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> programações podem ser ativadas automaticamente</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 hora}one{# hora}other{# horas}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minuto}one{# minuto}other{# minutos}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Desativado}=1{Desativado / 1 programação pode ser ativada automaticamente}one{Desativado / # programação pode ser ativada automaticamente}other{Desativado / # programações podem ser ativadas automaticamente}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"O que pode interromper o \"Não perturbe\""</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Pessoas"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Apps"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Definir automaticamente as notificações de prioridade baixa como \"Discretas\""</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Classificação adaptativa de notificações"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Classificar notificações automaticamente por relevância"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Feedback de notificação adaptável"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Indicar os ajustes feitos nas notificações e mostrar a opção de enviar feedback ao sistema"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Respostas e ações sugeridas"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Mostrar automaticamente as respostas e ações sugeridas"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Mostrar notificações recentes e adiadas"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Acesso ao Não perturbe"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Permitir o Não perturbe"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Nenhum app instalado solicitou o acesso \"Não perturbe\""</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Carregando apps…"</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Carregando apps…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"O Android está bloqueando as notificações desse app neste dispositivo, conforme você pediu"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"O Android está bloqueando essa categoria de notificações neste dispositivo, conforme você pediu"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"O Android está bloqueando esse grupo de notificações neste dispositivo, conforme seu pedido"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Todas as conversas"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Conversas prioritárias"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Nenhuma"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> conversa</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> conversas</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Nenhuma"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Nenhum}=1{1 conversa}one{# conversa}other{# conversas}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Quem pode interromper"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Chamadas"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Chamadas"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Para garantir que as chamadas permitidas emitam sons, verifique se o dispositivo está configurado para tocar"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Durante a programação \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\", as chamadas recebidas são bloqueadas. Você pode ajustar as configurações para permitir que seus amigos, familiares ou outros contatos falem com você."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Contatos marcados com estrela"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one">mais <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="other">mais <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Nenhum"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Nenhum}=1{{contact_1}}=2{{contact_1} e {contact_2}}=3{{contact_1}, {contact_2} e {contact_3}}one{{contact_1}, {contact_2} e mais #}other{{contact_1}, {contact_2} e mais #}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Mensagens"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"mensagens"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Mensagens"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Durante \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\", as mensagens recebidas são bloqueadas. Você pode ajustar as configurações para permitir que seus amigos, familiares ou outros contatos falem com você."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Você pode receber todas as mensagens"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Você pode receber todas as chamadas"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Nenhum"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> contato</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> contatos</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Nenhum}=1{1 contato}one{# contato}other{# contatos}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Qualquer pessoa"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Contatos"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Contatos marcados com estrela"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Todas as notificações"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Algumas notificações"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Algumas pessoas ainda podem entrar em contato com você, mesmo que você não permita a interrupção por apps"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one"><xliff:g id="APP_NAMES">%s</xliff:g> pode interromper</item>
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> podem interromper</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"mais <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Nenhum app pode interromper}=1{{app_1} pode interromper}=2{{app_1} e {app_2} podem interromper}=3{{app_1}, {app_2} e {app_3} podem interromper}one{{app_1}, {app_2} e mais # podem interromper}other{{app_1}, {app_2} e mais # podem interromper}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Apps"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Todas as notificações"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Algumas notificações"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Notificações que podem interromper"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Permitir todas as notificações"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> pode interromper</item>
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> podem interromper</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Nada pode interromper"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"mais <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Nada pode interromper}=1{{sound_category_1} pode interromper}=2{{sound_category_1} e {sound_category_2} podem interromper}=3{{sound_category_1}, {sound_category_2} e {sound_category_3} podem interromper}one{{sound_category_1}, {sound_category_2} e mais # podem interromper}other{{sound_category_1}, {sound_category_2} e mais # podem interromper}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Nada pode interromper"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Ninguém pode interromper"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Algumas pessoas podem interromper"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Todas as pessoas podem interromper"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB controlado por"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Dispositivo conectado"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Este dispositivo"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Alternando..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Alternando…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Não foi possível alternar"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Para carregamento do dispositivo"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Carregando dispositivo conectado"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Ver detalhes"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Economia de dados"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Dados ilimitados"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Os dados em segundo plano estão desativados"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Os dados em segundo plano estão desativados"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Ativada"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Desativada"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Usar o recurso Economia de dados"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Se o dispositivo estiver bloqueado, impedir a digitação de respostas ou outros textos nas notificações"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Corretor ortográfico padrão"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Escolher corretor ortográfico"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Usar o corretor ortográfico"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Usar o corretor ortográfico"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Não selecionado"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(nenhum)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Para ajudar a liberar espaço de armazenamento, o gerenciador de armazenamento remove fotos e vídeos do seu dispositivo salvos em backup."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Remover fotos e vídeos"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Gerenciador de armazenamento"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Usar gerenciador de armazenamento"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Usar gerenciador de armazenamento"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Modo automático"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Modo manual"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Liberar espaço agora"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Tocar duas vezes na tela para verificar o smartphone"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Tocar duas vezes na tela para verificar o tablet"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Tocar duas vezes na tela para verificar o dispositivo"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Deslizar para ver notif."</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Deslize para baixo no canto inferior da tela para mostrar as notificações"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Modo para uma mão"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Usar o \"modo para uma mão\""</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Sair ao alternar entre apps"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Tempo limite"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 segundos"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 segundos"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 segundos"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"acesso com uma mão"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Para verificar a hora, as notificações e outras informações, toque duas vezes na tela."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Levantar o smartphone para verificá-lo"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Levantar o tablet para verificá-lo"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Tocar para verificar o tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Tocar para verificar o dispositivo"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Para verificar a hora, as notificações e outras informações, toque na tela."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Botão de pânico"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Pressione rapidamente o botão liga/desliga cinco vezes para iniciar as ações de emergência."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Som de alerta"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Emitir alerta antes de iniciar as ações"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Contatos de emergência"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Deslizar para baixo no sensor de impressão digital para ver as notificações"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Usar impressão digital"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Para ver suas notificações, deslize o dedo indicador para baixo no sensor de impressão digital localizado na parte traseira do smartphone."</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Ativar para todos os apps"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Selecionar driver gráfico"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Padrão"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Driver de jogo"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Driver de jogo"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Developer Driver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Driver gráfico do sistema"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Não foi possível encontrar redes. Tente novamente."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(proibida)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Sem chip"</string>
+    <string name="sim_card" msgid="6381158752066377709">"Chip"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Sem chip"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Nenhuma"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Chip necessário para se conectar"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Chip da <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> necessário para se conectar"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Modo de rede preferencial: WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Modo de rede preferencial: somente GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Modo de rede preferencial: somente WCDMA"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Dados móveis"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Acessar os dados pela rede móvel"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"O smartphone mudará automaticamente para esta operadora quando estiver dentro do alcance"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Nenhum chip disponível"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Preferência de chamadas"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Preferência de SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Perguntar sempre"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Permitir sobreposições de tela no app Config."</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Permita que apps que podem ser sobrepostos a outros sejam abertos sobre telas de configuração"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Mídia"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Ocultar player quando a sessão de mídia terminar"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"O player permite que você retome uma sessão do painel \"Configurações rápidas\" expandido."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Player de mídia nas Configurações rápidas"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Mostrar player de mídia por um longo período para retomar a reprodução com facilidade"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Ocultar player"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Mostrar player"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Nenhum player disponível"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Apps permitidos"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"mídia"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"O Bluetooth será ativado"</string>
 </resources>
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index e069752..620b637 100644
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Medie"</item>
     <item msgid="6740026006576843477">"Lungă"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Scurt"</item>
+    <item msgid="7397961711906421599">"Mediu"</item>
+    <item msgid="4079132024502041928">"Lung"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Prestabilit"</item>
     <item msgid="4234707448428002595">"Sans Serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Numai TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Global"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index a37c1f2..7493948 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -298,7 +298,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Afișați informații profil la blocarea ecranului"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Conturi"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Locație"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Utilizați locația"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Folosiți locația"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Dezactivat"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="few">Pornită - <xliff:g id="COUNT_1">%1$d</xliff:g> aplicații au acces la locație</item>
@@ -332,6 +332,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Folosiți-vă chipul pentru autentificare"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Începeți"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Dacă deblocarea facială pentru accesibilitate este dezactivată, este posibil ca unii pași de configurare să nu funcționeze corect cu TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Înapoi"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Continuați configurarea"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Folosiți configurarea accesibilității"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -627,7 +630,6 @@
       <item quantity="one">Trebuie să conțină mai puțin de <xliff:g id="NUMBER_0">%d</xliff:g> cifră</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Administratorul dispozitivului nu permite utilizarea unui PIN recent"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Codurile PIN sunt blocate de administratorul dvs. IT. Încercați alt cod PIN."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Aceasta nu poate include un caracter nevalid"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Trebuie să conțină cel puțin o literă"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Trebuie să conțină cel puțin o cifră"</string>
@@ -668,7 +670,6 @@
       <item quantity="one">Trebuie să conțină cel puțin un caracter care să nu fie cifră</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Administratorul dispozitivului nu permite utilizarea unei parole recente"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Parolele obișnuite sunt blocate de administratorul dvs. IT. Încercați altă parolă."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Șirurile de cifre ascendente, descendente sau repetate nu sunt permise"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Confirmați"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Anulați"</string>
@@ -812,7 +813,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Activați conexiunea Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Utilizați Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Folosiți Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Setări Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Configurați și gestionați punctele de acces wireless"</string>
@@ -920,7 +921,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Centrați codul QR de mai jos pentru a vă conecta la „<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Conectați-vă la Wi‑Fi scanând un cod QR"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Distribuiți Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Scanați acest cod QR ca să vă conectați la „<xliff:g id="SSID">%1$s</xliff:g>” și să trimiteți parola"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Scanați acest cod QR cu alt dispozitiv pentru a vă conecta la „<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Scanați acest cod QR pentru a vă conecta la „<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Încercați din nou. Dacă problema persistă, contactați producătorul dispozitivului"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"A apărut o eroare"</string>
@@ -946,8 +947,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Parola rețelei Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Parolă hotspot: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Conectare automată"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Permiteți ca telefonul să se conecteze automat în apropiere de această rețea"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Permiteți ca tableta să se conecteze automat în apropiere de această rețea"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Permiteți conectarea la această rețea când se află în aria de acoperire"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Adăugați un dispozitiv"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Folosiți un cod QR pentru a adăuga un dispozitiv la această rețea"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"Codul QR nu are un format valid"</string>
@@ -959,7 +959,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Folosiți certificate de sistem"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Nu se furnizează"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Nu se validează"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Nu s-a specificat niciun certificat. Conexiunea nu va fi privată."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Numele rețelei este prea lung."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Trebuie să specificați un domeniu."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Este obligatoriu un certificat."</string>
@@ -986,6 +985,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Conectați-vă"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Conexiunea prin Wi-Fi este activată"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"V-ați conectat la <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Se conectează la <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Se conectează…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Nu s-a putut stabili conexiunea la rețea"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Rețeaua este în afara ariei de acoperire"</string>
@@ -1060,7 +1060,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Aplicația trimite conținut. Pentru a permite accesul la conexiunea de internet, dezactivați hotspotul, apoi activați-l"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Nu s-a setat nicio parolă"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Nume hotspot"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Se activează <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Se activează <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Alte dispozitive se pot conecta la <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Parolă hotspot"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Banda AP"</string>
@@ -1210,7 +1210,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Ridică automat rata de actualizare de la 60 la 90 Hz pentru unele tipuri de conținut. Mărește utilizarea bateriei."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Forțați rata de actualizare de 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Cea mai ridicată rată de actualizare, pentru receptivitate la atingere îmbunătățită și animații de calitate. Mărește utilizarea bateriei."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Atenție la ecran"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Activat/Ecranul nu se va închide dacă vă uitați la el"</string>
@@ -1350,7 +1350,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Versiune Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Actualizare de securitate Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Model"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Model: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Model și hardware"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Versiune de hardware"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ID echipament"</string>
@@ -1625,31 +1624,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Setările pentru rețea au fost reinițializate"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Nu se pot șterge SIM-urile"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"SIM-urile descărcate nu pot fi șterse din cauza unei erori.\n\nReporniți dispozitivul și încercați din nou."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Ștergeți toate datele (reveniți la setările din fabrică)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Ștergeți toate datele (reveniți la setările din fabrică)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Această acțiune va șterge toate datele din "<b>"stocarea internă"</b>" a tabletei dvs., inclusiv:\n\n"<li>"Contul dvs. Google,"</li>\n<li>"datele și setările sistemului și ale aplicațiilor,"</li>\n<li>"aplicațiile descărcate."</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Această acțiune va șterge toate datele din "<b>"stocarea internă"</b>" a telefonului dvs., inclusiv:\n\n"<li>"Contul dvs. Google;"</li>\n<li>"Datele și setările sistemului și ale aplicațiilor;"</li>\n<li>"Aplicațiile descărcate;"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"În prezent sunteți conectat(ă) la următoarele conturi:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Pe acest dispozitiv sunt prezenți și alți utilizatori.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Muzică;"</li>\n<li>"Fotografii;"</li>\n<li>"Alte date ale utilizatorului."</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"Carduri eSIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Planul dvs. de servicii mobile nu va fi anulat astfel."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Pentru a șterge muzică, imagini și alte date ale utilizatorului, "<b>"stocarea USB"</b>" trebuie să fie ștearsă."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Pentru a șterge muzică, imagini și alte date ale utilizatorului, "<b>"cardul SD"</b>" trebuie să fie șters."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Ștergeți datele (reveniți la setările din fabrică)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Ștergeți datele (reveniți la setările din fabrică)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Această acțiune va șterge toate datele din "<b>"memoria internă"</b>" a tabletei, inclusiv:\n\n"<li>"Contul dvs. Google,"</li>\n<li>"datele și setările sistemului și ale aplicațiilor,"</li>\n<li>"aplicațiile descărcate."</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Această acțiune va șterge toate datele din "<b>"memoria internă"</b>" a telefonului, inclusiv:\n\n"<li>"Contul dvs. Google,"</li>\n<li>"datele și setările sistemului și ale aplicațiilor,"</li>\n<li>"aplicațiile descărcate."</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"V-ați conectat la următoarele conturi:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Pe acest dispozitiv sunt prezenți și alți utilizatori.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"muzică;"</li>\n<li>"fotografii;"</li>\n<li>"alte date ale utilizatorului."</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"carduri eSIM,"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Planul dvs. de servicii mobile nu va fi anulat astfel."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Pentru a șterge muzică, imagini și alte date ale utilizatorului, "<b>"stocarea USB"</b>" trebuie să fie ștearsă."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Pentru a șterge muzică, imagini și alte date ale utilizatorului, "<b>"cardul SD"</b>" trebuie să fie șters."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Ștergeți stocarea USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Ștergeți cardul SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Ștergeți toate datele din stocarea USB internă, cum ar fi muzica sau fotografiile"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Ștergeți toate datele de pe cardul SD, cum ar fi muzica sau fotografiile"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Ștergeți toate datele"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Ștergeți toate datele"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Toate informațiile cu caracter personal și aplicațiile descărcate vor fi șterse. Nu puteți anula această acțiune."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Toate informațiile cu caracter personal, inclusiv aplicațiile și SIM-urile descărcate, vor fi șterse. Nu puteți anula această acțiune."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Ștergeți tot"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Nu a fost efectuată nicio resetare, deoarece serviciul Golire sistem nu este disponibil."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Ștergeți toate datele?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Revenirea la setările din fabrică nu este disponibilă pentru acest utilizator"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Se șterge"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Așteptați..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Ștergeți toate datele"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Ștergeți toate datele"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Toate informațiile cu caracter personal și aplicațiile descărcate vor fi șterse. Nu puteți anula această acțiune."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Toate informațiile cu caracter personal, inclusiv aplicațiile și SIM-urile descărcate, vor fi șterse. Nu puteți anula această acțiune."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Ștergeți toate datele?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Revenirea la setările din fabrică nu este disponibilă pentru acest utilizator"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Se șterge"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Așteptați…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Setări pentru apeluri"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Activați mesageria vocală, redirecționarea apelurilor, apelul în așteptare, ID apelant"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Tethering prin USB"</string>
@@ -1697,7 +1694,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Este imposibil tethering cu peste <xliff:g id="MAXCONNECTION">%1$d</xliff:g> dispozitive."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> va fi deconectat."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Tethering Ethernet"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Permiteți accesul la conexiunea de internet a telefonului prin USB Ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Permiteți accesul la conexiunea de internet a telefonului prin Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Folosiți hotspotul și tetheringul pentru a oferi o conexiune de internet altor dispozitive prin conexiunea dvs. de date mobile. Și aplicațiile pot crea un hotspot pentru a trimite conținut dispozitivelor din apropiere."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Folosiți hotspotul și tetheringul pentru a oferi o conexiune de internet altor dispozitive prin conexiunea dvs. Wi-Fi sau de date mobile. Aplicațiile pot crea și un hotspot pentru a trimite conținut dispozitivelor din apropiere."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Ajutor"</string>
@@ -2141,13 +2138,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Preferințe pentru subtitrări"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Mărire"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Zona de mărire"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Mărire activată"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Alegeți zonele pe care doriți să le măriți atunci când măriți ecranul"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Ecran complet"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"O parte a ecranului"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Ecran complet și o parte a ecranului"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Măriți întregul ecran"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Măriți o parte a ecranului"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Comutați la butonul de accesibilitate?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Dacă folosiți tripla atingere pentru a mări o parte a ecranului, veți întârzia tastarea și alte acțiuni.\n\nComutați la folosirea butonului de accesibilitate pentru a mări?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Comutați la butonul de accesibilitate"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Mențineți tripla atingere pentru a mări"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Setări pentru mărire"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Măriți atingând de trei ori"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Măriți folosind scurtătura"</string>
@@ -2201,11 +2201,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Butonul de pornire închide"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Cursor mare pentru mouse"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Eliminați animațiile"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Audio mono"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Combinați canalele când redați conținutul audio"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Balans audio"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Stânga"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Dreapta"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Audio mono"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Combinați canalele când redați conținutul audio"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Balans audio"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Stânga"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Dreapta"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Prestabilit"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 secunde"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 de secunde"</string>
@@ -2235,11 +2235,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Vibrații la notificare"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Vibrațiile soneriei"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Feedback la atingere"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Folosiți <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Deschideți <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Utilizați corecție de culoare"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Afișează subtitrările"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Numai pentru aplicațiile compatibile"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Folosiți <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Deschideți <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Folosiți corecția culorii"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Afișează subtitrările"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Numai pentru aplicațiile compatibile"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Dimensiunea și stilul subtitrărilor"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Dimensiunea textului: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Mai multe opțiuni"</string>
@@ -2270,6 +2270,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomalie"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomalie"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomalie"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Tonuri de gri"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Roșu-verde"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Roșu-verde"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Albastru-galben"</string>
@@ -2405,7 +2406,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Restricție de fundal"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Permiteți aplicației să ruleze în fundal"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Aplicației nu i se permite să ruleze în fundal"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Utilizarea în fundal nu poate fi restricționată"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Utilizarea în fundal nu poate fi restricționată"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Limitați activitatea de fundal?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Dacă limitați activitatea de fundal pentru o aplicație, aceasta se poate comporta necorespunzător"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Aplicația nu optimizează bateria, deci nu o puteți restricționa.\n\nPentru a o restricționa, activați optimizarea bateriei."</string>
@@ -2629,9 +2630,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Setați un program"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Prelungiți autonomia bateriei"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Dezactivează când este încărcat complet"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Economisirea bateriei se dezactivează când telefonul este la <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Economisirea bateriei se dezactivează când tableta este la <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Economisirea bateriei se dezactivează când dispozitivul este la <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Economisirea bateriei se dezactivează când telefonul se încarcă peste <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Economisirea bateriei se dezactivează când tableta se încarcă peste <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Economisirea bateriei se dezactivează când dispozitivul se încarcă peste <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Activați"</string>
@@ -2696,6 +2697,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Resetați"</string>
     <string name="tts_play" msgid="2945513377250757221">"Redați"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Conectivitate adaptabilă"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Extinde autonomia bateriei și îmbunătățește performanța dispozitivului, gestionând automat conexiunile la rețea"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Stocarea certificatelor"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Instalați un certificat"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Instalați certificate de pe stocare"</string>
@@ -2707,9 +2710,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Date de conectare utilizator"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Vedeți și modificați datele de conectare stocate"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Avansate"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Tip de stocare"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Stocare hardware"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Stocare software"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Datele de conectare nu sunt disponibile pentru acest utilizator"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Instalate pentru VPN și aplicații"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Instalate pentru Wi-Fi"</string>
@@ -3103,7 +3103,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Plata la terminal"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Configurați o aplicație de plată. Apoi, apropiați spatele telefonului de orice terminal pe care apare simbolul de plată fără contact."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Am înțeles"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Mai multe..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Mai multe…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Setați aplicația de plată prestabilită"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Actualizați aplicația de plată prestabilită"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"La un terminal contactless, plătiți cu <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3187,7 +3187,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Utilizați întotdeauna pentru apeluri"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Selectați o cartelă SIM pentru date"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Selectați un card SIM pentru SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Se comută cardul SIM pentru date. Poate dura până la un minut..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Se comută cardul SIM pentru date. Poate dura până la un minut…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Apelați de pe"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Selectați un card SIM"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3331,6 +3331,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"rutină, program, economisirea bateriei, economisirea energiei, baterie, automat, procent"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, apelare avansată, apelare 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"adăugare limbă, adăugați o limbă"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"dimensiunea textului"</string>
     <string name="default_sound" msgid="6604374495015245195">"Sunet prestabilit"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Volumul pentru sonerie și notificări la <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Volum, vibrații, Nu deranja"</string>
@@ -3370,12 +3371,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Sunete la pornire"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Subtitrări live"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Adăugați subtitrări automate la fișierele media"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Nicio regulă"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="few"><xliff:g id="ON_COUNT">%d</xliff:g> programe setate</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> de programe setate</item>
-      <item quantity="one">Un program setat</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Niciunul}=1{Un program setat}few{# programe setate}other{# de programe setate}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Nu deranja"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Primiți doar notificări de la persoane și aplicații importante"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limitați întreruperile"</string>
@@ -3443,22 +3439,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Numai cu prioritate"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Activat/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Dezactivat/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Dezactivat"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Activat"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Întreabă de fiecare dată"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Până când dezactivați"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="few"><xliff:g id="NUM_HOURS">%d</xliff:g> ore</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> de ore</item>
-      <item quantity="one">O oră</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minute"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="few"><xliff:g id="ON_COUNT">%d</xliff:g> programe se pot activa automat</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> de programe se pot activa automat</item>
-      <item quantity="one">Un program se poate activa automat</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{O oră}few{# ore}other{# de ore}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{Un minut}few{# minute}other{# de minute}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Dezactivat}=1{Dezactivat/Un program se poate activa automat}few{Dezactivat/# programe se pot activa automat}other{Dezactivat/# de programe se pot activa automat}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Ce poate întrerupe modul Nu deranja"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Persoane"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Aplicații"</string>
@@ -3504,6 +3490,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Setați automat ca Discrete notificările cu prioritate redusă"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Poziționare adaptivă a notificărilor"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Poziționați automat notificările după relevanță"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Feedback pentru notificările adaptabile"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Indicați ajustările notificărilor și afișați opțiunea de a oferi feedback pentru sistem"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Acțiuni și răspunsuri sugerate"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Afișați automat acțiunile și răspunsurile sugerate"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Afișați notificările recente și pe cele amânate"</string>
@@ -3705,7 +3693,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Acces la funcția Nu deranja"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Permiteți modul Nu deranja"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Nicio aplicație instalată nu a solicitat accesul Nu deranja"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Se încarcă aplicațiile..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Se încarcă aplicații…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"La solicitarea dvs., Android blochează notificările acestei aplicații pe dispozitiv"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"La solicitarea dvs., Android blochează această categorie de notificări pe dispozitiv"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"La solicitarea dvs., Android blochează acest grup de notificări pe dispozitiv"</string>
@@ -3800,12 +3788,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Toate conversațiile"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Conversații cu prioritate"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Niciuna"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="few"><xliff:g id="CONVERSATIONS">%d</xliff:g> conversații</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> de conversații</item>
-      <item quantity="one">O conversație</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Niciuna"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Niciuna}=1{O conversație}few{# conversații}other{# de conversații}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Cine îl poate întrerupe"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Apeluri"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Apeluri"</string>
@@ -3814,12 +3797,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Pentru a vă asigura că apelurile permise emit sunete, verificați dacă dispozitivul este setat să sune"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Pentru „<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>”, apelurile primite sunt blocate. Puteți să modificați setările ca să le permiteți prietenilor, familiei sau altor persoane de contact să vă contacteze."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Persoane din agendă marcate cu stea"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="few">încă <xliff:g id="NUM_PEOPLE">%d</xliff:g> persoane</item>
-      <item quantity="other">încă <xliff:g id="NUM_PEOPLE">%d</xliff:g> de persoane</item>
-      <item quantity="one">încă o persoană</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Niciuna"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Niciuna}=1{{contact_1}}=2{{contact_1} și {contact_2}}=3{{contact_1}, {contact_2} și {contact_3}}few{{contact_1}, {contact_2} și încă #}other{{contact_1}, {contact_2} și încă #}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Mesaje"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"mesaje"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Mesaje"</string>
@@ -3828,12 +3806,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Pentru „<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>”, mesajele primite sunt blocate. Puteți să modificați setările ca să le permiteți prietenilor, familiei sau altor persoane de contact să ia legătura cu dumneavoastră."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Toate mesajele ajung la dvs."</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Toate apelurile ajung la dvs."</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Niciuna"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="few"><xliff:g id="NUM_CONTACTS">%d</xliff:g> persoane de contact</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> de persoane de contact</item>
-      <item quantity="one">O persoană de contact</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Niciuna}=1{O persoană de contact}few{# persoane de contact}other{# de persoane de contact}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Oricine"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Agendă"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Persoane din agendă marcate cu stea"</string>
@@ -3871,24 +3844,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Toate notificările"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Anumite notificări"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Persoanele selectate vă pot contacta chiar dacă nu permiteți ca aplicațiile să îl întrerupă"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="few"><xliff:g id="APP_NAMES">%s</xliff:g> îl pot întrerupe</item>
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> îl pot întrerupe</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> îl poate întrerupe</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"Încă <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Nicio aplicație nu îl poate întrerupe}=1{{app_1} îl poate întrerupe}=2{{app_1} și {app_2} îl pot întrerupe}=3{{app_1}, {app_2} și {app_3} îl pot întrerupe}few{{app_1}, {app_2} și încă # îl pot întrerupe}other{{app_1}, {app_2} și încă # îl pot întrerupe}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Aplicații"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Toate notificările"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Anumite notificări"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Notificări care îl pot întrerupe"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Permiteți toate notificările"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="few"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> îl pot întrerupe</item>
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> îl pot întrerupe</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> îl poate întrerupe</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Nimic nu îl poate întrerupe"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"Încă <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Nimic nu îl poate întrerupe}=1{{sound_category_1} îl poate întrerupe}=2{{sound_category_1} și {sound_category_2} îl pot întrerupe}=3{{sound_category_1}, {sound_category_2} și {sound_category_3} îl pot întrerupe}few{{sound_category_1}, {sound_category_2} și încă # îl pot întrerupe}other{{sound_category_1}, {sound_category_2} și încă # îl pot întrerupe}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Nimic nu îl poate întrerupe"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Nimeni nu îl poate întrerupe"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Anumite persoane îl pot întrerupe"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Oricine îl poate întrerupe"</string>
@@ -4142,7 +4105,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB controlat de"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Dispozitiv conectat"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Acest dispozitiv"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Se comută..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Se comută…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Nu s-a putut comuta"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Încărcarea acestui dispozitiv"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Se încarcă dispozitivul conectat"</string>
@@ -4396,7 +4359,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Vedeți detaliile"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Economizor de date"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Date nerestricționate"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Datele de fundal sunt dezactivate"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Datele de fundal sunt dezactivate"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Activat"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Dezactivat"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Utilizați economizorul de date"</string>
@@ -4419,7 +4382,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Dacă dispozitivul este blocat, nu permiteți scrierea răspunsurilor sau a altui text în notificări"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Verificator ortografic prestabilit"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Alegeți verificatorul ortografic"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Utilizați verificatorul ortografic"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Folosiți verificatorul ortografic"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Neselectat"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(niciunul)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4513,7 +4476,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Pentru a elibera spațiu de stocare, managerul spațiului de stocare elimină de pe dispozitiv fotografiile și videoclipurile cărora le-ați făcut backup."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Eliminați fotografii și videoclipuri"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Managerul spațiului de stocare"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Utilizați Managerul spațiului de stocare"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Folosiți Managerul stocării"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automat"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Manuale"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Eliberați spațiu acum"</string>
@@ -4551,6 +4514,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Atingeți de două ori pentru a verifica telefonul"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Atingeți de două ori pentru a verifica tableta"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Atingeți de două ori pentru a verifica dispozitivul"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Glisați pentru notificări"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Glisați spre marginea de jos a ecranului ca să afișați notificările"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Modul cu o mână"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Folosiți modul cu o mână"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Părăsiți la comutarea aplicațiilor"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Timp limită"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 secunde"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 secunde"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 secunde"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"accesibilitate"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Ca să verificați ora, notificările și alte informații, atingeți ecranul de două ori."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Ridicați pentru a verifica telefonul"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Ridicați pentru a verifica tableta"</string>
@@ -4563,6 +4536,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Atingeți pentru a verifica tableta"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Atingeți pentru a verifica dispozitivul"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Ca să verificați ora, notificările și alte informații, atingeți ecranul."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Buton de alarmă"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Inițiați acțiunile de urgență apăsând rapid butonul de pornire de cinci ori."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Sunet de avertizare"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Alertă înainte de începerea acțiunilor"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Persoane de contact pentru urgențe"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Glisați amprenta pentru notificări"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Glisați amprenta"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Pentru a verifica notificările, glisați în jos pe senzorul de amprentă de pe spatele telefonului."</string>
@@ -4724,7 +4702,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Activați pentru toate aplicațiile"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Selectați driverul plăcii grafice"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Prestabilit"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Driverul jocului"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Driverul jocului"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Developer Driver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Driverul plăcii grafice de sistem"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4793,6 +4771,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Nu s-au găsit rețele. Încercați din nou."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(interzisă)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Niciun card SIM"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Niciun card SIM"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Fără"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Necesită un card SIM pentru a se conecta"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Necesită un card SIM <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> pentru a se conecta"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Mod de rețea preferat: de preferat WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Mod de rețea preferat: numai GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Mod de rețea preferat: numai WCDMA"</string>
@@ -4846,6 +4829,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Date mobile"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Accesați datele folosind rețeaua mobilă"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Telefonul va comuta automat la acest operator când se află în aria de acoperire"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Nu este disponibil niciun card SIM"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Preferință pentru apeluri"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Preferințe pentru SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Întreabă mereu"</string>
@@ -5031,10 +5015,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Permiteți suprapunerile pe ecrane din Setări"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Permiteți aplicații care se pot afișa deasupra altora prin suprapunerea pe ecranele de Setări"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Media"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Ascunde playerul după încheierea sesiunii media"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Cu ajutorul playerului, puteți relua o sesiune din panoul extins Setări rapide."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Playerul media din Setările rapide"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Afișați playerul media pentru o perioadă extinsă ca să reluați ușor redarea"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Ascunde playerul"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Afișează playerul"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Niciun player disponibil"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Aplicații permise"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"media"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth se va activa"</string>
 </resources>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index c78d052..a3953aa 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Средняя"</item>
     <item msgid="6740026006576843477">"Большая"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Короткая задержка"</item>
+    <item msgid="7397961711906421599">"Средняя задержка"</item>
+    <item msgid="4079132024502041928">"Длительная задержка"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"По умолчанию"</item>
     <item msgid="4234707448428002595">"Без засечек"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA и LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Весь мир"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Только TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Весь мир"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 1619022..119caf4 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -300,7 +300,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Показывать информацию профиля на заблокированном экране"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Аккаунты"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Местоположение"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Определять местоположение"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Определять местоположение"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Откл."</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">Включено (доступ к данным о местоположении есть у <xliff:g id="COUNT_1">%1$d</xliff:g> приложения)</item>
@@ -335,6 +335,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Используйте распознавание лица для аутентификации"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Начать"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Если упрощенная настройка фейсконтроля отключена, некоторые действия при работе с TalkBack могут выполняться некорректно."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Назад"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Продолжить настройку"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Использовать специальные возможности"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -635,7 +638,6 @@
       <item quantity="other">PIN-код должен содержать менее <xliff:g id="NUMBER_1">%d</xliff:g> цифры</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Использовать недавний PIN-код запрещено"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"ИТ-администратор заблокировал простые PIN-коды. Выберите более сложную комбинацию."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Недопустимые символы"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Используйте хотя бы одну букву"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Используйте хотя бы одну цифру"</string>
@@ -683,7 +685,6 @@
       <item quantity="other">Пароль должен содержать хотя бы <xliff:g id="COUNT">%d</xliff:g> нечислового символа.</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Использовать недавний пароль запрещено"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"ИТ-администратор заблокировал простые пароли. Выберите более сложную комбинацию."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Нельзя использовать последовательности из идущих подряд или повторяющихся цифр"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Подтвердить"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Отмена"</string>
@@ -829,7 +830,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Включить Wi‑Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Использовать Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Использовать Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Настройки Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Настройка и управление точками доступа беспроводной сети"</string>
@@ -937,7 +938,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Чтобы подключиться к сети \"<xliff:g id="SSID">%1$s</xliff:g>\", наведите камеру на QR-код ниже."</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Чтобы подключиться к сети Wi‑Fi, отсканируйте QR-код."</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Предоставить доступ к Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Чтобы подключиться к сети \"<xliff:g id="SSID">%1$s</xliff:g>\" и поделиться паролем, отсканируйте этот QR-код."</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Чтобы подключиться к сети <xliff:g id="SSID">%1$s</xliff:g>, отсканируйте этот QR-код на другом устройстве."</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Чтобы подключиться к сети \"<xliff:g id="SSID">%1$s</xliff:g>\", отсканируйте этот QR-код."</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Повторите попытку. Если это не поможет, свяжитесь с производителем устройства."</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Произошла ошибка."</string>
@@ -963,8 +964,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Пароль сети Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Пароль точки доступа: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Автоматическое подключение"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Разрешить автоматическое подключение в зоне действия этой сети"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Разрешить автоматическое подключение в зоне действия этой сети"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Разрешите подключение к этой сети в зоне ее действия."</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Добавить устройство"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Использовать QR-код, чтобы добавить устройство к этой сети"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"Недопустимый формат QR-кода"</string>
@@ -976,7 +976,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Системные сертификаты"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Не указывать"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Не проверять"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Сертификат не указан. Будет установлено незащищенное соединение."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Слишком длинное имя сети."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Укажите домен."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Требуется сертификат."</string>
@@ -1003,6 +1002,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Подключить"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi включен"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Подключено: <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Подключение к сети \"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>\"…"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Подключение…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Не удалось подключиться к сети."</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Вы не находитесь в зоне действия сети."</string>
@@ -1080,7 +1080,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Открыт доступ к контенту приложения. Чтобы разрешить другим устройствам использовать ваше интернет-соединение, отключите и снова включите точку доступа."</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Пароль не задан"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Название точки доступа"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Подключение к точке доступа \"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>\"..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Включение точки доступа <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Другие устройства могут подключаться к точке доступа \"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>\""</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Пароль точки доступа"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Диапазон частот Wi-Fi"</string>
@@ -1230,7 +1230,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Плавный экран"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Автоматически изменять частоту обновления экрана с 60 до 90 Гц для некоторых типов контента (при этом батарея разряжается быстрее)"</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Плавный экран"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Установить частоту обновления экрана 90 Гц"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Высокая частота обновления экрана улучшает ответ на касания и делает анимацию более плавной. При этом батарея разряжается быстрее."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Адаптивный спящий режим"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Включено (экран не будет отключаться, если вы смотрите на него)"</string>
@@ -1371,7 +1371,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Версия Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Обновление системы безопасности Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Модель"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Модель: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Модель и аппаратное обеспечение"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Версия аппаратного обеспечения"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Идентификатор оборудования"</string>
@@ -1646,31 +1645,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Сетевые настройки сброшены"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Не удалось стереть данные SIM-карт"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Не удалось стереть данные скачанных SIM-карт из-за ошибки.\n\nПерезагрузите устройство и повторите попытку."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Удалить все данные (сброс к заводским настройкам)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Удалить все данные"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Будут удалены все данные из "<b>"внутренней памяти"</b>" планшета, в том числе:\n\n"<li>"Ваш аккаунт Google"</li>\n<li>"Настройки/данные системы и приложений"</li>\n<li>"Установленные приложения"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Будут удалены все данные из "<b>"внутренней памяти"</b>" телефона, в том числе:\n\n"<li>"Ваш аккаунт Google"</li>\n<li>"Настройки/данные системы и приложений"</li>\n<li>"Установленные приложения"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Аккаунты на этом устройстве:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"На этом устройстве есть другие аккаунты пользователей.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Музыка"</li>\n<li>"Фото"</li>\n<li>"Другие данные"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Вы не потеряете доступ к услугам оператора связи."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Чтобы удалить музыку, изображения и другие пользовательские данные, необходимо очистить "<b>"USB-накопитель"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Чтобы удалить музыку, фотографии и другие пользовательские данные, необходимо очистить "<b>"SD-карту"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Удалить все данные"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Удалить все данные"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Будут удалены все сведения из "<b>"внутреннего хранилища"</b>" планшета, в том числе:\n\n"<li>"ваш аккаунт Google;"</li>\n<li>"данные и настройки системы и приложений;"</li>\n<li>"скачанные приложения."</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Будут удалены все данные из "<b>"внутренней памяти"</b>" телефона, в том числе:\n\n"<li>"ваш аккаунт Google;"</li>\n<li>"данные и настройки системы и приложений;"</li>\n<li>"скачанные приложения."</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Аккаунты на этом устройстве:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"На этом устройстве есть другие аккаунты пользователей.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Музыка"</li>\n<li>"Фото"</li>\n<li>"Другие данные"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Вы не потеряете доступ к услугам оператора связи."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Чтобы удалить музыку, изображения и другие пользовательские данные, необходимо очистить "<b>"USB-накопитель"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Чтобы удалить музыку, фотографии и другие пользовательские данные, необходимо очистить "<b>"SD-карту"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Очистить USB-накопитель"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Очистить SD-карту"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Удалить с USB-накопителя музыку, фотографии и все остальные данные."</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Удалить с SD-карты все данные, в том числе музыку и фотографии"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Удалить все данные"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Удалить все данные"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Вся личная информация и загруженные приложения будут удалены. Это действие нельзя отменить."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Вся личная информация, в том числе данные SIM-карт и загруженные приложения, будут удалены. Это действие нельзя отменить."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Стереть все"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Сброс не выполнен, поскольку служба System Clear недоступна."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Удалить все данные?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Этот пользователь не может выполнять сброс настроек"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Удаление…"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Подождите..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Удалить"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Удалить"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Вся личная информация и скачанные приложения будут удалены. Это действие нельзя отменить."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Вся личная информация, в том числе данные SIM-карт и скачанные приложения, будут удалены. Это действие нельзя отменить."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Удалить все данные?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Этот пользователь не может выполнять сброс настроек"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Удаление…"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Подождите…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Вызовы"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Голосовая почта, АОН, переадресация, параллельный вызов"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB-модем"</string>
@@ -1718,7 +1715,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Макс. число подключаемых устройств: <xliff:g id="MAXCONNECTION">%1$d</xliff:g>"</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Подключение к <xliff:g id="DEVICE_NAME">%1$s</xliff:g> будет прервано."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Режим Ethernet-модема"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Открыть доступ к интернет-подключению телефона через USB Ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Открыть доступ к интернет-подключению телефона через Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Используйте точку доступа и режим модема, чтобы подключать другие устройства к Интернету, в том числе мобильному. Приложения также могут создавать точки доступа, чтобы делиться контентом с устройствами поблизости."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Используйте точку доступа и режим модема, чтобы подключать другие устройства к Интернету через Wi-Fi или мобильную сеть. Приложения также могут создавать точки доступа, чтобы делиться контентом с устройствами поблизости."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Справка"</string>
@@ -2165,13 +2162,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Настройки субтитров"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Увеличение"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Область увеличения"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Включение увеличения"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Выберите область увеличения экрана."</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Весь экран"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Часть экрана"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Весь экран или его часть"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Увеличить весь экран"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Увеличить часть экрана"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Использовать кнопку специальных возможностей?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Увеличение части экрана тройным нажатием приведет к задержкам при вводе текста и выполнении других действий.\n\nИспользовать для увеличения кнопку специальных возможностей?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Использовать кнопку специальных возможностей"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Увеличивать экран тройным нажатием"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Настройки увеличения"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Увеличение по тройному нажатию"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Увеличение с помощью кнопки"</string>
@@ -2225,11 +2225,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Кн. питания завершает вызов"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Крупный указатель мыши"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Удалить анимации"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Монофонический звук"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Объединять каналы при воспроизведении аудио"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Баланс звука"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Левый канал"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Правый канал"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Монофонический звук"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Объединять каналы при воспроизведении аудио"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Баланс звука"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Левый канал"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Правый канал"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"По умолчанию"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 секунд"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 секунд"</string>
@@ -2259,11 +2259,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Вибрация при уведомлении"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Вибрация при звонке"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Вибрация при касании"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Использовать <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Открыть приложение \"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>\""</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Использовать коррекцию цвета"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Показывать субтитры"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Только для приложения, в котором поддерживается эта функция"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Использовать приложение \"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>\""</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Открыть <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Использовать коррекцию цвета"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Показывать субтитры"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Только для приложения, в котором поддерживается эта функция"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Размер и стиль субтитров"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Размер шрифта: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Ещё"</string>
@@ -2295,6 +2295,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Дейтераномалия"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Протаномалия"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Тританомалия"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Оттенки серого"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Красный и зеленый"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Красный и зеленый"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Синий и желтый"</string>
@@ -2436,7 +2437,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Ограничение работы в фоновом режиме"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Разрешить приложению работать в фоновом режиме"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Приложению запрещено работать в фоновом режиме"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Невозможно ограничить работу в фоновом режиме"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Невозможно ограничить работу в фоновом режиме"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Ограничить работу в фоновом режиме?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Это действие может привести к неправильной работе приложения."</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Оптимизация расхода заряда батареи для этого приложения не настроена.\n\nВключите ее, чтобы установить ограничения."</string>
@@ -2667,9 +2668,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Задать расписание"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Продление времени работы от батареи"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Выключать при полном заряде"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Отключать режим энергосбережения, когда уровень заряда достигает <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Режим энергосбережения отключается, когда уровень заряда достигает <xliff:g id="PERCENT">%1$s</xliff:g>."</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Режим энергосбережения отключается, когда уровень заряда достигает <xliff:g id="PERCENT">%1$s</xliff:g>."</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Режим энергосбережения отключается, когда уровень заряда телефона выше <xliff:g id="PERCENT">%1$s</xliff:g>."</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Режим энергосбережения отключается, когда уровень заряда планшета выше <xliff:g id="PERCENT">%1$s</xliff:g>."</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Режим энергосбережения отключается, когда уровень заряда устройства выше <xliff:g id="PERCENT">%1$s</xliff:g>."</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Включить"</string>
@@ -2734,6 +2735,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Сбросить"</string>
     <string name="tts_play" msgid="2945513377250757221">"Воспроизвести"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Адаптивное подключение"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Продлевает время работы от батареи и повышает производительность устройства за счет автоматического управления сетевыми подключениями"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Хранилище учетных данных"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Установка сертификатов"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Установить сертификаты"</string>
@@ -2745,9 +2748,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Учетные данные пользователя"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Посмотреть/изменить сохраненные учетные данные"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Дополнительные настройки"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Тип хранилища"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Аппаратное"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Только программное"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Этот пользователь не может изменять учетные данные"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Установлено для VPN и приложений"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Установлено для Wi-Fi"</string>
@@ -3146,7 +3146,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Как оплатить"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Настройте платежное приложение, а затем приложите телефон задней панелью к терминалу со значком бесконтактной оплаты."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"ОК"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Ещё…"</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Ещё…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Установите основное платежное приложение"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Обновите основное платежное приложение"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"При бесконтактной оплате будет использоваться приложение \"<xliff:g id="APP">%1$s</xliff:g>\"."</string>
@@ -3230,7 +3230,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Всегда использовать для звонков"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"SIM-карта для передачи данных"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Выберите SIM-карту для SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Смена SIM-карты… Подождите минуту."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Смена SIM-карты. Подождите минуту…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Выберите SIM-карту"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Выберите SIM-карту"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM-карта <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3375,6 +3375,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"программа, расписание, режим энергосбережения, экономия заряда, батарея, автоматически, процент"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, расширенный вызов, звонки по сети 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"добавить язык, добавление языка"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"размер шрифта"</string>
     <string name="default_sound" msgid="6604374495015245195">"Мелодия по умолчанию"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Громкость сигналов при входящих вызовах и уведомлениях: <xliff:g id="PERCENTAGE">%1$s</xliff:g>."</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Громкость, вибрация, режим \"Не беспокоить\""</string>
@@ -3414,13 +3415,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Звуки при включении устройства"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Автоматические субтитры"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Автоматически добавлять субтитры"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Правила не заданы"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one">Настроено <xliff:g id="ON_COUNT">%d</xliff:g> расписание</item>
-      <item quantity="few">Настроено <xliff:g id="ON_COUNT">%d</xliff:g> расписания</item>
-      <item quantity="many">Настроено <xliff:g id="ON_COUNT">%d</xliff:g> расписаний</item>
-      <item quantity="other">Настроено <xliff:g id="ON_COUNT">%d</xliff:g> расписания</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Нет настроенных расписаний}=1{Настроено 1 расписание}one{Настроено # расписание}few{Настроено # расписания}many{Настроено # расписаний}other{Настроено # расписания}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Не беспокоить"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Получать уведомления только от важных людей и приложений"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Отключение уведомлений"</string>
@@ -3488,24 +3483,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Только важные"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>."</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Включено/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Отключено/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Отключено"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Включено"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Всегда спрашивать"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Пока вы не отключите"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> час</item>
-      <item quantity="few"><xliff:g id="NUM_HOURS">%d</xliff:g> часа</item>
-      <item quantity="many"><xliff:g id="NUM_HOURS">%d</xliff:g> часов</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> часа</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> мин."</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one">Может автоматически включиться <xliff:g id="ON_COUNT">%d</xliff:g> расписание.</item>
-      <item quantity="few">Могут автоматически включиться <xliff:g id="ON_COUNT">%d</xliff:g> расписания.</item>
-      <item quantity="many">Могут автоматически включиться <xliff:g id="ON_COUNT">%d</xliff:g> расписаний.</item>
-      <item quantity="other">Может автоматически включиться <xliff:g id="ON_COUNT">%d</xliff:g> расписания.</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 час}one{# час}few{# часа}many{# часов}other{# часа}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 минута}one{# минута}few{# минуты}many{# минут}other{# минуты}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Выключено}=1{Выключено/Автоматическое включение по 1 расписанию}one{Выключено/Автоматическое включение по # расписанию}few{Выключено/Автоматическое включение по # расписаниям}many{Выключено/Автоматическое включение по # расписаниям}other{Выключено/Автоматическое включение по # расписания}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Исключения для режима \"Не беспокоить\""</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Пользователи"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Приложения"</string>
@@ -3551,6 +3534,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Автоматически назначать беззвучный режим для уведомлений с низким приоритетом"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Автоматическая приоритизация"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Автоматически присваивать важность уведомлениям по релевантности"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Отзывы об адаптивных уведомлениях"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Показывает, какой статус назначен уведомлению, и предлагает оставить отзыв"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Рекомендуемые действия и ответы"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Автоматически показывать рекомендуемые действия и ответы"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Показывать недавние и отложенные уведомления"</string>
@@ -3757,7 +3742,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Доступ к функции \"Не беспокоить\""</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Разрешить доступ к режиму \"Не беспокоить\""</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Установленные приложения не запрашивали доступ к функции \"Не беспокоить\""</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Загрузка..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Загрузка приложений…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Вы отключили уведомления от этого приложения."</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Вы отключили уведомления этой категории."</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Вы отключили эту группу уведомлений"</string>
@@ -3855,13 +3840,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Все разговоры"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Важные разговоры"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Нет"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> разговор</item>
-      <item quantity="few"><xliff:g id="CONVERSATIONS">%d</xliff:g> разговора</item>
-      <item quantity="many"><xliff:g id="CONVERSATIONS">%d</xliff:g> разговоров</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> разговора</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Нет"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Ни одного}=1{1 чат}one{# чат}few{# чата}many{# чатов}other{# чата}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Для кого не действует режим \"Не беспокоить\""</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Вызовы"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Вызовы"</string>
@@ -3870,13 +3849,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Чтобы не пропустить важные звонки, убедитесь, что на устройстве включен звук."</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Входящие вызовы заблокированы правилом \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\". Вы можете изменить настройки, чтобы принимать звонки от друзей, членов семьи и других контактов."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Помеченные контакты"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one">ещё <xliff:g id="NUM_PEOPLE">%d</xliff:g> контакт</item>
-      <item quantity="few">ещё <xliff:g id="NUM_PEOPLE">%d</xliff:g> контакта</item>
-      <item quantity="many">ещё <xliff:g id="NUM_PEOPLE">%d</xliff:g> контактов</item>
-      <item quantity="other">ещё <xliff:g id="NUM_PEOPLE">%d</xliff:g> контакта</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Нет"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Контактов нет}=1{{contact_1}}=2{{contact_1} и {contact_2}}=3{{contact_1}, {contact_2} и {contact_3}}one{{contact_1}, {contact_2} и ещё #}few{{contact_1}, {contact_2} и ещё #}many{{contact_1}, {contact_2} и ещё #}other{{contact_1}, {contact_2} и ещё #}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Сообщения"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"сообщений"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Сообщения"</string>
@@ -3885,13 +3858,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Когда действует правило \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\", входящие сообщения блокируются. Вы можете изменить настройки, чтобы принимать сообщения от друзей, членов семьи и других контактов."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Режим \"Не беспокоить\" не действует для всех сообщений"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Режим \"Не беспокоить\" не действует для всех вызовов"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Нет"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> контакт</item>
-      <item quantity="few"><xliff:g id="NUM_CONTACTS">%d</xliff:g> контакта</item>
-      <item quantity="many"><xliff:g id="NUM_CONTACTS">%d</xliff:g> контактов</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> контакта</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Никто}=1{1 контакт}one{# контакт}few{# контакта}many{# контактов}other{# контакта}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Все"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Контакты"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Помеченные контакты"</string>
@@ -3929,26 +3896,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Все уведомления"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Некоторые уведомления"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Выбранные пользователи смогут связаться с вами, даже если для приложений действует режим \"Не беспокоить\"."</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one">Режим \"Не беспокоить\" не действует для следующих приложений: <xliff:g id="APP_NAMES">%s</xliff:g></item>
-      <item quantity="few">Режим \"Не беспокоить\" не действует для следующих приложений: <xliff:g id="APP_NAMES">%s</xliff:g></item>
-      <item quantity="many">Режим \"Не беспокоить\" не действует для следующих приложений: <xliff:g id="APP_NAMES">%s</xliff:g></item>
-      <item quantity="other">Режим \"Не беспокоить\" не действует для следующих приложений: <xliff:g id="APP_NAMES">%s</xliff:g></item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"ещё <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Режим \"Не беспокоить\" действует для всех приложений}=1{Режим \"Не беспокоить\" не действует для приложения \"{app_1}\"}=2{Режим \"Не беспокоить\" не действует для приложений \"{app_1}\" и \"{app_2}\"}=3{Режим \"Не беспокоить\" не действует для приложений \"{app_1}\", \"{app_2}\" и \"{app_3}\"}one{Режим \"Не беспокоить\" не действует для приложений \"{app_1}\", \"{app_2}\" и ещё #}few{Режим \"Не беспокоить\" не действует для приложений \"{app_1}\", \"{app_2}\" и ещё #}many{Режим \"Не беспокоить\" не действует для приложений \"{app_1}\", \"{app_2}\" и ещё #}other{Режим \"Не беспокоить\" не действует для приложений \"{app_1}\", \"{app_2}\" и ещё #}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Приложения"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Все уведомления"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Некоторые уведомления"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Уведомления, для которых не действует режим \"Не беспокоить\""</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Разрешить все уведомления"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one">Режим \"Не беспокоить\" не действует для звуков следующих категорий: <xliff:g id="SOUND_CATEGORIES">%s</xliff:g></item>
-      <item quantity="few">Режим \"Не беспокоить\" не действует для звуков следующих категорий: <xliff:g id="SOUND_CATEGORIES">%s</xliff:g></item>
-      <item quantity="many">Режим \"Не беспокоить\" не действует для звуков следующих категорий: <xliff:g id="SOUND_CATEGORIES">%s</xliff:g></item>
-      <item quantity="other">Режим \"Не беспокоить\" не действует для звуков следующих категорий: <xliff:g id="SOUND_CATEGORIES">%s</xliff:g></item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Режим \"Не беспокоить\" действует для всех звуков"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"ещё <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Все звуки запрещены}=1{Разрешен звук \"{sound_category_1}\"}=2{Разрешены звуки \"{sound_category_1}\" и \"{sound_category_2}\"}=3{Разрешены звуки \"{sound_category_1}\", \"{sound_category_2}\" и \"{sound_category_3}\"}one{Разрешены звуки \"{sound_category_1}\", \"{sound_category_2}\" и ещё #}few{Разрешены звуки \"{sound_category_1}\", \"{sound_category_2}\" и ещё #}many{Разрешены звуки \"{sound_category_1}\", \"{sound_category_2}\" и ещё #}other{Разрешены звуки \"{sound_category_1}\", \"{sound_category_2}\" и ещё #}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Все звуки запрещены"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Режим \"Не беспокоить\" действует для всех звонков и сообщений"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Режим \"Не беспокоить\" не действует для звонков и сообщений от некоторых пользователей"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Режим \"Не беспокоить\" не действует для звонков и сообщений от любых пользователей"</string>
@@ -4212,7 +4167,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"Устройство, управляющее USB"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Подключенное устройство"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Это устройство"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Подождите…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Подождите…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Не удалось переключиться"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Зарядка этого устройства"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Зарядка подключенного устройства"</string>
@@ -4473,7 +4428,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Подробнее"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Экономия трафика"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Неограниченный мобильный Интернет"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Фоновый режим выключен"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Фоновый режим выключен"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Включено"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Отключено"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Экономия трафика"</string>
@@ -4496,7 +4451,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Запретить набор текста в уведомлениях, если устройство заблокировано"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Правописание по умолчанию"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Проверка правописания"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Включить проверку правописания"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Включить проверку правописания"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Не выбрано"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(нет)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4594,7 +4549,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Чтобы освободить место, менеджер хранилища удаляет с устройства фото и видео, для которых есть резервные копии."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Удалять фото и видео"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Менеджер хранилища"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Использовать менеджер хранилища"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Использовать менеджер хранилища"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Автоматически"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Вручную"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Очистить хранилище"</string>
@@ -4632,6 +4587,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Дважды нажать, чтобы проверить уведомления"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Дважды нажать, чтобы проверить уведомления"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Дважды нажать, чтобы проверить уведомления"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Жест для уведомлений"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Чтобы увидеть уведомления, проведите вниз по нижней части экрана."</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Режим управления одной рукой"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Использовать режим управления одной рукой"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Выходить из режима при переключении между приложениями"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Время ожидания"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 секунды"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 секунд"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 секунд"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"управление одной рукой"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Чтобы увидеть время, уведомления и другую информацию, дважды коснитесь экрана"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Поднять, чтобы проверить телефон"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Просмотр уведомлений в вертикальном положении планшета"</string>
@@ -4644,6 +4609,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Нажмите, чтобы проверить планшет"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Нажмите, чтобы проверить устройство"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Чтобы увидеть время, уведомления и другую информацию, коснитесь экрана."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Кнопка panic"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Быстро нажмите пять раз на кнопку питания, чтобы позвонить в экстренные службы"</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Предупреждающий сигнал"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Включать предупреждающий сигнал перед звонком в экстренные службы"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Контакты для экстренных случаев"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Использовать сканер отпечатков для просмотра уведомлений"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Сканер отпечатков"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Чтобы увидеть уведомления, проведите вниз по сканеру отпечатков пальцев на задней панели телефона"</string>
@@ -4812,7 +4782,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Включить для всех приложений"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Выбор графического драйвера"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"По умолчанию"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Игровой драйвер"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Игровой драйвер"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Версия драйвера для разработчиков"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Системный графический драйвер"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4881,6 +4851,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Сети не найдены. Повторите попытку."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(доступ запрещен)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Нет SIM-карты."</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM-карта"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Нет SIM-карты"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Нет"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Для подключения требуется SIM-карта"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Для подключения требуется SIM-карта оператора \"<xliff:g id="WIRELESS_CARRIER">%s</xliff:g>\""</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Предпочтительный режим: WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Предпочтительный режим: только GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Предпочтительный режим: только WCDMA"</string>
@@ -4934,6 +4909,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Мобильный Интернет"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Доступ к Интернету по мобильной сети"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Телефон автоматически подключится к сети этого оператора, когда вы окажетесь в зоне ее действия."</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Нет SIM-карты"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Настройки звонков"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Настройки SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Всегда спрашивать"</string>
@@ -5122,10 +5098,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Разрешить экранный оверлей в настройках"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Разрешить приложениям, которые могут показываться поверх других, накладываться на экраны настроек"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Медиа"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Скрывать проигрыватель по окончании мультимедийного сеанса"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"С помощью проигрывателя вы можете восстанавливать мультимедийный сеанс на панели быстрых настроек"</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Медиапроигрыватель в быстрых настройках"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Показывать медиапроигрыватель в течение длительного времени, чтобы можно было быстро возобновлять воспроизведение"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Проигрыватель скрыт"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Проигрыватель показан"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Нет доступных проигрывателей"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Разрешенные приложения"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"Медиа"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Будет включен модуль Bluetooth"</string>
 </resources>
diff --git a/res/values-si/arrays.xml b/res/values-si/arrays.xml
index e67cd3c..a10dc04 100644
--- a/res/values-si/arrays.xml
+++ b/res/values-si/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"මධ්‍යම"</item>
     <item msgid="6740026006576843477">"දීර්ඝ"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"කෙටි"</item>
+    <item msgid="7397961711906421599">"මධ්‍යම"</item>
+    <item msgid="4079132024502041928">"දිගු"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"සුපුරුදු"</item>
     <item msgid="4234707448428002595">"සෑන්ස්-සේරිෆ්"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"ගෝලීය"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA පමණි"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"ගෝලීය"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index e796a26..e63ad61 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"අගුළු තිරයෙහි පැතිකඩේ තොරතුරු පෙන්වන්න"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"ගිණුම්"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"ස්ථානය"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"ස්ථානය භාවිත කරන්න"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"ස්ථානය භාවිත කරන්න"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"ක්‍රියාවිරහිතයි"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">ක්‍රියාත්මකයි - යෙදුම් <xliff:g id="COUNT_1">%1$d</xliff:g>කට ස්ථානයට ප්‍රවේශය ඇත</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"සත්‍යාපන කිරීමට ඔබේ මුහුණ භාවිත කරන්න"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"අරඹන්න"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"ප්‍රවේශ්‍යතා මුහුණු අගුලු හැරීම ක්‍රියාවිරහිත කර ඇත්නම්, සමහර පිහිටුවීම් පියවර TalkBack සමඟ නිසියාකාරව ක්‍රියා නොකරනු ඇත."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"ආපසු යන්න"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"පිහිටුවීම දිගටම කර."</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"ප්‍රවේශ්‍යතා පිහිටුවීම භාවිතය"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="other">ඉලක්කම් <xliff:g id="NUMBER_1">%d</xliff:g>කට වඩා අඩු විය යුතුය</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"උපාංග පරිපාලක මෑත PIN එකක් භාවිතා කිරීමට අවසර නොදේ"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"ඔබගේ IT පරිපාලක විසින් සුලබ PIN අවහිර කරනු ලැබේ. වෙනත් PIN එකක් උත්සාහ කරන්න."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"මෙහි වලංගු නොවන අනුලකුණක් ඇතුළත් විය නොහැකිය"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"අඩු තරමින් එක් අකුරක් තිබිය යුතුය"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"අඩු තරමින් එක් ඉලක්කමක් තිබිය යුතුය"</string>
@@ -653,7 +655,6 @@
       <item quantity="other">අඩු තරමින් සංඛ්‍යාත්මක-නොවන අනුලකුණු <xliff:g id="COUNT">%d</xliff:g>ක් අඩංගු විය යුතුය</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"උපාංග පරිපාලක මෑත මුරපදයක් භාවිතා කිරීමට අවසර නොදේ."</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"ඔබගේ IT පරිපාලක විසින් සුලබ මුරපද අවහිර කරනු ලැබේ. වෙනත් මුරපදයක් උත්සාහ කරන්න."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"ආරෝහණ, අවරෝහණ හෝ ප්‍රනරාවර්ත අනුක්‍රමයේ අංක වෙත අවසර නැත"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"තහවුරු කරන්න"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"අවලංගු කරන්න"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Wi-Fi සක්‍රිය කරන්න"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Wi-Fi භාවිත කරන්න"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Wi-Fi භාවිත කරන්න"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wi-Fi සැකසුම්"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"රැහැන් රහිත ප්‍රවේශ තැන් සකසන්න සහ කළමනාකරණය කරන්න"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"“<xliff:g id="SSID">%1$s</xliff:g>” වෙත සම්බන්ධ කිරීමට පහත සඳහන් QR කේතය කේන්‍ද්‍රගත කරන්න"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"QR කේතයක් ස්කෑන් කිරීමෙන් Wi‑Fi වෙත එකතු වන්න"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Wi‑Fi බෙදා ගන්න"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"“<xliff:g id="SSID">%1$s</xliff:g>” වෙත සම්බන්ධ කිරීමටත් මුරපදය බෙදා ගැනීමටත් මෙම QR කේතය ස්කෑන් කරන්න"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"මෙම QR කේතය “<xliff:g id="SSID">%1$s</xliff:g>” සමග එක් වීමට වෙනත් උපාංගයක් සමඟ ස්කෑන් කරන්න"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"“<xliff:g id="SSID">%1$s</xliff:g>” වෙත සම්බන්ධ කිරීමට මෙම QR කේතය ස්කෑන් කරන්න"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"නැවත උත්සාහ කරන්න. ගැටලුව පවතින්නේ නම්, උපාංග නිෂ්පාදකය සම්බන්ධ කර ගන්න"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"යමක් වැරදිණි"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi-Fi මුරපදය: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"හොට්ස්පොට් මුරපදය: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"ස්වයං‑සම්බන්ධ වීම"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"දුරකථනයට මෙම ජාලය අසල ස්වයංක්‍රියව සම්බන්ධ වීමට ඉඩ දෙන්න"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"ටැබ්ලට් පරිගණකයට මෙම ජාලය අසල ස්වයංක්‍රියව සම්බන්ධ වීමට ඉඩ දෙන්න"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"පරාසය තුළ සිටින විට මෙම ජාලයට සම්බන්ධතාව ඉඩ දෙන්න"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"උපාංගය එක් කරන්න"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"මෙම ජාලයට උපාංගයක් එක් කිරීමට QR කේතයක් භාවිතා කරන්න"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR කේතය වලංගු ආකෘතියක් නොවේ"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"පද්ධති සහතික භාවිත කරන්න"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"නොසපයන්න"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"වලංගු නොකරන්න"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"සහතිකයක් දක්වා නැත. ඔබේ සබැඳුම පුද්ගලික නොවනු ඇත."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"ජාල නම දිග වැඩියි."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"වසමක් නියම කළ යුතුය."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"සහතිකය අවශ්‍යයි."</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"සම්බන්ධ කරන්න"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wifi සක්‍රීයයි"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> වෙත සබැඳිණි"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> වෙත සබැඳෙමින්"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"සබැඳෙමින්…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"ජාලය වෙත සම්බන්ධ වීම අසාර්ථක විය"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"ජාලය පරාසය තුළ නැත"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"යෙදුම අන්තර්ගතය බෙදා ගනිමින් සිටී. අන්තර්ජාල සබැඳුමක් බෙදා ගැනීමට, හොට්ස්පොට් ක්‍රියාවිරහිත කර, අනතුරුව ක්‍රියාත්මක කරන්න"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"මුරපදයක් සකසා නැත"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"හොට්ස්පොට් නම"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ක්‍රියාත්මක කරමින්..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ක්‍රියාත්මක කරමින්…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"වෙනත් උපාංගවලට <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> වෙත සම්බන්ධ විය හැකිය"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"හොට්ස්පොට් මුරපදය"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP කලාපය"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"සුමට සංදර්ශකය"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"සමහර අන්තර්ගත සඳහා නැවුම් කිරීමේ අනුපාතය හර්ට්ස් 60 සිට 90 දක්වා ස්වයංක්‍රියව ඉහළ නංවයි. බැටරි භාවිතය වැඩි කරයි."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"සුමට සංදර්ශකය"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"90 Hz යළි නැවුම් කිරීමේ අනුපාතය බල කරන්න"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"වැඩි දියුණු කළ ස්පර්ශ ප්‍රතිචාර සඳහා ඉහළම යළි නැවුම් කිරීමේ අනුපාතය සහ සජීවිකරණ ගුණාත්මකභාවය. බැටරි භාවිතය වැඩි කරයි."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"තිර අවධානය"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"සක්‍රීයයි / ඔබ එය දිහා බලා සිටින්නේ නම් තිරය අක්‍රිය නොවේ"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android අනුවාදය"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android ආරක්ෂක යාවත්කාලීනය"</string>
     <string name="model_info" msgid="8997566254717810904">"මාදිලිය"</string>
-    <string name="model_summary" msgid="2246651782442466213">"මාදිලිය: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"මාදිලිය සහ දෘඨාංග"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"දෘඨාංග අනුවාදය"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"උපකරණ ID"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"ජාල සැකසීම් යළි පිහිටුවන ලදි"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"SIM මැකිය නොහැක"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"දෝෂයක් හේතුවෙන් බාගත් SIM මැකිය නොහැක.\n\nඔබේ උපාංගය යළි අරඹා නැවත උත්සාහ කරන්න."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"සියලු දත්ත මකන්න (කර්මාන්තශාලා යළි සැකසීම)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"සියලු දත්ත මකන්න (කර්මාන්තශාලා යළි සැකසීම)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">\n\n<li>"ඔබේ Google ගිණුම"</li>\n<li>"පද්ධති සහ යෙදුම් දත්ත සහ සැකසීම්"</li>\n<li>"බාගත් යෙදුම්"</li>" ඇතුළුව මෙය ඔබේ ටැබ්ලටයේ "<b>"අභ්‍යන්තර ආචයනයෙන්"</b>" සියලුම දත්ත මකා දමයි"</string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">\n\n<li>"ඔබේ Google ගිණුම"</li>\n<li>"පද්ධති සහ යෙදුම් දත්ත සහ සැකසීම්"</li>\n<li>"බාගත් යෙදුම්"</li>" ඇතුළුව මෙය ඔබේ දුරකථනයේ "<b>"අභ්‍යන්තර ආචයනයෙන්"</b>" සියලුම දත්ත මකා දමයි"</string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"ඔබ දැනට පහත ගිණුම් වෙත පුරනය වී සිටියි:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"මෙම උපාංගයේ වෙනත් පරිශීලකයින් සිටි.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"සංගීතය"</li>\n<li>"ඡායාරූප"</li>\n<li>"වෙනත් පරිශීලක දත්ත"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIMs"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"මෙය ඔබගේ ජංගම සේවා සැලසුම අවලංගු නොකරනු ඇත."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"සංගීත, පින්තූර, සහ වෙනත් පරිශීලක දත්ත මැකීමට, "<b>"USB ආචයනය"</b>" මැකීමට අවශ්‍යය."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"සංගීතය, පින්තූර, සහ වෙනත් පරිශීලක දත්ත ඉවත් කිරීමට, "<b>"SD කාඩ් පත"</b>" මැකිය යුතුවේ."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"සියලු දත්ත මකන්න (කර්මාන්තශාලා යළි සැකසීම)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"සියලු දත්ත මකන්න (කර්මාන්තශාලා යළි සැකසීම)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"මෙය ඔබගේ ටැබ්ලටයේ "<b>"අභ්‍යන්තර ගබඩාව"</b>" වෙතින්, පහත දේවල් ඇතුළුව සියලු දත්ත මකනු ඇත:\n\n"<li>"ඔබගේ Google ගිණුම"</li>\n<li>"පද්ධති සහ යෙදුම් දත්ත සහ සැකසීම්"</li>\n<li>"බාගත් යෙදුම්"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"මෙය ඔබගේ දුරකථනයේ "<b>"අභ්‍යන්තර ගබඩාව"</b>" වෙතින්, පහත දේවල් ඇතුළුව සියලු දත්ත මකනු ඇත:\n\n"<li>"ඔබගේ Google ගිණුම"</li>\n<li>"පද්ධති සහ යෙදුම් දත්ත සහ සැකසීම්"</li>\n<li>"බාගත් යෙදුම්"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"ඔබ දැනට පහත ගිණුම් වෙත පුරා සිටියි:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"මෙම උපාංගයේ වෙනත් පරිශීලකයින් සිටි.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"සංගීතය"</li>\n<li>"ඡායාරූප"</li>\n<li>"වෙනත් පරිශීලක දත්ත"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"මෙය ඔබගේ ජංගම සේවා සැලසුම අවලංගු නොකරනු ඇත."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"සංගීතය, පින්තූර, සහ වෙනත් පරිශීලක දත්ත මැකීමට, "<b>"USB ගබඩාව"</b>" මැකීමට අවශ්‍යය."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"සංගීතය, පින්තූර, සහ වෙනත් පරිශීලක දත්ත ඉවත් කිරීමට, "<b>"SD කාඩ් පත"</b>" මැකීමට අවශ්‍යය."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USB ආචයනය මකන්න"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SD කාඩ් පත මකන්න"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"සංගීත හෝ ජායාරුප ආදී අභ්‍යන්තර USB ආචයනයේ සියලු දත්ත මකන්න"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"සංගීත හෝ ඡායාරූප ආදී SD කාඩ් පතේ සියලු දත්ත මකන්න"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"සියලු දත්ත මකන්න"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"සියලු දත්ත මකන්න"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"ඔබේ පුද්ගලික තොරතුරු සහ බාගත් යෙදුම් සියල්ල මකනු ලැබේ. ඔබට මෙම ක්‍රියාව අස් කළ නොහැක."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"බාගත් යෙදුම් සහ SIM ඇතුළුව ඔබේ පුද්ගලික තොරතුරු මකනු ලැබේ. ඔබට මෙම ක්‍රියාව අස් කළ නොහැක."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"සියලු දේම මකන්න"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"පද්ධති ඉවත් කෙරුම් සේවාව නොමැති නිසා නැවත සැකසුමක් සිදු නොකෙරුණි"</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"සියලු දත්ත මකන්නද?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"මෙම පරිශීලකයා වෙතට කර්මාන්තශාලා යළි පිහිටුවීම නොමැත"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"මකමින්"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"කරුණාකර රැඳී සිටින්න..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"සියලු දත්ත මකන්න"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"සියලු දත්ත මකන්න"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"ඔබේ පුද්ගලික තොරතුරු සහ බාගත් යෙදුම් සියල්ල මකනු ලැබේ. ඔබට මෙම ක්‍රියාව පසුගමනය කළ නොහැකිය."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"බාගත් යෙදුම් &amp; SIM ඇතුළුව ඔබේ සියලු පුද්ගලික තොරතුරු මකනු ලැබේ. ඔබට මෙම ක්‍රියාව පසුගමනය කළ නොහැකිය."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"සියලු දත්ත මකන්නද?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"මෙම පරිශීලකයා සඳහා කර්මාන්තශාලා යළි සැකසීම ලබා ගත නොහැකිය"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"මකමින්"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"කරුණාකර රැඳී සිටින්න…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"ඇමතුම් සැකසීම්"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"කටහඬ තැපැල්, ඇමතුම් ඉදිරියට ගෙන යෑම, ඇමතුම් රැඳීම්, ඇමතුම්කරුගේ ID සකසන්න"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB ටෙදරින්"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"උපාංග <xliff:g id="MAXCONNECTION">%1$d</xliff:g> කට වඩා ටෙදර් කළ නොහැක."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ටෙදර් නොකරනු ඇත."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"ඊතර්නෙට් ටෙදරින්"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"USB ඊතර්නෙට් හරහා දුරකථනයේ අන්තර්ජාල සබැඳුම බෙදා ගන්න"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"ඊතර්නෙට් හරහා දුරකථනයේ අන්තර්ජාල සබැඳුම බෙදා ගන්න"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"ඔබගේ ජංගම දත්ත සබැඳුම හරහා වෙනත් උපාංග සඳහා අන්තර්ජාලය සැපයීමට හොට්ස්පොට් හා ටෙදරින් භාවිත කරන්න. යෙදුම් අවට උපාංග සමග අන්තර්ගතය බෙදා ගැනීමට හොට්ස්පොට් එකක්ද සෑදිය හැකිය."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"ඔබේ Wi-Fi හෝ ජංගම දත්ත සම්බන්ධතාව හරහා අනෙක් උපාංගවලට අන්තර්ජාලය ලබා දීමට හොට්ස්පොට් සහ ටෙදරින් භාවිත කරන්න. අවට උපාංග සමඟ අන්තර්ගත බෙදා ගැනීමට හොට්ස්පොට් එකක් තැනීමට ද යෙදුම්වලට හැකිය."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"උදවු"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"සිරස්තල මනාප"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"විශාලනය"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"විශාලනය කිරීමේ ප්‍රදේශය"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"විශාලනය සබල"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"තිරය විශාලනය කරන විට ඔබට භාවිත කිරීමට අවශ්‍ය විශාලනය කිරීමේ ප්‍රදේශය(ප්‍රදේශ) තෝරා ගන්න"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"පූර්ණ තිරය"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"තිරයේ කොටස"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"පූර්ණ තිරය &amp; තිරයේ කොටස"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"සම්පූර්ණ තිරය විශාලනය කරන්න"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"තිරයේ කොටස විශාලනය කරන්න"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"ප්‍රවේශ්‍යතා බොත්තමට මාරු වන්නද?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"තිරයේ කොටසක් විශාලනය කිරීම සඳහා තුන්වරක් තට්ටු කිරීම භාවිතා කිරීම ටයිප් කිරීම සහ වෙනත් ක්‍රියා ප්‍රමාද වීමට හේතු වේ.\n\nවිශාලනය කිරීම සඳහා ප්‍රවේශ්‍යතා බොත්තම භාවිතා කිරීමට මාරු වීමට ඔබට අවශ්‍යද?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"ප්‍රවේශ්‍යතා බොත්තමට මාරු වන්න"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"විශාලනය කිරීමට තුන්වරක් තට්ටු කිරීම තබා ගන්න"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"විශාලන සැකසීම්"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"තට්ටු-තුනක් සමඟ විශාලනය කරන්න"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"කෙටිමඟ සමඟ විශාලන කරන්න"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"බල බොත්තම ඇමතුම අවසන් කරයි"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"විශාල මූසික දර්ශකය"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"සජීවීකරණ ඉවත් කරන්න"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"ඒකල ශ්‍රව්‍යය"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"ශ්‍රව්‍ය ධාවනය කරන විට නාලිකා ඒකාබද්ධ කරන්න"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"ශ්‍රව්‍ය තුලනය"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"වම"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"දකුණ"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"ඒකල ශ්‍රව්‍යය"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"ශ්‍රව්‍ය ධාවනය කරන විට නාලිකා ඒකාබද්ධ කරන්න"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"ශ්‍රව්‍ය තුලනය"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"වම"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"දකුණ"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"පෙරනිමි"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"තත්පර 10"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"තත්පර 30"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"දැනුම්දීම් කම්පනය"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"නාද කම්පනය"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"ප්‍රතිපෝෂණය ස්පර්ශ කරන්න"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> භාවිත කරන්න"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> විවෘත කරන්න"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"වර්ණ නිවැරදි කිරීම භාවිත කරන්න"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"සිරස්තල පෙන්වන්න"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"සහාය දක්වන යෙදුම සඳහා පමණයි"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> භාවිත කරන්න"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> විවෘත කරන්න"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"වර්ණ නිවැරදි කිරීම භාවිත කරන්න"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"සිරස්තල පෙන්වන්න"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"සහාය දක්වන යෙදුම සඳහා පමණයි"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"සිරස්තල තරම සහ විලාසය"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> පෙළ තරම"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"තව විකල්ප"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"වර්ණ අන්ධතාව"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"වර්ණ දුර්වලතාව"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"වර්ණ අන්ධතාව"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Grayscale"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"රතු-කොළ"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"රතු-කොළ"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"නිල්-කහ"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"පසුබිම සීමා කිරීම"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"පසුබිමේ ධාවනය කිරීමට යෙදුමට අවසර දෙන්න"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"යෙදුම වෙත පසුබිමේ ධාවනය කිරීමට අවසර නැත"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"පසුබිම් භාවිතය සීමා කළ නොහැකිය"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"පසුබිම් භාවිතය සීමා කළ නොහැකිය"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"පසුබිම් ක්‍රියාකාරිත්වය සීමා කරන්නද?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"ඔබ යෙදුමක පසුබිම් ක්‍රියාකාරිත්වය සීමා කළහොත්, එය වැරදි ලෙස ක්‍රියා කරනු ඇත"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"මෙම යෙදුම බැටරිය ප්‍රශස්ත කිරීමට සකසා නැති නිසා, ඔබට එය සීමා කළ නොහැකිය. \n\nයෙදුම සීමා කිරීම සඳහා, පළමුව බැටරි ප්‍රශස්තකරණය ක්‍රියාත්මක කරන්න."</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"කාලසටහනක් සකසන්න"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"බැටරි ආයු කාලය දීර්ඝ කරන්න"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"ආරෝපණය වූ විට ක්‍රියාවිරහිත කරන්න"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"ඔබේ දුරකථනය <xliff:g id="PERCENT">%1$s</xliff:g> හි තිබෙන විට බැටරි සුරැකුම අක්‍රිය වෙයි"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"ඔබේ ටැබ්ලටය <xliff:g id="PERCENT">%1$s</xliff:g> හි තිබෙන විට බැටරි සුරැකුම අක්‍රිය වෙයි"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"ඔබේ උපාංගය <xliff:g id="PERCENT">%1$s</xliff:g> හි තිබෙන විට බැටරි සුරැකුම අක්‍රිය වෙයි"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"ඔබේ දුරකථනය <xliff:g id="PERCENT">%1$s</xliff:g>ට වඩා වැඩියෙන් ආරෝපණය වූ විට බැටරි සුරැකුම ක්‍රියාවිරහිත වෙයි"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"ඔබේ ටැබ්ලටය <xliff:g id="PERCENT">%1$s</xliff:g>ට වඩා වැඩියෙන් ආරෝපණය වූ විට බැටරි සුරැකුම ක්‍රියාවිරහිත වෙයි"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"ඔබේ උපාංගය <xliff:g id="PERCENT">%1$s</xliff:g>ට වඩා වැඩියෙන් ආරෝපණය වූ විට බැටරි සුරැකුම ක්‍රියාවිරහිත වෙයි"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"ක්‍රියාත්මක කරන්න"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"යළි පිහිටුවන්න"</string>
     <string name="tts_play" msgid="2945513377250757221">"ධාවනය කරන්න"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"අනුවර්තී සබැඳුම් හැකියාව"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"ඔබගේ ජාල සම්බන්ධතා ස්වයංක්‍රීයව කළමනාකරණය කිරීමෙන් බැටරි ආයු කාලය දිගු කරන අතර උපාංගයේ ක්‍රියාකාරිත්වය වැඩි දියුණු කරයි"</string>
     <string name="credentials_title" msgid="7535942196886123656">"අක්තපත්‍ර ආචයනය"</string>
     <string name="credentials_install" msgid="3933218407598415827">"සහතිකයක් ස්ථාපනය කරන්න"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"සහතික ආචයනයෙන් ස්ථාපනය කරන්න"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"පරිශීලක අක්තපත්‍ර"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"ගබඩා කළ අක්තපත්‍ර බලන්න සහ විකරණය කරන්න"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"උසස්"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"ආචයන වර්ගය"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"දෘඩාංග රක්ෂිත"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"මෘදුකාංග පමණි"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"මෙම පරිශීලකයාට අක්තපත්‍ර නොතිබේ"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN සහ යෙදුම් සඳහා ස්ථාපිත"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi සඳහා ස්ථාපිත"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"පර්යන්තයේදී ගෙවීම"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"ගෙවීම් යෙදුමක් පිහිටුවන්න. අනතුරුව ඔබේ දුරකථනයේ පසුපස contactless සංකේතය සහිත ඕනෑම ටර්මිනලයකට අල්ලන්න."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"තේරුණා"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"තව..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"තව…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"පෙරනිමි ගෙවීම් යෙදුම සකසන්න"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"පෙරනිමි ගෙවීම් යෙදුම යාවත්කාලීන කරන්න"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"සම්බන්ධතාවක් නැති පර්යන්තයකදී, <xliff:g id="APP">%1$s</xliff:g> සමගින් ගෙවන්න"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"ඇමතුම් සඳහා මෙම එක සැමවිටම භාවිතා කරන්න"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"දත්ත සඳහා SIM එක තෝරන්න"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"කෙටිපණිවුඩ සඳහා SIM තෝරන්න"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"දත්ත SIM මාරු කරමින්, මෙය මිනිත්තුවක් දක්වා ගත හැකිය..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"දත්ත SIM මාරු කරමින්, මෙය මිනිත්තුවක් දක්වා ගත හැකිය…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"සමඟ අමතන්න"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"SIM කාඩ් පත තෝරන්න"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"චර්යානුගත, කාල සටහන, බැටරි සුරැකුම, බල සුරැකුම, බැටරිය, ස්වයංක්‍රීය, ප්‍රතිශතය"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, උසස් ඇමතුම්, 4g ඇමතුම්"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"භාෂාව එක් කරන්න, භාෂාවක් එක් කරන්න"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"පෙළ තරම"</string>
     <string name="default_sound" msgid="6604374495015245195">"සුපුරුදු හඬ"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"නාද සහ දැනුම්දීම හඬ පරිමාව <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"හඬ පරිමාව, කම්පනය, බාධා නොකරන්න"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"ශබ්ද බල ගන්වන්න"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"සජීවී සිරස්තලය"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"මාධ්‍ය ස්වයංක්‍රීයව සිරස්තල"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"කිසිවක් නැත"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one">කාලසටහන් <xliff:g id="ON_COUNT">%d</xliff:g>ක් සකසන ලදී</item>
-      <item quantity="other">කාලසටහන් <xliff:g id="ON_COUNT">%d</xliff:g>ක් සකසන ලදී</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{කිසිත් නැත}=1{කාලසටහන් 1ක් සකසන ලදී}one{කාලසටහන් #ක් සකසන ලදී}other{කාලසටහන් #ක් සකසන ලදී}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"බාධා නොකරන්න"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"වැදගත් පුද්ගලයන් සහ යෙදුම් විසින් පමණක් දැනුම් දෙනු ලැබේ"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"බාධා සීමා කරන්න"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"ප්‍රමුඛතා පමණි"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"ක්‍රියාත්මකයි / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"ක්‍රියාවිරහිතයි / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"ක්‍රියාවිරහිතයි"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"ක්‍රියාත්මකයි"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"සැම විටම අසන්න"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"ඔබ ක්‍රියාවිරහිත කරන තුරු"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one">පැය <xliff:g id="NUM_HOURS">%d</xliff:g></item>
-      <item quantity="other">පැය <xliff:g id="NUM_HOURS">%d</xliff:g></item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"විනාඩි <xliff:g id="NUM_MINUTES">%d</xliff:g>"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one">කාල සටහන් <xliff:g id="ON_COUNT">%d</xliff:g>ක් ස්වයංක්‍රියව ක්‍රියාත්මක කළ හැකිය</item>
-      <item quantity="other">කාල සටහන් <xliff:g id="ON_COUNT">%d</xliff:g>ක් ස්වයංක්‍රියව ක්‍රියාත්මක කළ හැකිය</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{පැය 1}one{පැය #}other{පැය #}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{මිනිත්තු 1}one{මිනිත්තු #}other{මිනිත්තු #}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{ක්‍රියාවිරහිතයි}=1{ක්‍රියාවිරහිතයි / කාල සටහන් 1ක් ස්වයංක්‍රියව ක්‍රියාත්මක කළ හැකිය}one{ක්‍රියාවිරහිතයි / කාල සටහන් #ක් ස්වයංක්‍රියව ක්‍රියාත්මක කළ හැකිය}other{ක්‍රියාවිරහිතයි / කාල සටහන් #ක් ස්වයංක්‍රියව ක්‍රියාත්මක කළ හැකිය}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"බාධා නොකරන්න වෙත බාධා කළ හැකි දේවල්"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"පුද්ගලයන්"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"යෙදුම්"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"ප්‍රමුඛත්වය අඩු දැනුම්දීම් ස්වයංක්‍රීයව සියුම් ලෙස සකසන්න"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"අනුවර්තී දැනුම් දීම් ශ්‍රේණිගත කිරීම"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"අදාළත්වය අනුව ස්වයංක්‍රියව දැනුම් දීම් ශ්‍රේණිගත කරන්න"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"අනුවර්තී දැනුම් දීම් ප්‍රතිපෝෂණය"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"දැනුම් දීම් වෙත කළ ගැළපීම් දක්වා පද්ධතිය වෙත ප්‍රතිපෝෂණ ලබා දීමට විකල්පය පෙන්වන්න"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"යෝජිත ක්‍රියා සහ පිළිතුරු"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"යෝජිත ක්‍රියා සහ පිළිතුරු ස්වයංක්‍රීයව පෙන්වන්න"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"මෑත සහ මඳක් නිද්‍රාවට පත් කළ දැනුම් දීම් පෙන්වන්න"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"ප්‍රවේශය බාධා නොකරන්න"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"\'බාධා නොකරන්න\' හට ඉඩ දෙන්න"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"ස්ථාපිත යෙදුම් කිසිවක් ප්‍රවේශය බාධා නොකරන්න ඉල්ලා නැත"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"යෙදුම් පූරණය වේ..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"යෙදුම් පූරණය කරමින්…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"ඔබගේ ඉල්ලීම මත, Android මෙම යෙදුමෙහි දැනුම්දීම් මෙම උපාංගය මත දිස් වීම අවහිර කරමින් ඇත"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"ඔබගේ ඉල්ලීම මත, Android මෙම දැනුම්දීම් ප්‍රවර්ගය මෙම උපාංගය මත දිස් වීම අවහිර කරමින් ඇත"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"ඔබගේ ඉල්ලීම මත, Android මෙම දැනුම්දීම් සමූහය මෙම උපාංගය මත දිස් වීම අවහිර කරමින් ඇත"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"සියලු සංවාද"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"ප්‍රමුඛතා සංවාද"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"කිසිවක් නැත"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one">සංවාද <xliff:g id="CONVERSATIONS">%d</xliff:g></item>
-      <item quantity="other">සංවාද <xliff:g id="CONVERSATIONS">%d</xliff:g></item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"කිසිවක් නැත"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{කිසිත් නැත}=1{සංවාද 1}one{සංවාද #}other{සංවාද #}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"බාධා කළ හැකි අය"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"ඇමතුම්"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"ඇමතුම්"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"අවසර ලත් ඇමතුම් මගින් හඬ ඇති කරන බව තහවුරු කර ගැනීමට, උපාංගය නාද වීමට සකසා ඇතිදැයි පරීක්ෂා කරන්න"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ සඳහා එන ඇමතුම් අවහිර වේ. ඔබට ඔබේ මිතුරන්, පවුලේ අය හෝ වෙනත් සම්බන්ධතාවලට ඔබ කරා ළඟා වීමට ඉඩ දීමට සැකසීම් සීරුමාරු කළ හැකිය."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"තරු ලකුණු යෙදූ සම්බන්ධතා"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one">තවත් <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="other">තවත් <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"කිසිවක් නැත"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{කිසිත් නැත}=1{{contact_1}}=2{{contact_1} සහ {contact_2}}=3{{contact_1}, {contact_2} සහ {contact_3}}one{{contact_1}, {contact_2} සහ තවත් # දෙනෙක්}other{{contact_1}, {contact_2} සහ තවත් # දෙනෙක්}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"පණිවිඩ"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"පණිවිඩ"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"පණිවිඩ"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ සඳහා එන පණිවිඩ අවහිර වේ. ඔබට ඔබේ මිතුරන්, පවුලේ අය හෝ වෙනත් සම්බන්ධතාවලට ඔබ කරා ළඟා වීමට ඉඩ දීමට සැකසීම් සීරුමාරු කළ හැකිය."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"සියලු පණිවිඩවලට ඔබ වෙත ළඟා විය හැකිය"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"සියලු ඇමතුම්වලට ඔබ වෙත ළඟා විය හැකිය"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"කිසිවක් නැත"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one">සම්බන්ධතා <xliff:g id="NUM_CONTACTS">%d</xliff:g></item>
-      <item quantity="other">සම්බන්ධතා <xliff:g id="NUM_CONTACTS">%d</xliff:g></item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{කිසිත් නැත}=1{සම්බන්ධතා 1}one{සම්බන්ධතා #}other{සම්බන්ධතා #}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"ඕනෑම කෙනෙක්"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"සම්බන්ධතා"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"තරු ලකුණු යෙදූ සම්බන්ධතා"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"සියලු දැනුම් දීම්"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"සමහර දැනුම් දීම්"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"ඔබ යෙදුම්වලට බාධා කිරීමට ඉඩ නොදුන් විට පවා තෝරා ගත් පුද්ගලයන්ට තවමත් ඔබ වෙත ළඟා විය හැකිය"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one"><xliff:g id="APP_NAMES">%s</xliff:g>වලට බාධා කළ හැකිය</item>
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g>වලට බාධා කළ හැකිය</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"තව <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{යෙදුම් කිසිවකට බාධා කළ නොහැකිය}=1{{app_1} හට බාධා කළ හැකිය}=2{{app_1} සහ {app_2} හට බාධා කළ හැකිය}=3{{app_1}, {app_2}, සහ {app_3} හට බාධා කළ හැකිය}one{{app_1}, {app_2}, සහ තවත් #ක් හට බාධා කළ හැකිය}other{{app_1}, {app_2}, සහ තවත් #ක් හට බාධා කළ හැකිය}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"යෙදුම්"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"සියලු දැනුම් දීම්"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"සමහර දැනුම් දීම්"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"බාධා කළ නොහැකි දැනුම් දීම්"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"සියලු දැනුම් දීම්වලට ඉඩ දෙන්න"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g>වලට බාධා කළ හැකිය</item>
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g>වලට බාධා කළ හැකිය</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"කිසිවකට බාධා කළ නොහැකිය"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"තව <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{කිසිවකට බාධා කළ නොහැකිය}=1{{sound_category_1} හට බාධා කළ හැකිය}=2{{sound_category_1} සහ {sound_category_2} හට බාධා කළ හැකිය}=3{{sound_category_1}, {sound_category_2}, සහ {sound_category_3} හට බාධා කළ හැකිය}one{{sound_category_1}, {sound_category_2}, සහ තවත් #ක් හට බාධා කළ හැකිය}other{{sound_category_1}, {sound_category_2}, සහ තවත් #ක් හට බාධා කළ හැකිය}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"කිසිවකට බාධා කළ නොහැකිය"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"කිසි කෙනෙකුට බාධා කළ නොහැකිය"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"සමහර පුද්ගලයන්ට බාධා කළ හැකිය"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"සියලු පුද්ගලයන්ට බාධා කළ හැකිය"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB පාලනය වන්නේ"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"සම්බන්ධ කළ උපාංගය"</string>
     <string name="usb_control_device" msgid="527916783743021577">"මෙම උපාංගය"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"මාරු කරමින්..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"මාරු කරමින්…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"මාරු කළ නොහැකි විය"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"මෙම උපාංගය ආරෝපණය කරමින්"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"සම්බන්ධිත උපාංගය ආරෝපණය කරමින්"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"විස්තර බලන්න"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"දත්ත සුරැකුම"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"සීමා නොකළ දත්ත"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"පසුබිම් දත්ත ක්‍රියාවිරහිතයි"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"පසුබිම් දත්ත ක්‍රියාවිරහිතයි"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"ක්‍රියාත්මකයි"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"ක්‍රියාවිරහිතයි"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"දත්ත සුරැකුම භාවිත කරන්න"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"උපාංගය අගුලු දමා ඇති නම්, දැනුම්දීම් තුළ පිළිතුරු හෝ වෙනත් පෙළ ටයිප් කිරීම වළක්වන්න"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"පෙරනිමි අක්ෂර වින්‍යාස පරීක්ෂක"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"අක්ෂර වින්‍යාස පරීක්ෂක තෝරන්න"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"අක්ෂර වින්‍යාස පරීක්ෂාව භාවිත කරන්න"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"අක්ෂර වින්‍යාස පරීක්ෂාව භාවිත කරන්න"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"තෝරා නොමැත"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(කිසිවක් නැත)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"ගබඩා ඉඩ නිදහස් කර ගැනීමට උදවු වීමට, ගබඩා කළමනාකරු ඔබේ උපාංගය වෙතින් උපස්ථ කළ ඡායාරූප සහ වීඩියෝ ඉවත් කරයි."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"ඡායාරූප සහ වීඩියෝ ඉවත් කරන්න"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"ගබඩා කළමනාකරු"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"ගබඩා කළමනාකරු භාවිත කරන්න"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"ගබඩා කළමනාකරු භාවිත කරන්න"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"ස්වයංක්‍රිය"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"අත්පොත"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"දැන් ඉඩ නිදහස් කර ගන්න"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"දුරකථනය පරීක්ෂා කිරීමට දෙවරක් තට්ටු කරන්න"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"ටැබ්ලට් පරිගණකය පරීක්ෂා කිරීමට දෙවරක් තට්ටු කරන්න"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"උපාංගය පරීක්ෂා කිරීමට දෙවරක් තට්ටු කරන්න"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"දැනුම්දීම්වලට ස්වයිප් කර."</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"ඔබගේ දැනුම්දීම් පෙන්වීමට තිරයේ පහළ දාරයෙහි සිට පහළට ස්වයිප් කරන්න"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"තනි අත් ප්‍රකාරය"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"තනි අත් ප්‍රකාරය භාවිත කරන්න"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"යෙදුම් මාරු කරන විට පිටවන්න"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"කාල නිමාව"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"තත්පර 4"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"තත්පර 8"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"තත්පර 12"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"ළඟා විය හැකි බව"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"වේලාව, දැනුම්දීම් සහ වෙනත් තොරතුරු පරීක්ෂා කිරීමට, ඔබේ තිරය දෙවරක් තට්ටු කරන්න."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"දුරකථනය පරීක්ෂාවට ඔසවන්න"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"ටැබ්ලට් පරිගණකය පරීක්ෂා කිරීමට ඔසවන්න"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"ටැබ්ලටය පරීක්‍ෂා කිරීමට තට්ටු කරන්න"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"උපාංගය පරීක්‍ෂා කිරීමට තට්ටු කරන්න"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"වේලාව, දැනුම්දීම් සහ වෙනත් තොරතුරු පරීක්‍ෂා කිරීමට, ඔබේ තිරයට දෙවරක් තට්ටු කරන්න."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"ව්‍යාකූල බොත්තම"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"බල බොත්තම 5 වතාවක් ඉක්මනින් එබීමෙන් හදිසි SOS ක්‍රියා ආරම්භ කරන්න."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"ඇඟවීමේ ශබ්දය"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"ක්‍රියා ආරම්භ කිරීමට පෙර ඇඟවීම"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"හදිසි සම්බන්ධතා"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"දැනුම්දීම් සඳහා ඇඟිලි සලකුණ ස්වයිප් කරන්න"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"ඇඟිලි සලකුණ ස්වයිප් කරන්න"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"ඔබේ දැනුම්දීම් පරීක්ෂා කිරීමට, ඔබේ දුරකථනයේ පිටුපස පැත්තේ ඇති ඇඟිලි සලකුණු සංවේදකය මත පහළට ස්වයිප් කරන්න."</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"සියලුම යෙදුම් සඳහා සබල කරන්න"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"ග්‍රැෆික් ධාවකය තෝරන්න"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"පෙරනිමි"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"ක්‍රීඩා ධාවකය"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"ක්‍රීඩා ධාවකය"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"සංවර්ධක ධාවකය"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"පද්ධති ග්‍රැෆික් ධාවකය"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"ජාල සොයා ගත නොහැකි විය. නැවත උත්සාහ කරන්න."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(තහනම්)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"SIM කාඩ්පතක් නැත"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"SIM නැත"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"කිසිවක් නැත"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"සබැඳි වීමට SIM අවශ්‍යයි"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"සබැඳි වීමට <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> SIM අවශ්‍යයි"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"ප්‍රිය ජාල ආකාරය: WCDMA කැමතියි"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"ප්‍රිය ජාල ආකාරය: GSM පමණි"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"ප්‍රිය ජාල ආකාරය: WCDMA පමණි"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"ජංගම දත්ත"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"ජංගම ජාලය භාවිතයෙන් දත්ත වෙත ප්‍රවේශ වන්න"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"දුරකථනය පරාසය තුළ තිබෙන විට ස්වයංක්‍රීයව වාහකය වෙත මාරු වෙයි"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"SIM කාඩ්පත් කිසිවක් ලබා ගත නොහැකිය"</string>
     <string name="calls_preference" msgid="2166481296066890129">"ඇමතුම් මනාපය"</string>
     <string name="sms_preference" msgid="7742964962568219351">"කෙටි පණිවුඩ මනාප"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"සැම විටම අසන්න"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"සැකසීම්වලට තිර උඩැතිරි ඉඩ දෙන්න"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"වෙනත් යෙදුම් ඉහළින් සංදර්ශනය කළ හැකි යෙදුම්වලට සැකසීම් තිර වසාලීමට ඉඩ දෙන්න"</string>
     <string name="media_controls_title" msgid="403271085636252597">"මාධ්‍ය"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"මාධ්‍ය සැසිය අවසන් කර ඇති විට වාදකය සඟවන්න"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"විදැහූ ඉක්මන් සැකසීම් පුවරුවෙන් සැසියක් නැවත පටන් ගැනීමට වාදකය ඔබට ඉඩ දෙයි."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"ඉක්මන් සැකසීම් තුළ මාධ්‍ය වාදකය"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"පහසුවෙන් පසුධාවනය ආරම්භ කිරීම සඳහා දිගු කාලයක් සඳහා මාධ්‍ය වාදකය පෙන්වන්න"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"වාදකය සඟවන්න"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"වාදකය පෙන්වන්න"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"ලබා ගත හැකි වාදක නැත"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"ඉඩ දුන් යෙදුම්"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"මාධ්‍ය"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"බ්ලූටූත් ක්‍රියාත්මක වනු ඇත"</string>
 </resources>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index 3c68c33..6349261 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Stredné"</item>
     <item msgid="6740026006576843477">"Dlhé"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Krátky"</item>
+    <item msgid="7397961711906421599">"Stredný"</item>
+    <item msgid="4079132024502041928">"Dlhý"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Predvolené"</item>
     <item msgid="4234707448428002595">"Bezpätkové"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Globálne"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Iba TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Globálne"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index c31e62d..378ac84 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -300,7 +300,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Zobraziť inform. o profile na uzamknutej obrazovke"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Účty"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Poloha"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Používať polohu"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Používať polohu"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Vypnuté"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="few">Zapnuté – <xliff:g id="COUNT_1">%1$d</xliff:g> aplikácie majú prístup k polohe</item>
@@ -335,6 +335,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Overenie totožnosti pomocou tváre"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Začať"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Ak je zjednodušené odomknutie tvárou vypnuté, niektoré kroky nastavenia nemusia v čítačke TalkBack fungovať správne."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Späť"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Pokračovať v nastavení"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Použiť nastavenie dostupnosti"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -635,7 +638,6 @@
       <item quantity="one">Musí mať menej ako <xliff:g id="NUMBER_0">%d</xliff:g> číslicu</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Správca zariadenia neumožňuje používať nedávny kód PIN"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Bežné kódy PIN zablokoval váš správca IT. Skúste iný PIN."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Musí obsahovať iba platné znaky"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Musí obsahovať aspoň jedno písmeno"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Musí obsahovať aspoň jednu číslicu"</string>
@@ -683,7 +685,6 @@
       <item quantity="one">Musí obsahovať aspoň jeden znak, ktorý nie je číslica</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Správca zariadenia neumožňuje používať nedávne heslo"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Bežné heslá zablokoval váš správca IT. Skúste iné heslo."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Vzostupná, zostupná alebo opakovaná sekvencia čísiel nie je povolená"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Potvrdiť"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Zrušiť"</string>
@@ -829,7 +830,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Zapnúť Wi‑Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Používať Wi‑Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Používať Wi‑Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Nastavenia Wi‑Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Umožňuje nastaviť a spravovať prístupové body bezdrôtovej siete"</string>
@@ -937,7 +938,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Ak sa chcete pripojiť k sieti <xliff:g id="SSID">%1$s</xliff:g>, vycentrujte QR kód nižšie"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Pripojte sa k sieti Wi‑Fi naskenovaním QR kódu"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Zdieľať Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Ak sa chcete pripojiť k sieti <xliff:g id="SSID">%1$s</xliff:g> a zdieľať heslo, naskenujte tento QR kód"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Ak sa chcete pripojiť k sieti <xliff:g id="SSID">%1$s</xliff:g>, naskenujte tento QR kód iným zariadením"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Ak sa chcete pripojiť k sieti <xliff:g id="SSID">%1$s</xliff:g>, naskenujte tento QR kód"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Skúste to znova. Ak problém pretrváva, kontaktujte výrobcu zariadenia."</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Vyskytol sa problém"</string>
@@ -963,8 +964,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Heslo siete Wi‑Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Heslo hotspotu: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Automaticky pripájať"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Povoľte automatické pripájanie telefónu v blízkosti tejto siete"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Povoľte automatické pripájanie tabletu v blízkosti tejto siete"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Povoľte pripojenie k tejto sieti, keď je v dosahu"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Pridať zariadenie"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Pridajte zariadenie do tejto siete pomocou QR kódu"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR kód nie je platný formát"</string>
@@ -976,7 +976,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Použiť certifikáty systému"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Neposkytovať"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Neoverovať"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Nebol určený žiadny certifikát. Vaše pripojenie nebude súkromné."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Názov siete je príliš dlhý."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Je potrebné zadať doménu."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Vyžaduje sa certifikát."</string>
@@ -1003,6 +1002,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Pripojiť"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Pripojenie Wi‑Fi je zapnuté"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Pripojené k sieti <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Pripája sa k sieti <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Pripája sa…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Nepodarilo sa pripojiť k sieti"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Sieť nie je v dosahu"</string>
@@ -1080,7 +1080,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Aplikácia zdieľa obsah. Ak chcete zdieľať internetové pripojenie, vypnite hotspot a potom ho zapnite."</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Nie je nastavené žiadne heslo"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Názov hotspotu"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Zapína sa hotspot <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Zapína sa hotspot <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Iné zariadenia sa môžu pripojiť k hotspotu <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Heslo hotspotu"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Pásmo prístup. bodu"</string>
@@ -1230,7 +1230,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Plynulý obraz"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Automaticky zvyšuje frekvenciu obnovenia zo 60 na 90 Hz pre určitý obsah. Zvýši sa spotreba batérie."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Plynulý obraz"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Vynútiť frekvenciu obnovenia 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Najvyššia frekvencia obnovenia zlepšujúca dotykovú odozvu a kvalitu animácií. Zvýši sa spotreba batérie."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Vnímavá obrazovka"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Zapnuté, obrazovka sa nevypne, keď sa na ňu budete pozerať"</string>
@@ -1371,7 +1371,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Verzia systému Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Aktualizácia zabezpečenia Androidu"</string>
     <string name="model_info" msgid="8997566254717810904">"Model"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Model: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Model a hardvér"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Hardvérová verzia"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ID zariadenia"</string>
@@ -1646,31 +1645,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Sieťové nastavenia boli obnovené"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"SIM karty sa nedajú vymazať"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Stiahnuté SIM karty sa nedajú vymazať z dôvodu chyby.\n\nReštartujte zariadenie a skúste to znova."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Vymazať dáta (obnova výr. nastavení)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Vymazať dáta (obn. výr. nast.)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Týmto vymažete všetky dáta z "<b>"interného úložiska"</b>" tabletu, ako napríklad:\n\n"<li>"Účet Google"</li>\n<li>"Dáta aj nastavenia systému a aplikácií"</li>\n<li>"Stiahnuté aplikácie"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Táto operácia vymaže všetky dáta v "<b>"internom úložisku"</b>" telefónu:\n\n"<li>"Účet Google"</li>\n<li>"Dáta aj nastavenia systému a aplikácií"</li>\n<li>"Stiahnuté aplikácie"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Aktuálne ste prihlásený/-á do nasledujúcich účtov:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Na tomto zariadení sú prítomní ďalší používatelia.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Hudba"</li>\n<li>"Fotografie"</li>\n<li>"Iné používateľské údaje"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM karty"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Nezruší sa tým vaša tarifa mobilných služieb."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Ak chcete vymazať hudbu, obrázky a ďalšie používateľské dáta, je treba vymazať "<b>"úložisko USB"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Ak chcete vymazať hudbu, obrázky a ďalšie používateľské dáta, je treba vymazať "<b>"SD kartu"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Vymazať dáta (obn. výr. nast.)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Vymazať dáta (obn. výr. nast.)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Týmto vymažete všetky dáta v "<b>"internom úložisku"</b>" tabletu:\n\n"<li>"účet Google;"</li>\n<li>"dáta aj nastavenia systému a aplikácií;"</li>\n<li>"stiahnuté aplikácie."</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Týmto vymažete všetky dáta v "<b>"internom úložisku"</b>" telefónu:\n\n"<li>"účet Google;"</li>\n<li>"dáta aj nastavenia systému a aplikácií;"</li>\n<li>"stiahnuté aplikácie."</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Momentálne ste prihlásený/-á do nasledujúcich účtov:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"V tomto zariadení sa nachádzajú ďalší používatelia.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Hudba"</li>\n<li>"Fotky"</li>\n<li>"Iné údaje používateľa"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM karty"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Nezruší sa tým vaša tarifa mobilných služieb."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Ak chcete vymazať hudbu, obrázky a ďalšie údaje používateľa, je treba vymazať "<b>"úložisko USB"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Ak chcete vymazať hudbu, obrázky a ďalšie údaje používateľa, je treba vymazať "<b>"SD kartu"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Vymazať ukladací priestor USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Vymazať SD kartu"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Vymazať všetky dáta v internom úložisku USB, napríklad hudbu a fotky"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Vymazať všetky dáta na SD karte, napríklad hudbu a fotky"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Vymazať všetky údaje"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Vymazať všetky údaje"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Všetky vaše osobné údaje a stiahnuté aplikácie budú odstránené. Túto akciu nie je možné vrátiť späť."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Všetky vaše osobné údaje vrátane stiahnutých aplikácií a SIM kariet budú odstránené. Túto akciu nie je možné vrátiť späť."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Vymazať všetko"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Pokus o obnovenie sa neuskutočnil, pretože služba System Clear nie je k dispozícii."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Vymazať všetky údaje?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Obnovenie výrobných nastavení nie je dostupné pre tohto používateľa"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Prebieha vymazávanie"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Čakajte..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Vymazať všetky dáta"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Vymazať všetky dáta"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Všetky vaše osobné údaje a stiahnuté aplikácie budú odstránené. Túto akciu nie je možné vrátiť späť."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Všetky vaše osobné údaje vrátane stiahnutých aplikácií a SIM kariet budú odstránené. Túto akciu nie je možné vrátiť späť."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Chcete vymazať všetky dáta?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Obnovenie výrobných nastavení nie je pre tohto používateľa k dispozícii"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Maže sa"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Čakajte…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Nastavenia hovorov"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Nastavenie hlasovej schránky, presmerovania hovorov, čakajúcich hovorov a identifikácie volajúceho"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Pripojenie cez USB"</string>
@@ -1718,7 +1715,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Maximálny počet zariadení na zdieľanie dátového pripojenia: <xliff:g id="MAXCONNECTION">%1$d</xliff:g>."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Ukončí sa zdieľané dát. pripojenie zariad. <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Pripojenie cez ethernet"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Zdieľať internetové pripojenie telefónu cez USB s ethernetom"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Zdieľať internetové pripojenie telefónu cez ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Hotspot a tethering umožňujú poskytovať internet iným zariadeniam prostredníctvom vášho mobilného dátového pripojenia. Aplikácie tiež môžu vytvárať hostpot na zdieľanie obsahu so zariadeniami v okolí."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Hotspot a tethering umožňujú poskytovať internet iným zariadeniam prostredníctvom vášho pripojenia Wi‑Fi alebo mobilného dátového pripojenia. Aplikácie tiež môžu vytvárať hostpot na zdieľanie obsahu so zariadeniami v okolí."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Pomocník"</string>
@@ -2165,13 +2162,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Nastavenia titulkov"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Zväčšenie"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Oblasť zväčšenia"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Aktivácia priblíženia"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Vyberte oblasti zväčšenia, ktoré chcete pri zväčšení obrazovky používať"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Celá obrazovka"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Časť obrazovky"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Celá obrazovka a časť obrazovky"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Zväčšiť celú obrazovku"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Zväčšiť časť obrazovky"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Chcete prepnúť na tlačidlo dostupnosti?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Zväčšovanie častí obrazovky trojitým klepnutím môže oneskoriť zadávanie textu a ďalšie akcie.\n\nChcete prepnúť na zväčšenie tlačidlom dostupnosti?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Prepnúť na tlačidlo dostupnosti"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Ponechať zväčšenie trojitým klepnutím"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Nastavenia priblíženia"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Priblíženie trojitým klepnutím"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Priblíženie skratkou"</string>
@@ -2225,11 +2225,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Ukončiť hovor vypínačom"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Veľký kurzor myši"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Odstrániť animácie"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Zvuk mono"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Pri prehrávaní zvuku zlúčiť kanály"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Vyváženie zvuku"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Vľavo"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Vpravo"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Zvuk mono"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Pri prehrávaní zvuku skombinovať kanály"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Vyváženie zvuku"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Ľavé"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Pravé"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Predvolené"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 sekúnd"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 sekúnd"</string>
@@ -2259,11 +2259,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Vibrovanie pri upozornení"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Vibrovanie pri zvonení"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Odozva pri klepnutí"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Používať službu <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Otvoriť <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Použiť úpravu farieb"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Zobrazenie titulkov"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Iba pre podporovanú aplikáciu"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Použiť aplikáciu <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Otvoriť <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Používať úpravu farieb"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Zobrazenie titulkov"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Iba pre podporovanú aplikáciu"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Veľkosť a štýl titulkov"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Veľkosť textu: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Ďalšie možnosti"</string>
@@ -2295,6 +2295,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomália"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomália"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomália"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Odfarbenie"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Červená a zelená"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Červená a zelená"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Modrá a žltá"</string>
@@ -2436,7 +2437,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Obmedzenie využívania na pozadí"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Povoliť aplikácii spúšťať sa na pozadí"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Aplikácia nemá povolené spustenie na pozadí"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Využívanie na pozadí sa nedá obmedziť"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Používanie na pozadí sa nedá obmedziť"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Obmedziť aktivitu na pozadí?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Ak obmedzíte aktivitu aplikácie na pozadí, nemusí fungovať správne"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Aplikácia nemá nastavenú optimalizáciu batérie, preto ju nemôžete obmedziť.\n\nAk ju chcete obmedziť, zapnite optimalizáciu."</string>
@@ -2667,9 +2668,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Nastavenie plánu"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Predĺženie výdrže batérie"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Vypnúť pri nabití"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Šetrič batérie sa vypne, keď bude telefón nabitý na <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Šetrič batérie sa vypne, keď bude tablet nabitý na <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Šetrič batérie sa vypne, keď bude zariadenie nabité na <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Šetrič batérie sa vypne, keď sa telefón nabije nad <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Šetrič batérie sa vypne, keď sa tablet nabije nad <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Šetrič batérie sa vypne, keď sa zariadenie nabije nad <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Zapnúť"</string>
@@ -2734,6 +2735,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Resetovať"</string>
     <string name="tts_play" msgid="2945513377250757221">"Prehrať"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Adaptácia pripojenia"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Predĺži výdrž batérie a zvýši výkonnosť zariadenia automatickým spravovaním pripojení k sieti"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Úložisko poverení"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Inštalovať certifikát"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Inštalovať certifikáty z úložiska"</string>
@@ -2745,9 +2748,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Poverenia používateľa"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Zobraziť a zmeniť uložené poverenia"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Rozšírené"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Typ úložiska"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardvérové"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Iba softvérové"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Poverenia nie sú pre tohto používateľa k dispozícii"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Nainštalované pre sieť VPN a aplikácie"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Nainštalované pre sieť Wi‑Fi"</string>
@@ -3146,7 +3146,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Platenie pri termináli"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Nastavte si platobnú aplikáciu. Potom iba priložte zadnú časť vášho telefónu k akémukoľvek terminálu so symbolom pre bezkontaktné platby."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Dobre"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Ďalšie…"</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Viac…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Nastavenie predvolenej platobnej aplikácie"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Aktualizácia predvolenej platobnej aplikácie"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Pri bezkontaktnom termináli zaplaťte pomocou aplikácie <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3230,7 +3230,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Vždy používať pre hovory"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Vyberte SIM kartu pre údaje"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Vybrať SIM kartu pre SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Prepínajú sa dátové SIM karty, môže to chvíľu trvať..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Prepínajú sa dátové SIM karty, môže to chvíľu trvať…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Volať pomocou služby"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Výber SIM karty"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM karta <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3375,6 +3375,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"postup, plán, šetrič batérie, šetrič energie, batéria, automaticky, percento"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"VoLTE, rozšírené hovory, volanie cez 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"pridať jazyk, pridať určitý jazyk"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"veľkosť textu"</string>
     <string name="default_sound" msgid="6604374495015245195">"Predvolený zvuk"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Hlasitosť zvonenia a upozornení je na <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Hlasitosť, vibrovanie, režim bez vyrušení"</string>
@@ -3414,13 +3415,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Zvuky pri spustení"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Živý prepis"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Automatické titulkovanie médií"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Žiadne"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="few">Boli nastavené <xliff:g id="ON_COUNT">%d</xliff:g> plány</item>
-      <item quantity="many"><xliff:g id="ON_COUNT">%d</xliff:g> schedules set</item>
-      <item quantity="other">Bolo nastavených <xliff:g id="ON_COUNT">%d</xliff:g> plánov</item>
-      <item quantity="one">Bol nastavený 1 plán</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Žiadne}=1{Bol nastavený 1 plán}few{Boli nastavené # plány}many{# schedules set}other{Bolo nastavených # plánov}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Režim bez vyrušení"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Prijímajte upozornenia iba od dôležitých ľudí a z dôležitých aplikácií"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Obmedzenie vyrušení"</string>
@@ -3488,24 +3483,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Iba prioritné"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Zapnuté / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Vypnuté / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Vypnuté"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Zapnuté"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Vždy sa opýtať"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Dokým funkciu nevypnete"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="few"><xliff:g id="NUM_HOURS">%d</xliff:g> hodiny</item>
-      <item quantity="many"><xliff:g id="NUM_HOURS">%d</xliff:g> hodiny</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> hodín</item>
-      <item quantity="one">1 hodina</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> min"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="few"><xliff:g id="ON_COUNT">%d</xliff:g> plány sa môžu automaticky zapnúť</item>
-      <item quantity="many"><xliff:g id="ON_COUNT">%d</xliff:g> schedules can turn on automatically</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> plánov sa môže automaticky zapnúť</item>
-      <item quantity="one">1 plán sa môže automaticky zapnúť</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 hodina}few{# hodiny}many{# hodiny}other{# hodín}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minúta}few{# minúty}many{# minúty}other{# minút}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Vypnuté}=1{Vypnuté / 1 plán sa môže automaticky zapnúť}few{Vypnuté / # plány sa môžu automaticky zapnúť}many{Off / # schedules can turn on automatically}other{Vypnuté / # plánov sa môže automaticky zapnúť}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Čo môže prerušiť režim bez vyrušení"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Ľudia"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Aplikácie"</string>
@@ -3551,6 +3534,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Automaticky nastaviť upozornenia s nižšou prioritou ako nenápadné"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Pozícia prispôsobivých upozornení"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Automaticky zoradiť upozornenia podľa relevancie"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Spätná väzba k prispôsobivým upozorneniam"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Uveďte úpravy upozornení a zobrazujte možnosť poskytnúť spätnú väzbu k systému"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Navrhované akcie a odpovede"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Automaticky zobrazovať navrhované akcie a odpovede"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Zobrazovanie nedávnych a stlmených upozornení"</string>
@@ -3757,7 +3742,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Prístup k režimu bez vyrušení"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Povoliť režim bez vyrušení"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Prístup k režimu bez vyrušení si nevyžiadali žiadne nainštalované aplikácie"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Načítavajú sa aplikácie..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Načítavajú sa aplikácie…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Upozornenia z tejto aplikácie sú v zariadení na vašu žiadosť blokované Androidom"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Táto kategória upozornení je v zariadení na vašu žiadosť blokovaná Androidom"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Táto skupina upozornení je v zariadení na vašu žiadosť blokovaná Androidom"</string>
@@ -3855,13 +3840,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Všetky konverzácie"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Prioritné konverzácie"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Žiadne"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="few"><xliff:g id="CONVERSATIONS">%d</xliff:g> konverzácie</item>
-      <item quantity="many"><xliff:g id="CONVERSATIONS">%d</xliff:g> conversations</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> konverzácií</item>
-      <item quantity="one">1 konverzácia</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Žiadne"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Žiadne}=1{1 konverzácia}few{# konverzácie}many{# conversations}other{# konverzácií}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Kto môže vyrušiť"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Hovory"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Hovory"</string>
@@ -3870,13 +3849,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Skontrolujte, či je v zariadení zapnuté zvonenie, aby povolené hovory vyzváňali"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"V rámci plánu <xliff:g id="SCHEDULE_NAME">%1$s</xliff:g> sú blokované prichádzajúce hovory. Môžete upraviť nastavenia a povoliť priateľom, rodine alebo ďalším kontaktom spojiť sa s vami."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Kontakty s hviezdičkou"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="few"><xliff:g id="NUM_PEOPLE">%d</xliff:g> ďalší</item>
-      <item quantity="many"><xliff:g id="NUM_PEOPLE">%d</xliff:g> others</item>
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> ďalších</item>
-      <item quantity="one">1 ďalší</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Žiadne"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Žiadne}=1{{contact_1}}=2{{contact_1} a {contact_2}}=3{{contact_1}, {contact_2} a {contact_3}}few{{contact_1}, {contact_2} a # ďalšie kontakty}many{{contact_1}, {contact_2}, and # others}other{{contact_1}, {contact_2} a # ďalších kontaktov}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Správy"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"správy"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Správy"</string>
@@ -3885,13 +3858,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Prichádzajúce správy sú v rámci plánu <xliff:g id="SCHEDULE_NAME">%1$s</xliff:g> blokované. Môžete upraviť nastavenia a povoliť priateľom, rodine alebo ďalším kontaktom spojiť sa s vami."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Dostanete všetky správy"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Dostanete všetky hovory"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Žiadne"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="few"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontakty</item>
-      <item quantity="many"><xliff:g id="NUM_CONTACTS">%d</xliff:g> contacts</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontaktov</item>
-      <item quantity="one">1 kontakt</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Žiadne}=1{1 kontakt}few{# kontakty}many{# contacts}other{# kontaktov}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Ktokoľvek"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Kontakty"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Kontakty s hviezdičkou"</string>
@@ -3929,26 +3896,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Všetky upozornenia"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Niektoré upozornenia"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Vybraní ľudia vás stále môžu kontaktovať, aj keď nepovoľujete aplikáciám vyrušovať"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="few"><xliff:g id="APP_NAMES">%s</xliff:g> môžu vyrušiť</item>
-      <item quantity="many"><xliff:g id="APP_NAMES">%s</xliff:g> môžu vyrušiť</item>
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> môžu vyrušiť</item>
-      <item quantity="one">Aplikácia <xliff:g id="APP_NAME_0">%s</xliff:g> môže vyrušiť</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"ďalšie (<xliff:g id="NUMBER">%d</xliff:g>)"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Žiadne aplikácie nemôžu vyrušiť}=1{{app_1} môže vyrušiť}=2{{app_1} a {app_2} môžu vyrušiť}=3{{app_1}, {app_2} a {app_3} môžu vyrušiť}few{{app_1}, {app_2} a # ďalšie aplikácie môžu vyrušiť}many{{app_1}, {app_2}, and # more can interrupt}other{{app_1}, {app_2} a # ďalších aplikácií môže vyrušiť}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Aplikácie"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Všetky upozornenia"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Niektoré upozornenia"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Upozornenia, ktoré môžu vyrušiť"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Povoliť všetky upozornenia"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="few"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> môžu vyrušiť</item>
-      <item quantity="many"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> môžu vyrušiť</item>
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> môžu vyrušiť</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> môže vyrušiť</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Žiadne položky nemôžu vyrušiť"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"ďalšie (<xliff:g id="NUMBER">%d</xliff:g>)"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Žiadne zvuky nemôžu vyrušiť}=1{{sound_category_1} môže vyrušiť}=2{{sound_category_1} a {sound_category_2} môžu vyrušiť}=3{{sound_category_1}, {sound_category_2} a {sound_category_3} môžu vyrušiť}few{{sound_category_1}, {sound_category_2} a # ďalšie zvuky môžu vyrušiť}many{{sound_category_1}, {sound_category_2}, and # more can interrupt}other{{sound_category_1}, {sound_category_2} a # ďalších zvukov môže vyrušiť}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Žiadne zvuky nemôžu vyrušiť"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Nikto nemôže vyrušiť"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Niektorí ľudia môžu vyrušiť"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Všetci ľudia môžu vyrušiť"</string>
@@ -4212,7 +4167,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB ovláda"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Pripojené zariadenie"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Toto zariadenie"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Prepína sa…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Prepína sa…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Nepodarilo sa prepnúť"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Nabíjanie zariadenia"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Nabíja sa pripojené zariadenie"</string>
@@ -4473,7 +4428,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Zobraziť podrobnosti"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Šetrič dát"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Neobmedzené dáta"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Dátové prenosy na pozadí sú vypnuté"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Dáta na pozadí sú vypnuté"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Zapnutý"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Vypnutý"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Používať šetrič dát"</string>
@@ -4496,7 +4451,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Pri uzamknutom zariadení zakázať v upozorneniach písať odpovede či iný text"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Predvolená kontrola pravopisu"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Výber kontroly pravopisu"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Používať kontrolu pravopisu"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Používať kontrolu pravopisu"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Nie je vybraté"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(žiadny)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4594,7 +4549,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Správca úložiska odstraňuje zálohované fotky a videá z vášho zariadenia, čím pomáha uvoľniť miesto v úložisku."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Odstrániť fotky a videá"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Správca úložiska"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Používať Správcu úložiska"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Používať správcu priestoru"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automaticky"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Ručne"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Uvoľniť miesto"</string>
@@ -4632,6 +4587,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Kontrola telefónu dvojitým klepnutím"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Tablet skontrolujete dvojitým klepnutím"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Zariadenie skontrolujete dvojitým klepnutím"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Upozornenia prejd. prstom"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Upozornenia zobrazíte potiahnutím pri dolnom okraji obrazovky smerom nadol"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Režim jednej ruky"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Použiť režim jednej ruky"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Ukončiť pri prepínaní aplikácií"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Časový limit"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 sekundy"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 sekúnd"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 sekúnd"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"dosiahnuteľnosť"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Ak chcete zistiť čas, skontrolovať upozornenia a získať ďalšie informácie, klepnite dvakrát na obrazovku."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Kontrola telefónu zdvihnutím"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Tablet skontrolujete tak, že ho zodvihnete"</string>
@@ -4644,6 +4609,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Klepnutím skontrolujete tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Klepnutím skontrolujete zariadenie"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Ak chcete zistiť čas, skontrolovať upozornenia a získať ďalšie informácie, klepnite na obrazovku."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Tlačidlo zvukového alarmu"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Akcie na privolanie pomoci v tiesni spustíte tak, že päťkrát rýchlo stlačíte vypínač."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Zvuk upozornenia"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Upozornenie pred spustením akcie"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Tiesňové kontakty"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Upozornenia odtlačkom prsta"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Potiahnutie prstom"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Upozornenia zobrazíte potiahnutím nadol po senzore odtlačkov prstov na zadnej strane telefónu."</string>
@@ -4812,7 +4782,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Povoliť pre všetky aplikácie"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Vybrať grafický ovládač"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Predvolené"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Ovládač hry"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Ovládač hry"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Ovládač vývojára"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Grafický ovládač systému"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4881,6 +4851,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Nepodarilo sa nájsť siete. Skúste to znova."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(zakázané)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Žiadna SIM karta"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Žiadna SIM karta"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Žiadne"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Na pripojenie sa vyžaduje SIM karta"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Na pripojenie sa vyžaduje SIM karta <xliff:g id="WIRELESS_CARRIER">%s</xliff:g>"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Preferovaný režim siete: preferované WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Preferovaný režim siete: iba GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Preferovaný režim siete: iba WCDMA"</string>
@@ -4934,6 +4909,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobilné dáta"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Prístup k dátam pomocou mobilnej siete"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Telefón sa automaticky prepne na tohto operátora, keď bude v dosahu"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Nie je k dispozícii žiadna SIM karta"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Predvolená služba pre hovory"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Predvolená služba pre SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Vždy sa opýtať"</string>
@@ -5122,10 +5098,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Povolenie prekrývajúcich prvkov v Nastaveniach"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Povoľte aplikácie, ktoré sa môžu zobraziť cez iné aplikácie, aby mohli prekryť obrazovky Nastavení"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Médiá"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Skryť prehrávač po ukončení relácie média"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Prehrávač umožňuje pokračovať v relácii na rozbalenom paneli rýchlych nastavení."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Prehrávač médií v rýchlych nastaveniach"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Zobrazovať prehrávač médií dlhšie, aby bolo možné ľahko obnoviť prehrávanie"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Skryť prehrávač"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Zobraziť prehrávač"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"K dispozícii nie sú žiadne prehrávače"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Povolené aplikácie"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"médiá"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Zapne sa Bluetooth"</string>
 </resources>
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index 635df4d..c3f018d 100644
--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Srednje"</item>
     <item msgid="6740026006576843477">"Dolgo"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Kratko"</item>
+    <item msgid="7397961711906421599">"Srednje"</item>
+    <item msgid="4079132024502041928">"Dolgo"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Privzeto"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Globalno"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Samo TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Globalno"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index a9576be..9b0c5f5 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -300,7 +300,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Pokaži podatke o profilu na zaklenjenem zaslonu"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Računi"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Lokacija"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Uporabi lokacijo"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Uporaba lokacije"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Izklopljeno"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">Vklopljeno – dostop do lokacije ima <xliff:g id="COUNT_1">%1$d</xliff:g> aplikacija</item>
@@ -335,6 +335,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Preverjanje pristnosti z obrazom"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Začni"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Če je odklepanje z obrazom za ljudi s posebnimi potrebami izklopljeno, nekateri koraki nastavitve morda ne bodo dobro delovali s funkcijo TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Nazaj"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Nadaljuj nastavitev"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Uporabi nastavitev dostopnosti"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -635,7 +638,6 @@
       <item quantity="other">Vsebovati mora manj kot <xliff:g id="NUMBER_1">%d</xliff:g> števk</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Skrbnik naprave ne dovoli uporabe nedavne kode PIN."</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Skrbnik za IT je blokiral pogoste kode PIN. Poskusite z drugo kodo PIN."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Ne sme vsebovati neveljavnih znakov."</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Vsebovati mora vsaj eno črko."</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Vsebovati mora vsaj eno števko."</string>
@@ -683,7 +685,6 @@
       <item quantity="other">Vsebovati mora vsaj <xliff:g id="COUNT">%d</xliff:g> neštevilskih znakov</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Skrbnik naprave ne dovoli uporabe nedavnega gesla."</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Skrbnik za IT je blokiral pogosta gesla. Poskusite z drugim geslom."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Naraščajoč, padajoč ali ponavljajoč se niz števk je prepovedan."</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Potrdi"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Prekliči"</string>
@@ -829,7 +830,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Vklopi Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Uporabi Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Uporabi Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Nastavitve za Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Nastavi in upravljaj brezžične dostopne točke"</string>
@@ -937,7 +938,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Kodo QR spodaj nastavite na sredino, da vzpostavite povezavo z omrežjem »<xliff:g id="SSID">%1$s</xliff:g>«."</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Če se želite pridružiti omrežju Wi‑Fi, preberite kodo QR"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Deljenje omrežja Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Če želite vzpostaviti povezavo z omrežjem »<xliff:g id="SSID">%1$s</xliff:g>« in deliti geslo z drugimi, preberite to kodo QR"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Če se želite pridružiti omrežju »<xliff:g id="SSID">%1$s</xliff:g>«, kodo QR preberite z drugo napravo"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Če želite vzpostaviti povezavo z omrežjem »<xliff:g id="SSID">%1$s</xliff:g>«, preberite to kodo QR"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Poskusite znova. Če se težava ponavlja, se obrnite na proizvajalca naprave."</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Prišlo je do težave"</string>
@@ -963,8 +964,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Geslo za Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Geslo za dostopno točko: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Samodejna povezava"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Dovoli telefonu, da se samodejno poveže v bližini tega omrežja"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Dovoli tabličnemu računalniku, da se samodejno poveže v bližini tega omrežja"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Dovolite povezavo s tem omrežjem, ko je v dosegu"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Dodajte napravo"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Če želite dodati napravo v to omrežje, uporabite kodo QR"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"Koda QR nima pravilne oblike zapisa"</string>
@@ -976,7 +976,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Uporabi sistemska potrdila"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Ne posreduj"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Ne preverjaj"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Ni navedenih potrdil. Povezava ne bo zasebna."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Ime omrežja je predolgo."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Določiti morate domeno."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Potrdilo je obvezno."</string>
@@ -1003,6 +1002,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Vzpostavi povezavo"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi je vklopljen"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Povezano z omrežjem <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Vzpostavljanje povezave z omrežjem <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Povezovanje …"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Vzpostavljanje povezave z omrežjem ni uspelo"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Omrežje ni v dosegu"</string>
@@ -1080,7 +1080,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Aplikacija daje vsebino v skupno rabo. Če želite omogočiti skupno rabo internetne povezave, dostopno točko izklopite in znova vklopite."</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Geslo ni nastavljeno"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Ime dostopne točke"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Vklapljanje dostopne točke <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Vklapljanje dostopne točke <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> …"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Druge naprave se lahko povežejo z dostopno točko <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Geslo za dostopno točko"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Pas dostopne točke"</string>
@@ -1230,7 +1230,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Tekoč prikaz"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Samodejno povečanje hitrosti osveževanja s 60 na 90 Hz za nekatere vsebine. Poveča porabo energije baterije."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Tekoč prikaz"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Vsili hitrost osveževanja 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Višja hitrost osveževanja za izboljšano odzivnost na dotik in kakovost animacij. Povečana poraba energije baterije."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Zaznavanje pogleda na zaslon"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Vklopljeno / zaslon se ne bo izklopil, če ga gledate"</string>
@@ -1371,7 +1371,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Različica sistema Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Varnostna posodobitev za Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Model"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Model: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Model in strojna oprema"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Različica strojne opreme"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ID opreme"</string>
@@ -1646,31 +1645,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Omrežne nastavitve so ponastavljene"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Kartic SIM ni mogoče izbrisati"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Prenesenih kartic SIM ni mogoče izbrisati zaradi napake.\n\nZnova zaženite napravo in poskusite znova."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Izbriši vse podatke (tovarniška ponastavitev)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Izbriši vse podatke"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"S tem boste iz "<b>"notranje shrambe"</b>" tabličnega računalnika izbrisali vse podatke:\n\n"<li>"Račun Google "</li>\n<li>"Podatki in nastavitve sistema in aplikacij"</li>\n<li>"Prenesene aplikacije"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"S tem boste iz "<b>"notranje shrambe"</b>" telefona izbrisali vse podatke:\n\n"<li>"Račun Google"</li>\n<li>"Podatki in nastavitve sistema in aplikacij"</li>\n<li>"Prenesene aplikacije"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Trenutno ste prijavljeni v te račune:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"V napravi so prisotni drugi uporabniki.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Glasba"</li>\n<li>"Fotografije"</li>\n<li>"Drugi uporabniški podatki"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"Digitalne kartice e-SIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"S tem ne boste prekinili naročniškega paketa za mobilno telefonijo."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Če želite izbrisati glasbo, slike in druge uporabniške podatke, morate izbrisati "<b>"pomnilnik USB"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Če želite izbrisati glasbo, slike in druge uporabniške podatke, morate izbrisati "<b>"kartico SD"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Izbriši vse podatke (tovarniška ponastavitev)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Izbriši vse podatke (tov. po.)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"S tem boste iz "<b>"notranje shrambe"</b>" tabličnega računalnika izbrisali vse podatke:\n\n"<li>"Račun Google "</li>\n<li>"Podatki in nastavitve sistema in aplikacij"</li>\n<li>"Prenesene aplikacije"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"S tem boste iz "<b>"notranje shrambe"</b>" telefona izbrisali vse podatke:\n\n"<li>"Račun Google"</li>\n<li>"Podatki in nastavitve sistema in aplikacij"</li>\n<li>"Prenesene aplikacije"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Trenutno ste prijavljeni v te račune:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"V napravi so prisotni drugi uporabniki.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Glasba"</li>\n<li>"Fotografije"</li>\n<li>"Drugi uporabniški podatki"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"Digitalne kartice e-SIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"S tem ne boste prekinili naročniškega paketa za mobilno telefonijo."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Če želite izbrisati glasbo, slike in druge uporabniške podatke, morate izbrisati "<b>"pomnilnik USB"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Če želite izbrisati glasbo, slike in druge uporabniške podatke, morate izbrisati "<b>"kartico SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Izbriši pomnilnik USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Izbriši kartico SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Izbriši vse podatke v notranjem pomnilniku USB, na primer glasbo ali fotografije."</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Izbriši vse podatke na kartici SD, na primer glasbo ali fotografije."</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Izbriši vse podatke"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Izbriši vse podatke"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Vsi osebni podatki in prenesene aplikacije bodo izbrisani. Tega dejanja ni mogoče razveljaviti."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Izbrisani bodo vsi osebni podatki, vključno s prenesenimi aplikacijami in karticami SIM. Tega dejanja ni mogoče razveljaviti."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Izbriši vse"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Ponastavitev ni opravljena, ker storitev System Clear ni na voljo."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Želite izbrisati vse podatke?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Ponastavitev na tovarniške nastavitve ni na voljo za tega uporabnika"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Brisanje"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Počakajte ..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Brisanje vseh podatkov"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Brisanje vseh podatkov"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Vsi osebni podatki in prenesene aplikacije bodo izbrisani. Tega dejanja ni mogoče razveljaviti."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Izbrisani bodo vsi osebni podatki, vključno s prenesenimi aplikacijami in karticami SIM. Tega dejanja ni mogoče razveljaviti."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Želite izbrisati vse podatke?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Ponastavitev na tovarniške nastavitve ni na voljo za tega uporabnika"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Brisanje"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Počakajte …"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Nastavitve klicanja"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Nastavite telefonski predal, preusmeritev klicev, čakajoči klic, ID klicatelja"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Internet prek USB-ja"</string>
@@ -1718,7 +1715,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Internetna povezava ni mogoča z več kot <xliff:g id="MAXCONNECTION">%1$d</xliff:g> naprav."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Internetna povezava z napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bo prekinjena."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Internet prek etherneta"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Deljenje internetne povezave telefona prek povezave USB Ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Deljenje internetne povezave telefona prek etherneta"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Uporabite dostopno točko in povezavo z internetom prek mobilnega telefona, da zagotovite internet drugim napravam prek svoje mobilne podatkovne povezave. Tudi aplikacije lahko ustvarijo dostopno točko za skupno rabo vsebin z napravami v bližini."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Uporabite dostopno točko in povezavo z internetom prek mobilnega telefona, da zagotovite internet drugim napravam prek Wi-Fi-ja ali mobilne podatkovne povezave. Tudi aplikacije lahko ustvarijo dostopno točko za deljenje vsebin z napravami v bližini."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Pomoč"</string>
@@ -2165,13 +2162,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Nastavitve podnapisov"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Povečava"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Območje povečave"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Omogočanje povečave"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Izberite eno ali več območij povečave, na katerih naj se izvede povečava zaslona"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Celotni zaslon"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Del zaslona"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Celotni zaslon in del zaslona"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Povečava celotnega zaslona"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Povečava dela zaslona"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Želite preklopiti na gumb za funkcije?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Uporaba trikratnega dotika za povečavo dela zaslona bo povzročala zakasnitve pri vnašanju in drugih dejanjih.\n\nAli želite za povečavo raje uporabljati gumb za funkcije za ljudi s posebnimi potrebami?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Preklopi na gumb za funkcije"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Ohrani povečavo s trikratnim dotikom"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Nastavitve povečave"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Povečevanje s trikratnim dotikom"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Povečanje z bližnjico"</string>
@@ -2225,11 +2225,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Gumb za vklop konča klic"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Velik kazalec miške"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Odstranjevanje animacij"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Mono zvok"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Združevanje kanalov pri predvajanju zvoka"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Ravnovesje zvoka"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Levo"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Desno"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Mono zvok"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Združevanje kanalov pri predvajanju zvoka"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Ravnovesje zvoka"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Levo"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Desno"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Privzeto"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 sekund"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 sekund"</string>
@@ -2259,11 +2259,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Vibriranje pri obvestilih"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Vibriranje pri zvonjenju"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Odziv na dotik"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Uporabi storitev <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Odpiranje aplikacije <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Uporabi popravljanje barv"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Pokaži podnapise"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Samo pri podprtih aplikacijah"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Uporabi storitev <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Odpiranje aplikacije <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Uporaba popravljanja barv"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Prikaz podnapisov"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Samo pri podprtih aplikacijah"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Velikost in slog podnapisov"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Velikost besedila: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Več možnosti"</string>
@@ -2295,6 +2295,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Devteranomalija"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomalija"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomalija"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Sivine"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Rdeča – zelena"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Rdeča – zelena"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Modra – rumena"</string>
@@ -2436,7 +2437,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Omejitev dejavnosti v ozadju"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Dovoli, da se aplikacija izvaja v ozadju"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Aplikaciji ni dovoljeno izvajanje v ozadju"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Dejavnosti v ozadju ni mogoče omejiti"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Dejavnosti v ozadju ni mogoče omejiti"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Želite omejiti dejavnost v ozadju?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Če boste omejili dejavnost aplikacije v ozadju, morda ne bo pravilno delovala"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Ker za to aplikacijo ni izbrana nastavitev optimiziranja porabe baterije, je ni mogoče omejiti.\n\nČe želite omejiti aplikacijo, najprej vklopite optimizacijo baterije."</string>
@@ -2667,9 +2668,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Nastavitev razporeda"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Podaljšanje časa delovanja baterije"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Izklop ob polni napolnjenosti"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Varčevanje z energijo baterije se izklopi, ko je telefon napolnjen na <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Varčevanje z energijo baterije se izklopi, ko je tablični računalnik napolnjen na <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Varčevanje z energijo baterije se izklopi, ko je naprava napolnjena na <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Varčevanje z energijo baterije se izklopi, ko je telefon napolnjen več kot <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Varčevanje z energijo baterije se izklopi, ko je tablični računalnik napolnjen več kot <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Varčevanje z energijo baterije se izklopi, ko je naprava napolnjena več kot <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Vklop"</string>
@@ -2734,6 +2735,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Ponastavi"</string>
     <string name="tts_play" msgid="2945513377250757221">"Predvajaj"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Prilagajanje povezav"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Podaljša čas delovanja baterije in izboljša učinkovitost delovanja naprave s samodejnim upravljanjem omrežnih povezav"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Shramba poverilnic"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Namestitev potrdila"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Namestitev potrdil iz shrambe"</string>
@@ -2745,9 +2748,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Uporabniške poverilnice"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Ogled in spreminjanje shranjenih poverilnic"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Dodatno"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Vrsta shrambe"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Strojna"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Samo programska"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Za tega uporabnika niso na voljo poverilnice"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Nameščeno za VPN in aplikacije"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Nameščeno za Wi-Fi"</string>
@@ -3146,7 +3146,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Plačevanje na terminalu"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Nastavite aplikacijo za plačevanje. Nato prislonite hrbtno stran telefona h kateremu koli terminalu s simbolom za brezstično plačevanje."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Razumem"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Več ..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Več …"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Nastavite privzeto aplikacijo za plačevanje"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Posodobite privzeto aplikacijo za plačevanje"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Na brezstičnem terminalu plačaj z aplikacijo <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3230,7 +3230,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Vedno uporabi to možnost za klice"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Izbira kartice SIM za prenos podatkov"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Izberite kartico SIM za sporočila SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Preklop podatkovne kartice SIM. Lahko traja kakšno minuto …"</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Preklop podatkovne kartice SIM. Lahko traja kakšno minuto …"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Klicanje z …"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Izberite kartico SIM"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3375,6 +3375,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"rutina, vsakodnevni opravek, razpored, urnik, varčevanje z energijo baterije, varčevanje z energijo, baterija, samodejno, odstotek, delež"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, napredno klicanje, klicanje 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"dodajanje jezika, dodajte jezik"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"velikost besedila"</string>
     <string name="default_sound" msgid="6604374495015245195">"Privzeti zvok"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Glasnost zvonjenja in obvestil na <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Glasnost, vibriranje, ne moti"</string>
@@ -3414,13 +3415,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Zvoki ob zagonu"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Samodejni podnapisi"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Samodejni podnapisi predstavnosti"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Brez"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one">Nastavljen je <xliff:g id="ON_COUNT">%d</xliff:g> razpored</item>
-      <item quantity="two">Nastavljena sta <xliff:g id="ON_COUNT">%d</xliff:g> razporeda</item>
-      <item quantity="few">Nastavljeni so <xliff:g id="ON_COUNT">%d</xliff:g> razporedi</item>
-      <item quantity="other">Nastavljenih je <xliff:g id="ON_COUNT">%d</xliff:g> razporedov</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Noben}=1{Nastavljen je 1 razpored}one{Nastavljen je # razpored}two{Nastavljena sta # razporeda}few{Nastavljeni so # razporedi}other{Nastavljenih je # razporedov}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Ne moti"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Prejemajte samo obvestila pomembnih oseb in aplikacij"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Omejitev prekinitev"</string>
@@ -3488,24 +3483,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Samo prednostno"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Vklopljeno/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Izklopljeno/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Izklopljeno"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Vklopljeno"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Vedno vprašaj"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Dokler ne izklopite"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> ura</item>
-      <item quantity="two"><xliff:g id="NUM_HOURS">%d</xliff:g> uri</item>
-      <item quantity="few"><xliff:g id="NUM_HOURS">%d</xliff:g> ure</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> ur</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> min"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> razpored se lahko samodejno vklopi</item>
-      <item quantity="two"><xliff:g id="ON_COUNT">%d</xliff:g> razporeda se lahko samodejno vklopita</item>
-      <item quantity="few"><xliff:g id="ON_COUNT">%d</xliff:g> razporedi se lahko samodejno vklopijo</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> razporedov se lahko samodejno vklopi</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 uro}one{# uro}two{# uri}few{# ure}other{# ur}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minuto}one{# minuto}two{# minuti}few{# minute}other{# minut}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Izklopljeno}=1{Izklopljeno / 1 razpored se lahko samodejno vklopi}one{Izklopljeno / # razpored se lahko samodejno vklopi}two{Izklopljeno / # razporeda se lahko samodejno vklopita}few{Izklopljeno / # razporedi se lahko samodejno vklopijo}other{Izklopljeno / # razporedov se lahko samodejno vklopi}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Kaj lahko preglasi način »ne moti«"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Osebe"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Aplikacije"</string>
@@ -3551,6 +3534,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Samodejna nastavitev manj pomembnih obvestil na »Brez zvočnega opozorila«"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Prilagodljivo razvrščanje obvestil"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Samodejna razvrstitev obvestil glede na ustreznost"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Povratne informacije o prilagodljivih obvestilih"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Pokaži spremembe nastavitev obvestil in možnost posredovanja povratnih informacij sistemu"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Predlagana dejanja in odgovori"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Samodejen prikaz predlaganih dejanj in odgovorov"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Prikaži nedavna in preložena obvestila"</string>
@@ -3757,7 +3742,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Dostop do načina »ne moti«"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Dovoli način »ne moti«"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Nobena nameščena aplikacija ni zahtevala dostopa do načina »ne moti«"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Nalaganje aplikacij ..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Nalaganje aplikacij …"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Na vašo zahtevo je prikazovanje obvestil te aplikacije blokirano v tej napravi Android"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Na vašo zahtevo je prikazovanje te kategorije obvestil blokirano v tej napravi Android"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Na vašo zahtevo je prikazovanje te skupine obvestil blokirano v tej napravi Android"</string>
@@ -3855,13 +3840,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Vsi pogovori"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Prednostni pogovori"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Noben"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> pogovor</item>
-      <item quantity="two"><xliff:g id="CONVERSATIONS">%d</xliff:g> pogovora</item>
-      <item quantity="few"><xliff:g id="CONVERSATIONS">%d</xliff:g> pogovori</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> pogovorov</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Noben"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Noben}=1{1 pogovor}one{# pogovor}two{# pogovora}few{# pogovori}other{# pogovorov}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Kdo lahko preglasi"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Klici"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Klici"</string>
@@ -3870,13 +3849,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Če se želite prepričati, da bo telefon zvonil, ko prejmete dovoljene klice, preverite, ali je naprava nastavljena na zvonjenje"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Dohodni klici za »<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>« so blokirani. Nastavitve lahko prilagodite tako, da boste dosegljivi za prijatelje, družinske člane ali druge stike."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Stiki z zvezdico"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one">še <xliff:g id="NUM_PEOPLE">%d</xliff:g> druga oseba</item>
-      <item quantity="two">še <xliff:g id="NUM_PEOPLE">%d</xliff:g> drugi osebi</item>
-      <item quantity="few">še <xliff:g id="NUM_PEOPLE">%d</xliff:g> druge osebe</item>
-      <item quantity="other">še <xliff:g id="NUM_PEOPLE">%d</xliff:g> drugih oseb</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Noben stik z zvezdico"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Noben}=1{{contact_1}}=2{{contact_1} in {contact_2}}=3{{contact_1}, {contact_2} in {contact_3}}one{{contact_1}, {contact_2} in še # drug}two{{contact_1}, {contact_2} in še # druga}few{{contact_1}, {contact_2} in še # drugi}other{{contact_1}, {contact_2} in še # drugih}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Sporočila"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"sporočila"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Sporočila"</string>
@@ -3885,13 +3858,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Dohodna sporočila za »<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>« so blokirana. Nastavitve lahko prilagodite tako, da boste dosegljivi za prijatelje, družinske člane ali druge stike."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Vsa sporočila vas lahko dosežejo"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Vsi klici vas lahko dosežejo"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Noben stik"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> stik</item>
-      <item quantity="two"><xliff:g id="NUM_CONTACTS">%d</xliff:g> stika</item>
-      <item quantity="few"><xliff:g id="NUM_CONTACTS">%d</xliff:g> stiki</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> stikov</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Noben}=1{1 stik}one{# stik}two{# stika}few{# stiki}other{# stikov}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Vsi"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Stiki"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Stiki z zvezdico"</string>
@@ -3929,26 +3896,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Vsa obvestila"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Nekatera obvestila"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Izbrane osebe vas lahko še vedno dosežejo, tudi če aplikacijam ne dovolite preglasitve."</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one">Preglasitev dovoljena za: <xliff:g id="APP_NAMES">%s</xliff:g></item>
-      <item quantity="two">Preglasitev dovoljena za: <xliff:g id="APP_NAMES">%s</xliff:g></item>
-      <item quantity="few">Preglasitev dovoljena za: <xliff:g id="APP_NAMES">%s</xliff:g></item>
-      <item quantity="other">Preglasitev dovoljena za: <xliff:g id="APP_NAMES">%s</xliff:g></item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"Še <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Nobena aplikacija ne sme preglasiti}=1{Aplikacija {app_1} lahko preglasi}=2{Aplikaciji {app_1} in {app_2} lahko preglasita}=3{Aplikacije {app_1}, {app_2}in {app_3} lahko preglasijo}one{Aplikaciji {app_1} in {app_2} ter še # druga lahko preglasijo}two{Aplikaciji {app_1} in {app_2} ter še # drugi lahko preglasijo}few{Aplikaciji {app_1} in {app_2} ter še # druge lahko preglasijo}other{Aplikaciji {app_1} in {app_2} ter še # drugih lahko preglasijo}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Aplikacije"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Vsa obvestila"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Nekatera obvestila"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Obvestila, ki lahko preglasijo"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Dovoli vsa obvestila"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one">Preglasitev dovoljena za: <xliff:g id="SOUND_CATEGORIES">%s</xliff:g></item>
-      <item quantity="two">Preglasitev dovoljena za: <xliff:g id="SOUND_CATEGORIES">%s</xliff:g></item>
-      <item quantity="few">Preglasitev dovoljena za: <xliff:g id="SOUND_CATEGORIES">%s</xliff:g></item>
-      <item quantity="other">Preglasitev dovoljena za: <xliff:g id="SOUND_CATEGORIES">%s</xliff:g></item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Nič ne sme preglasiti"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"Še <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Nič ne sme preglasiti}=1{Preglasitev dovoljena za: {sound_category_1}}=2{Preglasitev dovoljena za: {sound_category_1} in {sound_category_2}}=3{Preglasitev dovoljena za: {sound_category_1}, {sound_category_2} in {sound_category_3}}one{Preglasitev dovoljena za: {sound_category_1}, {sound_category_2} in še # drugo vrsto zvoka}two{Preglasitev dovoljena za: {sound_category_1}, {sound_category_2} in še # drugi vrsti zvoka}few{Preglasitev dovoljena za: {sound_category_1}, {sound_category_2} in še # druge vrste zvoka}other{Preglasitev dovoljena za: {sound_category_1}, {sound_category_2} in še # drugih vrst zvoka}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Nič ne sme preglasiti"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Nihče ne sme preglasiti"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Nekatere osebe lahko preglasijo"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Vsakdo lahko preglasi"</string>
@@ -4212,7 +4167,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"Povezavo USB upravlja"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Povezana naprava"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Ta naprava"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Preklapljanje …"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Preklapljanje …"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Preklop ni uspel"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Polnjenje te naprave"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Polnjenje akumulatorja v povezani napravi"</string>
@@ -4473,7 +4428,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Ogled podrobnosti"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Varčevanje s podatki"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Neomejen prenos podatkov"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Prenos podatkov v ozadju je izklopljen"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Prenos podatkov v ozadju je izklopljen"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Vklopljeno"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Izklopljeno"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Uporabi varčevanje s podatki"</string>
@@ -4496,7 +4451,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Če je naprava zaklenjena, prepreči vnašanje odgovorov ali drugega besedila v obvestilih"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Privzeti črkovalnik"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Izbira črkovalnika"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Uporabi črkovalnik"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Uporaba črkovalnika"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Ni izbrano"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(brez)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4594,7 +4549,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Upravitelj shrambe vam pomaga sprostiti prostor za shranjevanje, tako da iz naprave odstrani varnostno kopirane fotografije in videoposnetke."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Odstranjevanje fotografij in videoposnetkov"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Upravitelj shrambe"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Uporaba upravitelja shrambe"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Uporaba upravitelja shrambe"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Samodejno"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Ročno"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Sprostitev prostora"</string>
@@ -4632,6 +4587,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Dvojni dotik za preverjanje telefona"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Dvakratni dotik za preverjanje tabličnega računalnika"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Dvakratni dotik za preverjanje naprave"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Vlečenje za obvestila"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Za prikaz obvestil povlecite navzdol po spodnjem robu zaslona"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Enoročni način"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Uporaba enoročnega načina"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Izhod ob preklopu med aplikacijami"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Časovna omejitev"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 sekunde"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 sekund"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 sekund"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"dosegljivost"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Če želite preveriti uro, obvestila in druge informacije, se dvakrat dotaknite zaslona."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Preverjanje telefona s prijemom"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Primite tablični računalnik, da ga preverite"</string>
@@ -4644,6 +4609,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Dotik za preverjanje tabličnega računalnika"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Dotik za preverjanje naprave"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Če želite preveriti uro, obvestila in druge informacije, se dotaknite zaslona."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Gumb za paniko"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Zaženite SOS dejanja v sili tako, da petkrat hitro pritisnete gumb za vklop."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Opozorilni zvok"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Sproži zvočno opozorilo pred ukrepanjem"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Stiki za nujne primere"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Poteg s prstom po tipalu prstnih odtisov za prikaz obvestil"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Poteg po prstnem tipalu"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Če želite preveriti obvestila, povlecite navzdol po tipalu prstnih odtisov na hrbtni strani telefona."</string>
@@ -4812,7 +4782,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Omogočanje za vse aplikacije"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Izbira grafičnega gonilnika"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Privzeto"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Gonilnik za igre"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Gonilnik za igre"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Gonilnik za razvijalce"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Grafični gonilnik sistema"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4881,6 +4851,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Omrežij ni bilo mogoče najti. Poskusite znova."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(prepovedano)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Ni kartice SIM"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Ni kartice SIM"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Ni podatkov"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Za povezavo je potrebna kartica SIM"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Za povezavo je potrebna kartica SIM operaterja <xliff:g id="WIRELESS_CARRIER">%s</xliff:g>"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Prednostni način omrežja: prednostno WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Prednostni način omrežja: samo GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Prednostni način omrežja: samo WCDMA"</string>
@@ -4934,6 +4909,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Prenos podatkov v mobilnem omrežju"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Dostop do prenosa podatkov prek mobilnega omrežja"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Ko bo ta operater v dosegu, bo telefon samodejno preklopil nanj"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Nobena kartica SIM ni na voljo"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Nastavitev za klice"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Nastavitev za sporočila SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Vedno vprašaj"</string>
@@ -5122,10 +5098,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Dovoli prekrivanje zaslonov z nastavitvami"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Dovoli aplikacijam, ki lahko prekrivajo druge aplikacije, prekrivanje zaslonov v aplikaciji Nastavitve"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Predstavnost"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Skrije predvajalnik po končani seji predstavnosti"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Predvajalnik vam omogoča nadaljevanje seje prek razširjenega podokna s hitrimi nastavitvami."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Predvajalnik predstavnosti v hitrih nastavitvah"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Prikaz predvajalnika predstavnosti dalj časa za preprosto nadaljevanje predvajanja"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Skrij predvajalnik"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Prikaži predvajalnik"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Na voljo ni noben predvajalnik"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Dovoljene aplikacije"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"predstavnost"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth se bo vklopil"</string>
 </resources>
diff --git a/res/values-sq/arrays.xml b/res/values-sq/arrays.xml
index 305b072..4dff8aa 100644
--- a/res/values-sq/arrays.xml
+++ b/res/values-sq/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Mesatare"</item>
     <item msgid="6740026006576843477">"E gjatë"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"E shkurtër"</item>
+    <item msgid="7397961711906421599">"Mesatare"</item>
+    <item msgid="4079132024502041928">"E gjatë"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"E parazgjedhur"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Globale"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"Vetëm TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Globale"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index eb172c4..640e1fc 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Shfaq informacionin e profilit në ekranin e kyçjes"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Llogaritë"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Vendndodhja"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Përdor vendndodhjen"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Përdor vendndodhjen"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Joaktiv"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">Aktiv - <xliff:g id="COUNT_1">%1$d</xliff:g> aplikacione kanë qasje te vendndodhja</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Përdor fytyrën për të vërtetuar"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Nis"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Nëse shkyçja e fytyrës me qasshmëri është e çaktivizuar, disa hapa konfigurimi mund të mos funksionojnë mirë me TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Kthehu pas"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Vazhdo konfigurimin"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Përdor konfigurimin e qasshmërisë"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="one">Duhet të ketë më pak se <xliff:g id="NUMBER_0">%d</xliff:g> shifër</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Administratori i pajisjes nuk e lejon përdorimin e një kodi PIN të përdorur së fundi"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Kodet e zakonshme PIN janë bllokuar nga administratori i TI-së. Provo një kod tjetër PIN."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Kjo nuk mund të përfshijë një karakter të pavlefshëm"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Duhet të përmbajë të paktën një germë"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Duhet të përmbajë të paktën një shifër"</string>
@@ -653,7 +655,6 @@
       <item quantity="one">Duhet të përmbajë të paktën 1 karakter jonumerik</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Administratori i pajisjes nuk e lejon përdorimin e një fjalëkalimi të përdorur së fundi"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Fjalëkalimet e zakonshme janë bllokuar nga administratori i TI-së. Provo një fjalëkalim tjetër."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Nuk lejohet një sekuencë shifrash në rritje, në zbritje ose me përsëritje"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Konfirmo"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Anulo"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Aktivizo Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Përdor Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Përdor Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Cilësimet e Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Cakto dhe menaxho zonat e qasjes të rrjetit me valë"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Vendos në qendër kodin QR më poshtë për t\'u lidhur me “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Bashkohu me Wi-Fi duke skanuar një kod QR"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Ndaj Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Skano këtë kod QR për t\'u lidhur me “<xliff:g id="SSID">%1$s</xliff:g>” dhe ndaj fjalëkalimin"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Skano këtë kod QR me një pajisje tjetër për t\'u bashkuar me “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Skano këtë kod QR për t\'u lidhur me “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Provo sërish. Nëse problemi vazhdon, kontakto me prodhuesin e pajisjes"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Ndodhi një gabim"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Fjalëkalimi i Wi‑Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Fjalëkalimi i zonës së qasjes për internet: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Lidh automatikisht"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Lejo që telefoni të lidhet automatikisht në afërsi të këtij rrjeti"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Lejo që tableti të lidhet automatikisht në afërsi të këtij rrjeti"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Lejo lidhjen me këtë rrjet kur të jetë brenda rrezes"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Shto pajisje"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Përdor një kod QR për të shtuar një pajisje në këtë rrjet"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"Kodi QR nuk është në format të vlefshëm"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Përdor certifikatat e sistemit"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Mos e ofro"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Mos e mirato"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Nuk u specifikua asnjë certifikatë. Lidhja jote nuk do të jetë private."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Emri i rrjetit është shumë i gjatë."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Duhet të specifikohet një domen."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Kërkohet certifikimi."</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Lidh"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi është i aktivizuar"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Lidhur me <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Po lidhet me <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Po lidhet…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Lidhja me rrjetin dështoi"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Rrjeti nuk është brenda rrezes"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Aplikacioni po ndan përmbajtje. Për të ndarë lidhjen e internetit, çaktivizo zonën e qasjes së internetit dhe më pas aktivizoje përsëri."</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Nuk është caktuar fjalëkalim"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Emri i zonës së qasjes për internet"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> po aktivizohet..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> po aktivizohet…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Pajisjet e tjera mund të lidhen me <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Fjalëkalimi i zonës së qasjes për internet"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Banda AP"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Ekrani me butësi"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Rrit automatikisht shpejtësinë e rifreskimit nga 60 në 90 Hz për disa përmbajtje. Rrit përdorimin e baterisë."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Detyro shpejtësinë e rifreskimit 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Shpejtësia më e lartë e rifreskimit për përmirësimin e reagueshmërisë së prekjes dhe cilësisë së animacioneve. Rrit përdorimin e baterisë."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Vëmendja ndaj ekranit"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Aktiv / Ekrani nuk do të fiket nëse shikon tek ai"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Versioni i Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Përditësim sigurie për Android:"</string>
     <string name="model_info" msgid="8997566254717810904">"Modeli"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Modeli: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Modeli dhe hardueri"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Versioni i harduerit"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ID-ja e pajsjes"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Cilësimet e rrjetit janë rivendosur"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Kartat SIM nuk mund të spastrohen"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Kartat SIM të shkarkuara nuk mund të spastrohen për shkak të një gabimi.\n\nRinise pajisjen dhe provo përsëri."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Spastro të gjitha të dhënat (rivendosja e fabrikës)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Spastro të gjitha të dhënat (rivendosja e fabrikës)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Kjo do të spastrojë të gjitha të dhënat nga "<b>"hapësira ruajtëse e brendshme"</b>" e tabletit, duke përfshirë:\n\n"<li>"Llogarinë e Google"</li>\n<li>"Të dhënat e sistemit dhe aplikacioneve si dhe cilësimet"</li>\n<li>"Aplikacionet e shkarkuara"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Kjo do të spastrojë të gjitha të dhënat nga "<b>"hapësira ruajtëse e brendshme"</b>" e telefonit, duke përfshirë:\n\n"<li>"Llogarinë e Google"</li>\n<li>"Të dhënat e sistemit dhe aplikacioneve si dhe cilësimet"</li>\n<li>"Aplikacionet e shkarkuara"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Je i identifikuar aktualisht në llogaritë e mëposhtme:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Ka përdorues të tjerë të pranishëm në këtë pajisje.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Muzika"</li>\n<li>"Fotografitë"</li>\n<li>"Të dhëna të tjera të përdoruesit"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"Kartat eSIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Kjo nuk do ta anulojë planin tënd të shërbimit celular."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Për të hequr muzikën, fotografitë dhe të dhëna të tjera të përdoruesit, "<b>"hapësira ruajtëse e USB-së"</b>" duhet të spastrohet."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Për të hequr muzikën, fotografitë dhe të dhëna të tjera të përdoruesit, "<b>"karta SD"</b>" duhet të spastrohet."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Spastro të gjitha të dhënat (rivendosja e fabrikës)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Spastro të gjitha të dhënat (rivendosja e fabrikës)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Kjo do të spastrojë të gjitha të dhënat nga "<b>"hapësira ruajtëse e brendshme"</b>" e tabletit, duke përfshirë:\n\n"<li>"Llogarinë e Google"</li>\n<li>"Të dhënat e sistemit dhe aplikacioneve si dhe cilësimet"</li>\n<li>"Aplikacionet e shkarkuara"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Kjo do të spastrojë të gjitha të dhënat nga "<b>"hapësira ruajtëse e brendshme"</b>" e telefonit, duke përfshirë:\n\n"<li>"Llogarinë e Google"</li>\n<li>"Të dhënat e sistemit dhe aplikacioneve si dhe cilësimet"</li>\n<li>"Aplikacionet e shkarkuara"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Je i identifikuar aktualisht në llogaritë e mëposhtme:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Ka përdorues të tjerë të pranishëm në këtë pajisje.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Muzika"</li>\n<li>"Fotografitë"</li>\n<li>"Të dhëna të tjera të përdoruesit"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"Kartat eSIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Kjo nuk do ta anulojë planin tënd të shërbimit celular."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Për të hequr muzikën, fotografitë dhe të dhëna të tjera të përdoruesit, "<b>"hapësira ruajtëse e USB-së"</b>" duhet të spastrohet."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Për të hequr muzikën, fotografitë dhe të dhëna të tjera të përdoruesit, "<b>"karta SD"</b>" duhet të spastrohet."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Fshi hapësirën ruajtëse të USB-së"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Spastroje kartën SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Spastro të gjitha të dhënat në hapësirën ruajtëse të brendshme të USB-së, si muzikën ose fotografitë"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Spastro të gjitha të dhënat në kartën SD, si muzikën ose fotografitë"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Spastro të gjitha të dhënat"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Spastro të gjitha të dhënat"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Të gjitha informacionet e tua personale dhe aplikacionet e shkarkuara do të fshihen. Nuk mund ta zhbësh këtë veprim."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Të gjitha informacionet e tua personale, duke përfshirë aplikacionet e shkarkuara dhe kartat SIM, do të fshihen. Nuk mund ta zhbësh këtë veprim."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Spastroji të gjitha"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Nuk u krye një rivendosje sepse shërbimi Pastrimi i sistemit nuk është i disponueshëm."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Të spastrohen të gjitha të dhënat?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Rivendosja në gjendjen e fabrikës nuk ofrohet për këtë përdorues"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Po spastron"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Qëndro në pritje..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Spastro të gjitha të dhënat"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Spastro të gjitha të dhënat"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Të gjitha informacionet e tua personale dhe aplikacionet e shkarkuara do të fshihen. Nuk mund ta zhbësh këtë veprim."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Të gjitha informacionet e tua personale, duke përfshirë aplikacionet e shkarkuara dhe kartat SIM, do të fshihen. Nuk mund ta zhbësh këtë veprim."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Të spastrohen të gjitha të dhënat?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Rivendosja në gjendjen e fabrikës nuk ofrohet për këtë përdorues"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Po spastron"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Qëndro në pritje…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Cilësimet e telefonatave"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Konfiguro postën zanore, transferimin e telefonatave, telefonatat në pritje dhe ID-në e telefonuesit"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Ndarje përmes USB-së"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Ndarja e internetit nuk mund të bëhet për më shumë se <xliff:g id="MAXCONNECTION">%1$d</xliff:g> pajisje."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Ndarja e internetit do të çaktivizohet për <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ndarja e eternetit"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Ndaj lidhjen e internetit të telefonit nëpërmjet eternetit me USB"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Ndaj lidhjen e internetit të telefonit nëpërmjet eternetit"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Përdor zonën e qasjes dhe ndarjen e internetit për t\'u ofruar internet pajisjeve të tjera nëpërmjet lidhjes tënde të të dhënave celulare. Aplikacionet mund të krijojnë po ashtu një zonë qasjeje të internetit për të ndarë përmbajtje me pajisjet në afërsi."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Përdor zonën e qasjes dhe ndarjen e internetit për t\'u ofruar internet pajisjeve të tjera nëpërmjet lidhjes tënde Wi-Fi ose të të dhënave celulare. Aplikacionet mund të krijojnë po ashtu një zonë qasjeje të internetit për të ndarë përmbajtje me pajisjet në afërsi."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Ndihma"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Preferencat e titrave"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Zmadhimi"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Zona e zmadhimit"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Aktivizimi i zmadhimit"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Zgjidh zonën(at) e zmadhimit që dëshiron të përdorësh kur zmadhon ekranin"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Ekrani i plotë"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Një pjesë e ekranit"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Ekrani i plotë dhe një pjesë e ekranit"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Zmadho të gjithë ekranin"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Zmadho një pjesë të ekranit"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Të kalohet te butoni i qasshmërisë?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Përdorimi i trokitjes së trefishtë për të zmadhuar një pjesë të ekranit do të shkaktojë vonesa gjatë shkrimit dhe veprimeve të tjera.\n\nDëshiron të kalosh te përdorimi i butonit të qasshmërisë për të zmadhuar?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Kalo te butoni i qasshmërisë"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Mbaj trokitjen e trefishtë për të zmadhuar"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Cilësimet e \"Zmadhimit\""</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Zmadho me tre trokitje"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Zmadho me shkurtore"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Butoni i fikjes mbyll telefonatën"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Kursor i madh miu"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Hiq animacionet"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Audioja mono"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Ndërthur kanalet kur luan audion"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Balanca e audios"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Majtas"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Djathtas"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Audioja mono"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Ndërthur kanalet kur luan audion"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Balanca e audios"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Majtas"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Djathtas"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"E parazgjedhur"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 sekonda"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 sekonda"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Dridhjet e njoftimeve"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Dridhjet e ziles"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Reagimi me prekje"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Përdor <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Hap <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Përdor korrigjimin e ngjyrave"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Shfaq titrat"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Vetëm për aplikacionet e mbështetura"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Përdor <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Hap <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Përdor korrigjimin e ngjyrave"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Shfaq titrat"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Vetëm për aplikacionet e mbështetura"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Madhësia dhe stili i titrave"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Madhësia e tekstit <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Opsione të tjera"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomali"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomali"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomali"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Nuancat e grisë"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"E kuqe - e gjelbër"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"E kuqe - e gjelbër"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"E kaltër - e verdhë"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Kufizimi i përdorimit në sfond"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Lejo që aplikacioni të ekzekutohet në sfond"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Nuk lejohet që aplikacioni të ekzekutohet në sfond"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Përdorimi në sfond nuk mund të kufizohet"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Përdorimi në sfond nuk mund të kufizohet"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Të kufizohet aktiviteti në sfond?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Nëse e kufizon aktivitetin në sfond për një aplikacion, mund të ketë çrregullime në funksionimin e tij"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Duke qenë se ky aplikacion nuk është caktuar për të optimizuar baterinë, nuk mund ta kufizosh atë.\n\nPër të kufizuar aplikacionin, në fillim aktivizo optimizimin e baterisë."</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Cakto një orar"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Zgjat kohëzgjatjen e baterisë"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Çaktivizo kur të karikohet"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"\"Kursyesi i baterisë\" çaktivizohet kur telefoni yt është në <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"\"Kursyesi i baterisë\" çaktivizohet kur tableti yt është në <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"\"Kursyesi i baterisë\" çaktivizohet kur pajisja jote është në <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"\"Kursyesi i baterisë\" çaktivizohet kur telefoni yt karikohet mbi <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"\"Kursyesi i baterisë\" çaktivizohet kur tableti yt karikohet mbi <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"\"Kursyesi i baterisë\" çaktivizohet kur pajisja jote karikohet mbi <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Aktivizo"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Rivendos"</string>
     <string name="tts_play" msgid="2945513377250757221">"Luaj"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Përshtatja e lidhshmërisë"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Rrit kohëzgjatjen e baterisë dhe përmirëson cilësinë e funksionimit të pajisjes duke menaxhuar automatikisht lidhjet e rrjetit"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Ruajtja e kredencialeve"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Instalo një certifikatë"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Instalo certifikatat nga hapësira ruajtëse"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Kredencialet e përdoruesit"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Shiko dhe modifiko kredencialet e ruajtura"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Të përparuara"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Lloji i hapësirës ruajtëse"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"E mbështetur nga hardueri"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Vetëm ajo e softuerit"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Kredencialet nuk ofrohen për këtë përdorues"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Instaluar për VPN dhe aplikacione"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Instaluar për Wi-Fi"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Pagesa në terminal"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Konfiguro një aplikacion pagese. Më pas thjesht mbaje pjesën e pasme të telefonit te një terminal me simbolin e pagesave pa kontakt."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"E kuptova"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Më shumë..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Më shumë…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Cakto aplikacionin e parazgjedhur të pagesave"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Përditëso aplikacionin e parazgjedhur të pagesave"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Te një terminal pa kontakte, paguaj me <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Përdor gjithmonë këtë për telefonatat"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Përzgjidh një kartë SIM për të dhënat"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Zgjidh një kartë SIM për mesazhet SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Po ndërron SIM-in e të dhënave. Kjo mund të zgjasë deri në një minutë..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Po ndërron kartën SIM të të dhënave. Kjo mund të zgjasë deri në një minutë…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Telefono me"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Zgjidh një kartë SIM"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"rutina, planifikimi, kursyesi i baterisë, kursyesi i energjisë, bateria, automatike, përqind"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, telefonatë e përparuar, telefonatë me 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"shto gjuhën, shto një gjuhë"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"madhësia e tekstit"</string>
     <string name="default_sound" msgid="6604374495015245195">"Tingulli i parazgjedhur"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Volumi i ziles dhe njoftimeve në <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Volum, dridhje, \"Mos shqetëso\""</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Aktivizo tingujt"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Titra në çast"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Media me titra automatike"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Asnjë"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> orare të caktuara</item>
-      <item quantity="one">1 orar i caktuar</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Asnjë}=1{1 orar i caktuar}other{# orare të caktuara}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Mos shqetëso"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Merr njoftime vetëm nga aplikacionet dhe personat e rëndësishëm"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Kufizo ndërprerjet"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Vetëm me prioritet"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Aktiv / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Joaktiv / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Joaktiv"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Aktiv"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Pyet çdo herë"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Derisa ta çaktivizosh"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> orë</item>
-      <item quantity="one">1 orë</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minuta"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> orare mund të aktivizohen automatikisht</item>
-      <item quantity="one">1 orar mund të aktivizohet automatikisht</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 orë}other{# orë}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minutë}other{# minuta}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Joaktiv}=1{Joaktiv / 1 orar mund të aktivizohet automatikisht}other{Joaktiv / # orare mund të aktivizohen automatikisht}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Çfarë mund ta ndërpresë \"Mos shqetëso\""</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Personat"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Aplikacionet"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Caktoji automatikisht njoftimet me prioritet më të ulët te \"Me rëndësi të ulët\""</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Renditja e njoftimeve me përshtatje"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Rendit automatikisht njoftimet sipas përshtatshmërisë"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Komentet e njoftimeve me përshtatje"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Trego rregullimet që u bëhen njoftimeve dhe shfaq opsionin për t\'i dhënë komente sistemit"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Veprimet dhe përgjigjet e sugjeruara"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Shfaq automatikisht veprimet dhe përgjigjet e sugjeruara"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Shfaq njoftimet e fundit dhe ato të shtyra"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Qasja te \"Mos shqetëso\""</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Lejo modalitetin \"Mos shqetëso\""</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Asnjë aplikacion i instaluar nuk ka kërkuar qasje te \"Mos shqetëso\""</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Po ngarkon aplikacionet..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Po ngarkon aplikacionet…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Me kërkesën tënde, Android po bllokon shfaqjen e njoftimeve të këtij aplikacioni në këtë pajisje"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Me kërkesën tënde, Android po bllokon shfaqjen e kësaj kategorie njoftimesh në këtë pajisje"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Me kërkesën tënde, Android po bllokon shfaqjen e këtij grupi njoftimesh në këtë pajisje"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Të gjitha bisedat"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Bisedat me përparësi"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Asnjë"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> biseda</item>
-      <item quantity="one">1 bisedë</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Asnjë"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Asnjë}=1{1 bisedë}other{# biseda}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Kush mund të ndërpresë"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Telefonata"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Telefonatat"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Për t\'u siguruar që telefonatat e lejuara lëshojnë tingull, kontrollo nëse pajisja jote është caktuar me zile"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Për \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" telefonatat hyrëse janë të bllokuara. Mund t\'i rregullosh cilësimet për të lejuar shokët, familjen ose kontakte të tjera të lidhen me ty."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Kontaktet me yll"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> të tjerë</item>
-      <item quantity="one">1 tjetër</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Asnjë"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Asnjë}=1{{contact_1}}=2{{contact_1} dhe {contact_2}}=3{{contact_1}, {contact_2} dhe {contact_3}}other{{contact_1}, {contact_2} dhe # kontakte të tjera}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Mesazhet"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"mesazhet"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Mesazhet"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Për \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\", mesazhet hyrëse janë të bllokuara. Mund t\'i rregullosh cilësimet për të lejuar shokët, familjen ose kontakte të tjera të lidhen me ty."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Të gjithë mesazhet mund të vijnë te ti"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Të gjitha telefonatat mund të lidhen me ty"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Asnjë"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontakte</item>
-      <item quantity="one">1 kontakt</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Asnjë}=1{1 kontakt}other{# kontakte}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Çdo person"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Kontaktet"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Kontaktet me yll"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Të gjitha njoftimet"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Disa njoftime"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Persona të zgjedhur mund të të kontaktojnë ende, edhe nëse nuk i lejon aplikacionet të të ndërpresin"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> mund ta ndërpresin</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> mund ta ndërpresë</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> të tjera"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Asnjë aplikacion nuk mund të ndërpresë}=1{{app_1} mund të ndërpresë}=2{{app_1} dhe {app_2} mund të ndërpresin}=3{{app_1}, {app_2} dhe {app_3} mund të ndërpresin}other{{app_1}, {app_2} dhe # aplikacione të tjera mund të ndërpresin}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Aplikacionet"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Të gjitha njoftimet"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Disa njoftime"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Njoftimet që mund ta ndërpresin"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Lejo të gjitha njoftimet"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> mund ta ndërpresin</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> mund ta ndërpresë</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Asgjë nuk mund të ndërpresë"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> të tjera"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Asgjë nuk mund të ndërpresë}=1{{sound_category_1} mund të ndërpresë}=2{{sound_category_1} dhe {sound_category_2} mund të ndërpresin}=3{{sound_category_1}, {sound_category_2} dhe {sound_category_3} mund të ndërpresin}other{{sound_category_1}, {sound_category_2} dhe # tinguj të tjerë mund të ndërpresin}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Asgjë nuk mund të ndërpresë"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Askush nuk mund të ndërpresë"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Disa persona mund ta ndërpresin"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Të gjithë kontaktet mund ta ndërpresin"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB-ja kontrollohet nga"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Pajisja e lidhur"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Kjo pajisje"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Po ndërrohet..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Po ndërrohet…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Nuk mund të ndërrohej"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Karikimi i kësaj pajisjeje"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Pajisja e lidhur po karikohet"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Shiko detajet"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Kursyesi i të dhënave"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Të dhënat e pakufizuara"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Të dhënat e sfondit janë të çaktivizuara"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Të dhënat e sfondit janë të çaktivizuara"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Aktiv"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Joaktiv"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Përdor \"Kursyesin e të dhënave\""</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Nëse pajisja është e kyçur, parandalo shkrimin e përgjigjeve ose teksteve të tjera te njoftimet"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Kontrolluesi drejtshkrimor i parazgjedhur"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Zgjidh kontrolluesin drejtshkrimor"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Përdor kontrolluesin drejtshkrimor"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Përdor kontrolluesin drejtshkrimor"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"I pazgjedhur"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(asnjë)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Për të ndihmuar në lirimin e hapësirës ruajtëse, menaxheri i hapësirës ruajtëse i heq fotografitë dhe videot e rezervuara nga pajisja jote."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Hiq fotografitë dhe videot"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Menaxheri i hapësirës ruajtëse"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Përdor \"Menaxherin e hapësirës ruajtëse\""</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Përdor \"Menaxherin e hapësirës ruajtëse\""</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automatike"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Liro hapësirën tani"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Trokit dy herë për të kontrolluar telefonin"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Trokit dy herë për të kontrolluar tabletin"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Trokit dy herë për të kontrolluar pajisjen"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Rrëshqit shpejt për njoftimet"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Rrëshqit shpejt poshtë në skajin fundor të ekranit për të shfaqur njoftimet"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Modaliteti i përdorimit me një dorë"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Përdor modalitetin e përdorimit me një dorë"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Dil kur ndërron aplikacionet"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Koha e pritjes"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 sekonda"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 sekonda"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 sekonda"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"arritshmëria"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Për të kontrolluar orën, njoftimet dhe informacione të tjera, trokit dy herë tek ekrani."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Ngrije për ta kontrolluar telefonin"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Ngrije për ta kontrolluar tabletin"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Trokit për të kontrolluar tabletin"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Trokit për të kontrolluar pajisjen"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Për të kontrolluar orën, njoftimet dhe informacione të tjera, trokit tek ekrani."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Butoni i panikut"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Nis veprimet SOS të urgjencës duke shtypur butonin e energjisë me shpejtësi 5 herë."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Tingull paralajmërues"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Sinjalizim përpara nisjes së veprimeve"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Kontaktet e urgjencës"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Rrëshqit gjurmën e gishtit për njoftimet"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Rrëshqit gjurmën e gishtit"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Për të kontrolluar njoftimet, rrëshqit poshtë në sensorin e gjurmës së gishtit në pjesën e pasme të telefonit."</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Aktivizo për të gjitha aplikacionet"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Zgjidh drejtuesin e grafikës"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"E parazgjedhur"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Drejtuesi i lojës"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Drejtuesi i lojës"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Drejtuesi i zhvilluesit"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Drejtuesi i grafikës së sistemit"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Rrjetet nuk mund të gjendeshin. Provo përsëri."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(ndalohet)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Nuk ka kartë SIM"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Nuk ka kartë SIM"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Asnjë"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Kërkon kartë SIM për t\'u lidhur"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Kërkon kartë SIM nga <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> për t\'u lidhur"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Modaliteti i rrjetit të preferuar: preferohet WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Modaliteti i rrjetit të preferuar: vetëm GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Modaliteti i rrjetit të preferuar: vetëm WCDMA"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Të dhënat celulare"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Qasu te të dhënat duke përdorur rrjetin celular"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Telefoni do të kalojë automatikisht te ky operator celular kur të jetë brenda rrezes"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Nuk ka kartë SIM"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Preferencat e telefonatave"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Preferenca për SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Pyet çdo herë"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Lejo mbivendosjet e ekranit te \"Cilësimet\""</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Lejo aplikacionet të cilat mund të shfaqen mbi aplikacione të tjera të mbivendosen mbi ekranet e \"Cilësimeve\""</string>
     <string name="media_controls_title" msgid="403271085636252597">"Media"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Fshihe luajtësin kur sesioni i medias të ketë përfunduar"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Luajtësi të lejon ta vazhdosh më vonë një sesion nga paneli i zgjeruar i \"Cilësimeve të shpejta\"."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Luajtësi i medias te \"Cilësimet e shpejta\""</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Shfaqe luajtësin e medias për një periudhë më të gjatë për të vazhduar me lehtësi luajtjen"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Fshih luajtësin"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Shfaq luajtësin"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Nuk ofrohet asnjë luajtës"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Aplikacionet e lejuara"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"media"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth-i do të aktivizohet"</string>
 </resources>
diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml
index 97ed707..ce4a70e 100644
--- a/res/values-sr/arrays.xml
+++ b/res/values-sr/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Средње"</item>
     <item msgid="6740026006576843477">"Дугачко"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Кратко"</item>
+    <item msgid="7397961711906421599">"Средње"</item>
+    <item msgid="4079132024502041928">"Дуго"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Подразумевано"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Глобална"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Само TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Глобално"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 507c83f..dc61543 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -298,7 +298,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Прикажи податке о профилу на закључаном екрану"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Налози"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Локација"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Користи локацију"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Користите локацију"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Искључена"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">Укључено – <xliff:g id="COUNT_1">%1$d</xliff:g> апликација има приступ локацији</item>
@@ -332,6 +332,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Потврдите идентитет лицем"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Започните"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Ако је откључавање лицем са функцијом приступачности искључено, неки кораци за подешавање можда неће исправно радити са TalkBack-ом."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Назад"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Наставите подешавање"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Користите подеш. за приступачн."</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -627,7 +630,6 @@
       <item quantity="other">Мора да садржи мање од <xliff:g id="NUMBER_1">%d</xliff:g> цифара</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Администратор уређаја не дозвољава употребу недавно коришћеног PIN-а"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"ИТ администратор блокира честе PIN-ове. Изаберите други PIN."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Не сме да обухвата неважећи знак"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Мора да садржи најмање једно слово"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Мора да садржи најмање једну цифру"</string>
@@ -668,7 +670,6 @@
       <item quantity="other">Мора да садржи најмање <xliff:g id="COUNT">%d</xliff:g> знакова који нису бројеви</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Администратор уређаја не дозвољава употребу недавно коришћене лозинке"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"ИТ администратор блокира честе лозинке. Изаберите другу лозинку."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Растући, опадајући или поновљени низ цифара није дозвољен"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Потврди"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Откажи"</string>
@@ -812,7 +813,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Укључивање Wi-Fi-ја"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Користи Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Користи Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wi-Fi подешавања"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Подешавање и управљање бежичним приступним тачкама"</string>
@@ -920,7 +921,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Поставите QR кôд у наставку да бисте додали уређај на мрежу „<xliff:g id="SSID">%1$s</xliff:g>“"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Повежите се на Wi‑Fi мрежу тако што ћете скенирати QR кôд"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Дели Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Скенирајте овај QR кôд да бисте се повезали са „<xliff:g id="SSID">%1$s</xliff:g>“ и делили лозинку"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Скенирајте овај QR кôд помоћу другог уређаја да бисте се придружили мрежи <xliff:g id="SSID">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Скенирајте овај QR кôд да бисте се придружили мрежи „<xliff:g id="SSID">%1$s</xliff:g>“"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Пробајте поново. Ако се проблем настави, контактирајте произвођача уређаја"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Дошло је до грешке"</string>
@@ -946,8 +947,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Лозинка за Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Лозинка хотспота: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Аутоматско повезивање"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Дозволите телефону да се аутоматски повезује у близини ове мреже"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Дозволите таблету да се аутоматски повезује у близини ове мреже"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Дозволите повезивање са овом мрежом када је уређај у домету"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Додај уређај"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Користите QR кôд да бисте додали уређај на ову мрежу"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR кôд није у важећем формату"</string>
@@ -959,7 +959,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Користи сертификате система"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Не пружај"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Не проверавај"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Није наведен никакав сертификат. Веза неће бити приватна."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Назив мреже је предугачак."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Морате да наведете домен."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Сертификат је обавезан."</string>
@@ -986,6 +985,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Повежи"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi је укључен"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Повезано је на мрежу <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Повезујете се на <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Повезује се…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Повезивање са мрежом није успело"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Мрежа није у домету"</string>
@@ -1060,7 +1060,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Апликација дели садржај. Да бисте делили интернет везу, искључите, па укључите хотспот"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Нисте подесили лозинку"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Назив хотспота"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> се укључује..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Укључује се Wi-Fi хотспот <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Други уређаји могу да се повежу са хотспотом <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Лозинка хотспота"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Опсег приступне тачке"</string>
@@ -1210,7 +1210,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Течни приказ"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Аутоматски подиже учесталост освежавања са 60 на 90 Hz за одређени садржај. Повећава потрошњу батерије."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Течни приказ"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Наметни учесталост освежавања од 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Највећа учесталост освежавања за побољшан одзив на додир и квалитет анимације. Повећава потрошњу батерије."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Пажња екрана"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Укључено/екран се неће искључити ако гледате у њега"</string>
@@ -1350,7 +1350,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android верзија"</string>
     <string name="security_patch" msgid="4071756145347865382">"Безбедносно ажурирање за Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Модел"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Модел: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Модел и хардвер"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Верзија хардвера"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ИД опреме"</string>
@@ -1625,31 +1624,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Подешавања мреже су ресетована"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Брисање SIM картица није успело"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Преузете SIM картице не могу да се обришу због грешке.\n\nРестартујте уређај и пробајте поново."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Избриши све податке (врати на фабричка подешавања)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Избриши све податке (врати на фабричка подешавања)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Овим бришете све податке из "<b>"интерне меморије"</b>" таблета, укључујући:\n\n"<li>"Google налог"</li>\n<li>"податке и подешавања система и апликација"</li>\n<li>"преузете апликације"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Овим бришете све податке из "<b>"интерне меморије"</b>" телефона, укључујући:\n\n"<li>"Google налог"</li>\n<li>"Подаци и подешавања система и апликација"</li>\n<li>"Преузете апликације"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Тренутно сте пријављени на следеће налоге:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"На овом уређају су присутни и други корисници.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Музика"</li>\n<li>"Фотографије"</li>\n<li>"Други кориснички подаци"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM-ови"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"На тај начин нећете отказати мобилни тарифни пакет."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Да бисте обрисали музику, слике и друге корисничке податке, треба да избришете "<b>"USB меморију"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Да бисте обрисали музику, слике и друге корисничке податке, треба да избришете садржај "<b>"SD картице"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Обриши све податке (ресетовање на Фабричка подешавања)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Обриши све податке (ресетовање на Фабричка подешавања)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Овим бришете све податке из "<b>"интерне меморије"</b>" таблета, укључујући:\n\n"<li>"Google налог"</li>\n<li>"податке и подешавања система и апликација"</li>\n<li>"преузете апликације"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Овим бришете све податке из "<b>"интерне меморије"</b>" телефона, укључујући:\n\n"<li>"Google налог"</li>\n<li>"податке и подешавања система и апликација"</li>\n<li>"преузете апликације"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Тренутно сте пријављени на следеће налоге:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"На овом уређају су присутни и други корисници.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Музика"</li>\n<li>"Слике"</li>\n<li>"Други подаци корисника"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM-ови"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"На тај начин нећете отказати мобилни тарифни пакет."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Да бисте обрисали музику, слике и друге податке корисника, треба да обришете "<b>"USB меморију"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Да бисте обрисали музику, слике и друге податке корисника, треба да обришете садржај "<b>"SD картице"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Избриши USB меморију"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Избриши SD картицу"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Обриши све податке из интерне USB меморије, као што су музика и фотографије."</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Избриши све податке са SD картице, као што су музика или фотографије"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Избриши све податке"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Избриши све податке"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Избрисаћете све личне информације и преузете апликације. Ова радња не може да се опозове."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Све личне информације, укључујући преузете апликације и SIM картице, биће избрисане. Ова радња не може да се опозове."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Избриши све"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Није обављено враћање на почетне вредности зато што услуга брисања система није доступна."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Избрисати све податке?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Ресетовање на фабричка подешавања није доступно за овог корисника"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Брисање"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Сачекајте..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Обриши све податке"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Обриши све податке"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Избрисаћете све личне податке и преузете апликације. Ова радња не може да се опозове."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Сви лични подаци, укључујући преузете апликације и SIM картице, биће избрисани. Ова радња не може да се опозове."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Желите да обришете све податке?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Ресетовање на фабричка подешавања није доступно за овог корисника"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Брише се"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Сачекајте…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Подешавања позива"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Подешавање гласовне поште, преусмеравања позива, стављања позива на чекање, ИД-а позиваоца"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB привезивање"</string>
@@ -1697,7 +1694,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Привезивање на више од <xliff:g id="MAXCONNECTION">%1$d</xliff:g> уређаја није могуће."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Интернет веза са уређајем <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ће бити прекинута."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Привезивање етернета"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Делите интернет везу телефона преко USB етернета"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Делите интернет везу телефона преко етернета"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Користите хотспот и привезивање да бисте обезбедили интернет другим уређајима помоћу везе за мобилне податке. Апликације могу да праве хотспотове и за дељење садржаја са уређајима у близини."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Користите хотспот и привезивање да бисте омогућили интернет на другим уређајима помоћу Wi‑Fi везе или везе за пренос података преко мобилног оператера. Апликације могу и да праве хотспотове за дељење садржаја са уређајима у близини."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Помоћ"</string>
@@ -2141,13 +2138,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Подешавања титла"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Увећање"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Област за увећање"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Омогућите увећање"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Одаберите области за увећање које желите да користите када увећавате екран"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Цео екран"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Део екрана"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Цео екран и део екрана"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Увећајте цео екран"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Увећајте део екрана"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Желите ли да пређете на дугме Приступачност?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Ако увећате део екрана помоћу троструког додира, унос текста и друге радње се одлажу.\n\nЖелите ли да пређете на увеличавање помоћу дугмета Приступачност?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Пређи на дугме Приступачност"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Задржи увеличавање помоћу троструког додира"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Подешавања увећања"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Увећање помоћу троструког додира"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Увећавајте помоћу пречице"</string>
@@ -2201,11 +2201,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Дугме укључи/искључи прекида позив"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Велики показивач миша"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Уклони анимације"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Моно звук"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Комбинуј канале при пуштању аудио садржаја"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Баланс звука"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Лево"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Десно"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Моно звук"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Комбинујте канале при пуштању аудио садржаја"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Баланс звука"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Лево"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Десно"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Подразумевано"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 секунди"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 секунди"</string>
@@ -2235,11 +2235,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Вибрирање обавештења"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Вибрирање звона"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Додирне повратне информације"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Користите апликацију <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Отворите апликацију <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Користи корекцију боја"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Прикажи титл"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Само за подржане апликације"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Користите апликацију <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Отворите апликацију <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Користите корекцију боја"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Прикажите титл"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Само за подржане апликације"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Величина и стил титла"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Величина текста: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Још опција"</string>
@@ -2270,6 +2270,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Деутераномалија"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Протаномалија"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Тританомалија"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Сивило"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Црвено-зелено"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Црвено-зелено"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Плаво-жуто"</string>
@@ -2405,7 +2406,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Ограничење апликација у позадини"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Дозволите апликацији да се покреће у позадини"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Апликације којима није дозвољено покретање у позадини"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Апликације у позадини не можете да ограничите"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Коришћење у позадини не можете да ограничите"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Желите ли да ограничите активности у позадини?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Ако ограничите активности апликације у позадини, можда ће се понашати неочекивано."</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Апл. није подешена за оптимизацију батерије, па не можете да је ограничите. \n\nЗа огр. апл. укључите оптимизацију батерије."</string>
@@ -2629,9 +2630,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Подесите распоред"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Продужите трајање батерије"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Искључи када се напуни"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Уштеда батерије се искључује када је телефон на <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Уштеда батерије се искључује када је таблет на <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Уштеда батерије се искључује када је уређај на <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Уштеда енергије се искључује када је телефон напуњен више од <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Уштеда енергије се искључује када је таблет напуњен више од <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Уштеда енергије се искључује када је уређај напуњен више од <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Укључи"</string>
@@ -2696,6 +2697,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Ресетуј"</string>
     <string name="tts_play" msgid="2945513377250757221">"Пусти"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Прилагодљиво повезивање"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Продужује трајање батерије и побољшава учинак уређаја тако што аутоматски управља мрежним везама"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Складиште акредитива"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Инсталирај сертификат"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Инсталирај сертификате из меморије"</string>
@@ -2707,9 +2710,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Кориснички акредитиви"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Прегледајте и мењајте сачуване акредитиве"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Напредна"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Тип меморијског простора"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Подржан хардвером"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Само софтверски"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Акредитиви нису доступни за овог корисника"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Инсталирано за VPN и апликације"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Инсталирано за Wi-Fi"</string>
@@ -3103,7 +3103,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Плаћање на терминалу"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Подесите апликацију за плаћање. Затим само задржите задњи део телефона поред било ког терминала са симболом за повезивање без контакта."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Важи"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Још..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Још…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Подесите подразумевану апликацију за плаћање"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Ажурирајте подразумевану апликацију за плаћање"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"На терминалу за бесконтактно плаћање користиће се <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3187,7 +3187,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Увек користи ово за позиве"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Изаберите SIM картицу за податке"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Изаберите SIM за SMS-ове"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Пребацује се SIM за податке. То може да потраје до један минут..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Пребацује се SIM за податке. То може да потраје до један минут…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Позови помоћу"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Избор SIM картице"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM картица <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3331,6 +3331,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"рутина, распоред, уштеда батерије, уштеда енергије, батерија, аутоматско, проценат"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, напредно позивање, 4g позивање"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"додај језик, додајте језик"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"величина текста"</string>
     <string name="default_sound" msgid="6604374495015245195">"Подразумевани звук"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Јачина звука за звоно и обавештења је на <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Јачина звука, вибрација, Не узнемиравај"</string>
@@ -3370,12 +3371,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Звукови при укључивању"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Титл уживо"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Аутоматски титл за медије"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Ништа"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> распоред је подешен</item>
-      <item quantity="few"><xliff:g id="ON_COUNT">%d</xliff:g> распореда су подешена</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> распореда је подешено</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Ниједан}=1{1 распоред је подешен}one{# распоред је подешен}few{# распореда су подешена}other{# распореда је подешено}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Не узнемиравај"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Добијајте обавештења само од важних особа и апликација"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Ограничите прекиде"</string>
@@ -3443,22 +3439,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Само приоритетни прекиди"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Укључено / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Искључено / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Искључено"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Укључено"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Питај сваки пут"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Док не искључите"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> сат</item>
-      <item quantity="few"><xliff:g id="NUM_HOURS">%d</xliff:g> сата</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> сати</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> мин"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> распоред може да се укључује аутоматски</item>
-      <item quantity="few"><xliff:g id="ON_COUNT">%d</xliff:g> распореда могу да се укључују аутоматски</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> распореда може да се укључује аутоматски</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 сат}one{# сат}few{# сата}other{# сати}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 минут}one{# минут}few{# минута}other{# минута}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Искључено}=1{Искључено/1 распоред може да се укључује аутоматски}one{Искључено/# распоред може да се укључује аутоматски}few{Искључено/# распореда могу да се укључују аутоматски}other{Искључено/# распореда може да се укључује аутоматски}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Шта може да прекине режим Не узнемиравај"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Људи"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Апликације"</string>
@@ -3504,6 +3490,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Аутоматски подешава обавештења нижег приоритета на Дискретно"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Прилагодљиво рангирање обавештења"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Аутоматски рангира обавештења према релевантности"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Повратне информације о прилагодљивим обавештењима"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Означите подешавања обавештења и прикажите опцију за слање повратних информација систему"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Предложене радње и одговори"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Аутоматски приказује предложене радње и одговоре"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Погледајте недавна и одложена обавештења"</string>
@@ -3705,7 +3693,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Приступ опцији Не узнемиравај"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Дозволи режим Не узнемиравај"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Ниједна инсталирана апликација није захтевала приступ опцији Не узнемиравај"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Учитавају се апликације..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Апликације се учитавају…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"На ваш захтев, Android блокира приказивање обавештења ове апликације на овом уређају"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"На ваш захтев, Android блокира приказивање ове категорије обавештења на овом уређају"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"На ваш захтев, Android блокира приказивање ове групе обавештења на овом уређају"</string>
@@ -3800,12 +3788,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Све конверзације"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Приоритетне конверзације"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Ништа"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> конверзација</item>
-      <item quantity="few"><xliff:g id="CONVERSATIONS">%d</xliff:g> конверзације</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> конверзација</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Ништа"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Ниједна}=1{1 конверзација}one{# конверзација}few{# конверзације}other{# конверзација}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Ко може да прекида"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Позиви"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Позиви"</string>
@@ -3814,12 +3797,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Да бисте били сигурни да ће се дозвољени позиви чути, проверите да ли је уређај подешен да звони"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Долазни позиви су блокирани за „<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>“. Можете да прилагодите подешавања и дозволите пријатељима, члановима породице или другим контактима да допру до вас."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Контакти са звездицом"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one">Још <xliff:g id="NUM_PEOPLE">%d</xliff:g> особа</item>
-      <item quantity="few">Још <xliff:g id="NUM_PEOPLE">%d</xliff:g> особе</item>
-      <item quantity="other">Још <xliff:g id="NUM_PEOPLE">%d</xliff:g> особа</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Ништа"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Ниједан}=1{{contact_1}}=2{{contact_1} и {contact_2}}=3{{contact_1}, {contact_2} и {contact_3}}one{{contact_1}, {contact_2} и још #}few{{contact_1}, {contact_2} и још #}other{{contact_1}, {contact_2} и још #}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Поруке"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"поруке"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Поруке"</string>
@@ -3828,12 +3806,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Долазне поруке су блокиране за „<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>“. Можете да прилагодите подешавања и дозволите пријатељима, члановима породице или другим контактима да допру до вас."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Доступни сте за све поруке"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Доступни сте за све позиве"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Ништа"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> контакт</item>
-      <item quantity="few"><xliff:g id="NUM_CONTACTS">%d</xliff:g> контакта</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> контаката</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Ниједан}=1{1 контакт}one{# контакт}few{# контакта}other{# контаката}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Сви"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Контакти"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Контакти са звездицом"</string>
@@ -3871,24 +3844,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Сва обавештења"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Нека обавештења"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Изабрани људи и даље допиру до вас чак и ако не омогућите апликацијама да вас прекидају"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one"><xliff:g id="APP_NAMES">%s</xliff:g> могу да прекину</item>
-      <item quantity="few"><xliff:g id="APP_NAMES">%s</xliff:g> могу да прекину</item>
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> могу да прекину</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"Још <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Ниједна апликација не може да прекине}=1{{app_1} може да прекине}=2{{app_1} и {app_2} могу да прекину}=3{{app_1}, {app_2} и {app_3} могу да прекину}one{Апликације {app_1}, {app_2} и још # могу да прекину}few{Апликације {app_1}, {app_2} и још # могу да прекину}other{Апликације {app_1}, {app_2} и још # могу да прекину}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Апликације"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Сва обавештења"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Нека обавештења"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Обавештења која могу да прекидају"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Омогући сва обавештења"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> могу да прекину</item>
-      <item quantity="few"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> могу да прекину</item>
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> могу да прекину</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Ништа не може да прекине"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"Још <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Ништа не може да прекине}=1{{sound_category_1} може да прекине}=2{{sound_category_1} и {sound_category_2} могу да прекину}=3{{sound_category_1}, {sound_category_2} и {sound_category_3} могу да прекину}one{Звукови {sound_category_1}, {sound_category_2} и још # могу да прекину}few{Звукови {sound_category_1}, {sound_category_2} и још # могу да прекину}other{Звукови {sound_category_1}, {sound_category_2} и још # могу да прекину}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Ништа не може да прекине"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Нико не може да прекине"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Неки људи могу да прекину"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Сви људи могу да прекину"</string>
@@ -4142,7 +4105,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB контролише:"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Повезани уређај"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Овај уређај"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Мења се..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Мења се…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Промена није успела"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Пуњење уређаја"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Пуњење повезаног уређаја"</string>
@@ -4396,7 +4359,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Прикажи детаље"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Уштеда података"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Неограничен приступ подацима"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Пренос података у позадини је искључен"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Позадински подаци су искључени"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Укључено"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Искључено"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Користи Уштеду података"</string>
@@ -4419,7 +4382,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Ако је уређај закључан, спречи унос одговора или другог текста у обавештења"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Подразумевана провера правописа"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Изаберите проверу правописа"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Користи проверу правописа"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Користите проверу правописа"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Није изабрано"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(ниједно)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4513,7 +4476,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Да би ослободио меморијски простор, менаџер меморијског простора уклања резервне копије слика и видео снимака са уређаја."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Уклоните слике и видео"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Менаџер меморијског простора"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Користи Менаџер меморијског простора"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Користите менаџер меморијског простора"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Аутоматска"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Ручна"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Ослободи простор"</string>
@@ -4551,6 +4514,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Двапут додирните телефон да бисте га проверили"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Двапут додирните таблет да бисте га проверили"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Двапут додирните уређај да бисте га проверили"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Превуците за обавештења"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Превуците надоле на доњој ивици екрана ради приказивања обавештења"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Режим једном руком"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Користи режим једном руком"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Изађи при преласку са једне апликације на другу"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Временско ограничење"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 секунде"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 секунди"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 секунди"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"доступност"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Да бисте проверили време, обавештења и друге информације, двапут додирните екран."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Подигните телефон да бисте га проверили"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Подигните таблет да бисте га проверили"</string>
@@ -4563,6 +4536,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Додирните да бисте проверили таблет"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Додирните да бисте проверили уређај"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Да бисте проверили време, обавештења и друге информације, додирните екран."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Дугме аларма за панику"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Да бисте покренули радње за хитне случајеве, брзо додирните дугме за укључивање 5 пута."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Звук упозорења"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Упозорење пре почетка радњи"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Контакти за хитне случајеве"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Превуците прстом за обавештења"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Превуците прстом"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Да бисте проверили обавештења, превуците прстом надоле по сензору за отисак прста на задњој страни телефона."</string>
@@ -4724,7 +4702,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Омогући за све апликације"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Изаберите управљачки програм за графику"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Подразумевано"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Управљачки програм за игре"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Управљачки програм за игре"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Управљачки програм за програмере"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Системски управљачки програм за графику"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4793,6 +4771,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Нисмо успели да пронађемо мреже. Пробајте поново."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(забрањено)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Нема SIM картице"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Нема SIM картице"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Нема"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Неопходан је SIM ради повезивања"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Неопходан је <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> SIM ради повезивања"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Жељени режим мреже: WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Жељени режим мреже: само GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Жељени режим мреже: само WCDMA"</string>
@@ -4846,6 +4829,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Мобилни подаци"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Користи податке преко мобилне мреже"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Телефон ће аутоматски прећи на овог оператера када буде у домету"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"SIM картица није доступна"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Подешавање позива"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Жељена подешавања за SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Питај сваки пут"</string>
@@ -5031,10 +5015,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Дозволи прекривање садржаја екрана Подешавања"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Дозолите апликацијама које могу да се приказују преко других апликација да прекривају садржај екрана Подешавања"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Медији"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Сакријте плејер када се сесија медија заврши"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Плејер вам дозвољава да наставите сесију из проширеног окна за брза подешавања."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Медија плејер у Брзим подешавањима"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Приказује медија плејер у дужем периоду да би се лако наставила репродукција"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Сакриј плејер"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Прикажи плејер"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Није доступан ниједан плејер"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Дозвољене апликације"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"медији"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth ће се укључити"</string>
 </resources>
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index ef7ebca..3214704 100644
--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Mellan"</item>
     <item msgid="6740026006576843477">"Lång"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Kort"</item>
+    <item msgid="7397961711906421599">"Medel"</item>
+    <item msgid="4079132024502041928">"Lång"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Standard"</item>
     <item msgid="4234707448428002595">"Sans Serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Globalt"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Endast TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Globalt"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index c20f626..9d20af3 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Visa profilinfo på den låsta skärmen"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Konton"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Plats"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Använd plats"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Använd plats"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Av"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">På – <xliff:g id="COUNT_1">%1$d</xliff:g> appar har platsåtkomst</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Autentisera med hjälp av ditt ansikte"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Börja"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Om ansiktslås för tillgänglighet har inaktiverats fungerar inte vissa konfigureringssteg korrekt med TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Tillbaka"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Fortsätt"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Tillgänglighetskonfiguration"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="one">Får inte innehålla fler än <xliff:g id="NUMBER_0">%d</xliff:g> siffra</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Enhetsadministratören tillåter inte att en pinkod som använts nyligen används igen"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"IT-adminstratören har blockerat de vanligaste pinkoderna. Testa en annan pinkod."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Får inte innehålla ogiltiga tecken"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Måste innehålla minst en bokstav"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Måste innehålla minst en siffra"</string>
@@ -653,7 +655,6 @@
       <item quantity="one">Lösenordet måste innehålla minst ett tecken som inte är en siffra</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Enhetsadministratören tillåter inte att ett lösenord som använts nyligen används igen"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"IT-adminstratören har blockerat de vanligaste lösenorden. Testa ett annat lösenord."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"En stigande, fallande eller upprepad siffersekvens är inte tillåten"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Bekräfta"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Avbryt"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Aktivera Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Använd Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Använd Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wi-Fi-inställningar"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Ställ in och hantera trådlösa åtkomstpunkter"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Anslut till <xliff:g id="SSID">%1$s</xliff:g> genom att centrera QR-koden i fönstret nedan"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Anslut till Wi-Fi genom att skanna QR-koden"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Dela Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Anslut till <xliff:g id="SSID">%1$s</xliff:g> och dela lösenordet genom att skanna QR-koden"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Anslut till <xliff:g id="SSID">%1$s</xliff:g> genom att skanna QR-koden med en annan enhet"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Anslut till <xliff:g id="SSID">%1$s</xliff:g> genom att skanna QR-koden"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Försök igen. Om problemet kvarstår kontaktar du enhetens tillverkare"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Något gick fel"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi-Fi-lösenord: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Lösenord till surfzon: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Automatisk anslutning"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Tillåt att telefonen ansluter automatiskt i närheten av det här nätverket"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Tillåt att surfplattan ansluter automatiskt i närheten av det här nätverket"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Tillåt anslutning till det här nätverket när det är inom räckvidd."</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Lägg till enhet"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Lägg till en enhet på nätverket med hjälp av en QR-kod"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR-kodens format är ogiltigt"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Använd systemcertifikat"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Tillhandahåll inte"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Validera inte"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Inget certifikat är specificerat. Anslutningen blir inte privat."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Nätverkets namn är för långt."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Domän måste specificeras."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Certifikat krävs."</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Anslut"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi har aktiverats"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Ansluten till <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Ansluter till <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Ansluter …"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Det gick inte att ansluta till nätverket."</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Nätverket är inte inom räckvidd"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Appen delar innehåll. Om du vill dela internetanslutningen inaktiverar du surfzonen och aktiverar den igen."</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Inget lösenord har angetts"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Namn på surfzon"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Aktiverar <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> …"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Aktiverar <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> …"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Andra enheter kan ansluta till <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Lösenord för surfzon"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP-band"</string>
@@ -1104,7 +1104,7 @@
     <string name="sound_settings" msgid="5514582720435174014">"Ljud"</string>
     <string name="all_volume_title" msgid="6196367642878437513">"Volymer"</string>
     <string name="musicfx_title" msgid="5458574743312283473">"Musikeffekter"</string>
-    <string name="ring_volume_title" msgid="4869034595079914541">"Samtals- och aviseringsvolym"</string>
+    <string name="ring_volume_title" msgid="4869034595079914541">"Ring- och aviseringsvolym"</string>
     <string name="vibrate_in_silent_title" msgid="5076579100685867363">"Vibrera vid tyst"</string>
     <string name="notification_sound_title" msgid="8747567935870133157">"Standardljud för meddelanden"</string>
     <string name="incoming_call_volume_title" msgid="8445408274513654261">"Ringsignal"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Höjer uppdateringsfrekvensen dynamiskt från 60 till 90 Hz för visst innehåll. Ökar batteriförbrukningen."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Tvinga fram 90 Hz i uppdateringsfrekvens"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Den högsta uppdateringsfrekvensen ger bättre tryckkänslighet och animationskvalitet. Ökar batteriförbrukningen."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Blickavkänning"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"På/Skärmen stängs inte av om du tittar på den"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android-version"</string>
     <string name="security_patch" msgid="4071756145347865382">"Säkerhetsuppdatering för Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Modell"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Modell: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Modell och maskinvara"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Maskinvaruversion"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Utrustnings-ID"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Nätverksinställningarna har återställts"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Det gick inte att rensa SIM-kortet"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Det går inte att rensa nedladdade SIM-kort på grund av ett fel.\n\nStarta om enheten och försök igen."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Rensa all data (återställ standardinställningar)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Rensa all data (återställ standardinställningar)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Detta raderar all data från surfplattans "<b>"interna lagringsutrymme"</b>", bland annat:\n\n"<li>"Ditt Google-konto"</li>\n<li>"System- och appdata och inställningar"</li>\n<li>"Nedladdade appar"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Detta raderar all data från enhetens "<b>"interna lagringsutrymme"</b>", bland annat:\n\n"<li>"Ditt Google-konto"</li>\n<li>"System- och appdata och inställningar"</li>\n<li>"Nedladdade appar"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Du är inloggad på följande konton:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Det finns andra användare på enheten.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Musik"</li>\n<li>"Foton"</li>\n<li>"Andra användardata"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM-kort"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Detta innebär inte att serviceavtalet avslutas."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Om du vill ta bort musik, bilder och annan användardata måste du radera "<b>"USB-lagringsenheten"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Om du vill ta bort musik, bilder och annan användardata måste du radera "<b>"SD-kortet"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Rensa all data (återställ standardinst.)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Rensa all data (återställ standardinst.)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Detta raderar all data från surfplattans "<b>"interna lagringsutrymme"</b>", bland annat följande:\n\n"<li>"ditt Google-konto"</li>\n<li>"system- och appdata och inställningar"</li>\n<li>"nedladdade appar"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Detta raderar all data från enhetens "<b>"interna lagringsutrymme"</b>", bland annat följande:\n\n"<li>"ditt Google-konto"</li>\n<li>"system- och appdata och inställningar"</li>\n<li>"nedladdade appar"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Du är inloggad på följande konton:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Det finns andra användare på enheten.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Musik"</li>\n<li>"Foton"</li>\n<li>"Annan användardata"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM-kort"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Detta innebär inte att serviceavtalet avslutas."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Om du vill ta bort musik, bilder och annan användardata måste du rensa "<b>"USB-lagringsenheten"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Om du vill ta bort musik, bilder och annan användardata måste du rensa "<b>"SD-kortet"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Radera USB-lagring"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Radera SD-kort"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Radera alla data på den interna USB-lagringsenheten, som musik och foton."</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Radera all data på SD-kortet, som musik och foton."</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Radera all data"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Radera all data"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Alla personliga uppgifter och alla nedladdade appar raderas. Det går inte att ångra den här åtgärden."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Alla personliga uppgifter raderas, inklusive nedladdade appar och SIM-kort. Det går inte att ångra den här åtgärden."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Radera allt"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Återställningen utfördes inte eftersom tjänsten för systemrensning inte är tillgänglig."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Vill du radera all data?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Den här användaren kan inte återställa till standardinställningarna"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Rensar"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Vänta ..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Radera all data"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Radera all data"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Alla personliga uppgifter och alla nedladdade appar raderas. Det går inte att ångra den här åtgärden."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Alla personliga uppgifter raderas, inklusive nedladdade appar och SIM-kort. Det går inte att ångra den här åtgärden."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Vill du radera all data?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Den här användaren kan inte återställa till standardinställningarna"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Rensar"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Vänta …"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Samtalsinställningar"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Ställ in röstbrevlåda, vidarekoppla samtal, samtal väntar, nummerpres."</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Internetdelning via USB"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Det går inte att dela med mer än <xliff:g id="MAXCONNECTION">%1$d</xliff:g> enheter."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kopplas från."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ethernet-internetdelning"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Dela telefonens internetanslutning via USB-Ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Dela telefonens internetanslutning via Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Med hjälp av surfzoner och internetdelning kan andra enheter anslutas till internet via mobildataanslutningen. Surfzoner kan också skapas i appar för att dela innehåll med enheter i närheten."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Med hjälp av surfzoner och internetdelning kan andra enheter anslutas till internet via den här enhetens Wi-Fi- eller mobildataanslutning. Surfzoner kan även skapas i appar för att dela innehåll med enheter i närheten."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Hjälp"</string>
@@ -1733,7 +1730,7 @@
     <string name="location_access_summary" msgid="8634100005481578143">"Ge appar som har bett om tillstånd möjlighet att använda din platsinformation"</string>
     <string name="location_sources_heading" msgid="6126965815860570524">"Platskällor"</string>
     <string name="about_settings" product="tablet" msgid="2888705054709289693">"Om surfplattan"</string>
-    <string name="about_settings" product="default" msgid="4038626127378127613">"Om mobilen"</string>
+    <string name="about_settings" product="default" msgid="4038626127378127613">"Om telefonen"</string>
     <string name="about_settings" product="device" msgid="9012888717090302815">"Om enheten"</string>
     <string name="about_settings" product="emulator" msgid="2516560858771320366">"Om emulerad enhet"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Visa juridisk information, status, programversion"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Inställningar för textning"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Förstoring"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Förstoringsområde"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Magnification enable"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Välj vilket förstoringsområde du vill använda när du förstorar skärmen"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Hela skärmen"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Del av skärmen"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Hela skärmen och en del av skärmen"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Förstora hela skärmen"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Förstora en del av skärmen"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Vill du byta till tillgänglighetsknappen?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Om du förstorar delar av skärmen genom att trycka snabbt tre gånger uppstår en viss fördröjning när du skriver och vid andra åtgärder.\n\nVill du byta till att använda tillgänglighetsknappen för förstoring?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Byt till tillgänglighetsknappen"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Fortsätt trycka snabbt tre gånger för att förstora"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Inställningar för förstoring"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Tryck tre gånger för att förstora"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Förstora med genväg"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Avsluta samtal med av/på-knapp"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Stor muspekarikon"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Ta bort animationer"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Monoljud"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Kombinera kanaler när du spelar upp ljud"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Balans"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Vänster"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Höger"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Monoljud"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Kombinera kanaler när du spelar upp ljud"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Balans"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Vänster"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Höger"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Standard"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 sekunder"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 sekunder"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Vibration för aviseringar"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Vibration för ringsignal"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Tryckåterkoppling"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Använd <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Öppna <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Använd färgkorrigering"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Visa textning"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Endast för app som stöds"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Använd <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Öppna <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Använd färgkorrigering"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Visa textning"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Endast för app som stöds"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Textstorlek och stil"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Textstorlek <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Fler alternativ"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranopi"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanopi"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanopi"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Gråskala"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Röd–grön"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Röd–grön"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Gul–blå"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Bakgrundsbegränsning"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Tillåt att appen körs i bakgrunden"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Appen får inte köras i bakgrunden"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Bakgrundsanvändningen kan inte begränsas"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Bakgrundsanvändningen kan inte begränsas"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Vill du begränsa bakgrundsaktivitet?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Om du begränsar bakgrundaktiviteten för en app kanske den inte fungerar som den ska"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Appen kan inte begränsas eftersom batterioptimering inte har angetts.\n\nAktivera batterioptimering för att begränsa appen."</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Ställ in ett schema"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Utöka batteritiden"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Stäng av när enheten är laddad"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Batterisparläget inaktiveras när telefonen når <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Batterisparläget inaktiveras när surfplattan når <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Batterisparläget inaktiveras när enheten når <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Batterisparläget inaktiveras när telefonen laddas över <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Batterisparläget inaktiveras när surfplattan laddas över <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Batterisparläget inaktiveras när enheten laddas över <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Aktivera"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Återställ"</string>
     <string name="tts_play" msgid="2945513377250757221">"Spela upp"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Självjusterande anslutning"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Får batteriet att räcka längre och ger enheten bättre prestanda genom att nätverksanslutningar hanteras automatiskt"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Uppgiftslagring"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Installera ett certifikat"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Installera certifikat från lagringsenhet"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Användaruppgifter"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Visa och hantera lagrade användaruppgifter"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Avancerat"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Lagringstyp"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Maskinvarustöd"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Endast programvara"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Användaruppgifter är inte tillgängliga för den här användaren"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Har installerats för VPN och appar"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Har installerats för Wi-Fi"</string>
@@ -3060,13 +3060,13 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Betala vid en kassaterminal"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Konfigurera en betalningsapp. Sedan behöver du bara hålla telefonens baksida mot terminaler med symbolen för kontaktlös överföring."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"OK"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Mer ..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Mer …"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Ställ in standardapp för betalning"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Uppdatera standardapp för betalning"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Vid en kontaktlös terminal betalar du med <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="nfc_payment_set_default_instead_of" msgid="565237441045013280">"Vid en kontaktlös terminal betalar du med <xliff:g id="APP_0">%1$s</xliff:g>.\n\nDå ersätts <xliff:g id="APP_1">%2$s</xliff:g> som standardapp för betalning."</string>
     <string name="nfc_payment_btn_text_set_deault" msgid="1821065137209590196">"Ange standard"</string>
-    <string name="nfc_payment_btn_text_update" msgid="5159700960497443832">"Nytt"</string>
+    <string name="nfc_payment_btn_text_update" msgid="5159700960497443832">"Uppdatera"</string>
     <string name="restriction_settings_title" msgid="4293731103465972557">"Begränsningar"</string>
     <string name="restriction_menu_reset" msgid="92859464456364092">"Ta bort begränsningar"</string>
     <string name="restriction_menu_change_pin" msgid="2505923323199003718">"Ändra PIN-koden"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Använd alltid för samtal"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Välj ett SIM-kort för data"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Välj ett SIM-kort för sms"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Byter data-SIM-kort. Det kan ta upp till en minut ..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Byter SIM-kort för data. Det kan ta upp till en minut …"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Ring med"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Välj ett SIM-kort"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM-kort <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"rutin, schema, batterisparläge, energisparläge, batteri, automatiskt, procent"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, avancerade samtal, 4g-samtal"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"lägg till språk, lägg till ett språk"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"textstorlek"</string>
     <string name="default_sound" msgid="6604374495015245195">"Standardsignal"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Volymen för samtal och aviseringar är inställd på <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Volym, vibrera, stör ej"</string>
@@ -3297,7 +3298,7 @@
     <string name="remote_media_volume_option_title" msgid="8760846743943305764">"Castvolym"</string>
     <string name="call_volume_option_title" msgid="1461105986437268924">"Samtalsvolym"</string>
     <string name="alarm_volume_option_title" msgid="6398641749273697140">"Alarmvolym"</string>
-    <string name="ring_volume_option_title" msgid="1520802026403038560">"Samtals- och aviseringsvolym"</string>
+    <string name="ring_volume_option_title" msgid="1520802026403038560">"Ring- och aviseringsvolym"</string>
     <string name="notification_volume_option_title" msgid="4838818791683615978">"Aviseringsvolym"</string>
     <string name="ringtone_title" msgid="3271453110387368088">"Ringsignal"</string>
     <string name="notification_ringtone_title" msgid="6924501621312095512">"Standardljud för aviseringar"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Ljud vid uppstart"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Live Caption"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Texta media automatiskt"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Inga"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> scheman har ställts in</item>
-      <item quantity="one">1 schema har ställts in</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Inga}=1{1 schema har ställts in}other{# scheman har ställts in}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Stör ej"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Få bara aviseringar från viktiga personer och appar"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Begränsa antalet avbrott"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Endast prioriterade"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"På/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Av/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Av"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"På"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Fråga varje gång"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Tills du stänger av"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> timmar</item>
-      <item quantity="one">1 timme</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minuter"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> scheman kan aktiveras automatiskt</item>
-      <item quantity="one">1 schema kan aktiveras automatiskt</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 timme}other{# timmar}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minut}other{# minuter}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Av}=1{Av / 1 schema kan aktiveras automatiskt}other{Av / # scheman kan aktiveras automatiskt}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Vad får avbryta Stör ej"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Personer"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Appar"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Ställ automatiskt in aviseringar av lägre prioritet på Utan avbrott"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Smart rankning av aviseringar"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Rangordna automatiskt aviseringar efter relevans"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Feedback om anpassad avisering"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Ange justeringar av aviseringar och visa möjligheten att ge feedback till systemet"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Föreslagna åtgärder och svar"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Visa föreslagna åtgärder och svar automatiskt"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Visa de senaste aviseringarna och uppskjutna aviseringar"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Stör ej-åtkomst"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Tillåt Stör ej"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Inga installerade appar har begärt Stör ej-åtkomst"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Läser in appar ..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Läser in appar …"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"På din begäran blockeras appens aviseringar av Android och visas inte på enheten"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"På din begäran blockeras denna aviseringskategori av Android och visas inte på enheten"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"På din begäran blockeras denna aviseringsgrupp av Android och visas inte på enheten"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Alla konversationer"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Prioriterade konversationer"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Inga"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> konversationer</item>
-      <item quantity="one">1 konversation</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Inga"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Inga}=1{1 konversation}other{# konversationer}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Vem får störa dig"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Samtal"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Samtal"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Kontrollera att enheten är inställd på att ringa, så att du vet att tillåtna samtal hörs"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Inkommande samtal blockeras med <xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>. Du kan anpassa inställningarna så att vänner, familj eller andra kontakter ändå kan nå dig."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Stjärnmärkta kontakter"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> till</item>
-      <item quantity="one">1 till</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Inga"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Inga}=1{{contact_1}}=2{{contact_1} och {contact_2}}=3{{contact_1}, {contact_2} och {contact_3}}other{{contact_1}, {contact_2} och # andra}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Meddelanden"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"meddelanden"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Meddelanden"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Inkommande meddelanden blockeras med <xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>. Du kan anpassa inställningarna så att vänner, familj eller andra kontakter ändå kan nå dig."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Alla meddelanden kan nå dig"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Alla samtal kan nå dig"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Inga"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontakter</item>
-      <item quantity="one">1 kontakt</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Inga}=1{1 kontakt}other{# kontakter}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Alla"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Kontakter"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Stjärnmärkta kontakter"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Alla aviseringar"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Vissa aviseringar"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Utvalda personer kan fortfarande nå dig, även om du inte tillåter att appar stör"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> får avbryta</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> får avbryta</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> till"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Inga appar får avbryta}=1{{app_1} får avbryta}=2{{app_1} och {app_2} får avbryta}=3{{app_1}, {app_2} och {app_3} får avbryta}other{{app_1}, {app_2} och # till får avbryta}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Appar"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Alla aviseringar"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Vissa aviseringar"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Aviseringar som får störa dig"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Tillåt alla aviseringar"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> får avbryta</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> får avbryta</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Inget får avbryta"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> till"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Inget får avbryta}=1{{sound_category_1} får avbryta}=2{{sound_category_1} och {sound_category_2} får avbryta}=3{{sound_category_1}, {sound_category_2} och {sound_category_3} får avbryta}other{{sound_category_1}, {sound_category_2} och # till får avbryta}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Inget får avbryta"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Ingen får avbryta"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Vissa får avbryta"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Alla får avbryta"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB styrs av"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Ansluten enhet"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Den här enheten"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Byter …"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Byter …"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Det gick inte att byta"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Enheten laddas"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Laddning av ansluten enhet"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Visa detaljer"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Databesparing"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Obegränsad data"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Bakgrundsdata har inaktiverats"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Bakgrundsdata har inaktiverats"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Aktiverat"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Inaktiverat"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Använd databesparing"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Gör aviseringar skrivskyddade när enheten är låst så att det inte går att skriva svar eller liknande"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Standardstavningskontroll"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Välj stavningskontroll"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Använd stavningskontroll"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Använd stavningskontroll"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Ingen har valts"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(ingen)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4413,7 +4384,7 @@
     <string name="sensors_off_quick_settings_title" msgid="8472151847125917167">"Sensorer är inaktiverade"</string>
     <string name="managed_profile_settings_title" msgid="3400923723423564217">"Inställningar för jobbprofilen"</string>
     <string name="managed_profile_contact_search_title" msgid="7685402733942182110">"Kontaktsökning"</string>
-    <string name="managed_profile_contact_search_summary" msgid="2771343453017731940">"Tillåt att organisationen söker bland kontakter för att identifiera ringande och kontakter"</string>
+    <string name="managed_profile_contact_search_summary" msgid="2771343453017731940">"Tillåt att organisationen söker bland kontakter för att identifiera uppringare och kontakter"</string>
     <string name="cross_profile_calendar_title" msgid="7570277841490216947">"Kalender för flera profiler"</string>
     <string name="cross_profile_calendar_summary" msgid="8856185206722860069">"Visa jobbhändelser i den personliga kalendern"</string>
     <plurals name="hours" formatted="false" msgid="1853396353451635458">
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Lagringshanteraren tar bort säkerhetskopior av foton och videor från enheten för att frigöra lagringsutrymme."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Ta bort foton och videor"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Lagringshanteraren"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Använd lagringshanteraren"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Använd lagringshanteraren"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automatiskt"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Manuellt"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Frigör utrymme nu"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Tryck snabbt två gånger för att kolla telefonen"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Tryck snabbt två gånger för att kolla surfplattan"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Tryck snabbt två gånger för att kolla enheten"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Svep för aviseringar"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Svep nedåt på skärmens nederkant för att visa aviseringarna"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Enhandsläge"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Använd enhandsläge"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Avsluta när du byter app"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Tidsgräns"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 sekunder"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 sekunder"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 sekunder"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"nåbarhet"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Visa tid, aviseringar och annan information genom att trycka snabbt två gånger på skärmen."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Lyft för att kolla telefonen"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Plocka upp för att kolla surfplattan"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Tryck för att kolla surfplattan"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Tryck för att kolla enheten"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Visa tid, aviseringar och annan information genom att trycka på skärmen."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Panikknapp"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Starta åtgärderna för nödsituationer genom att trycka på strömbrytaren snabbt fem gånger."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Varningsljud"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Aktivera ett varningsljud innan du startar åtgärderna"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Nödkontakter"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Svep över fingeravtryckssensorn för aviseringar"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Svep över fingeravtryckssensorn"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Visa aviseringar genom att svepa nedåt på fingeravtryckssensorn på baksidan av telefonen."</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Aktivera för alla appar"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Välj grafikdrivrutin"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Standard"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Game Driver"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Game Driver"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Developer Driver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"System för grafikdrivrutin"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Det gick inte att hitta nätverk. Försök igen."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(förbjudet)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Inget SIM-kort"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Inget SIM-kort"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Inget"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"SIM-kort krävs för att ansluta"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"SIM-kort från <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> krävs för att ansluta"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Föredraget nätverksläge: Föredrar WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Föredraget nätverksläge: Endast GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Föredraget nätverksläge: Endast WCDMA"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobildata"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Få åtkomst till data via mobilt nätverk"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Mobilen byter automatiskt till den här operatören när den är inom räckvidd"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Inget SIM-kort tillgängligt"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Angiven för samtal"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Angiven för sms"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Fråga varje gång"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Tillåt skärmöverlagring på Inställningar"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Tillåt att appar som får visas ovanpå andra appar överlagras på skärmar med inställningar"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Media"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Dölj spelare när mediesessionen har avslutats"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Med spelaren kan du återuppta en session från den utökade panelen Snabbinställningar."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Mediespelare i Snabbinställningar"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Visa mediespelaren under en längre tid så att du lättare kan återuppta uppspelningen"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Dölj spelare"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Visa spelare"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Det finns inga tillgängliga spelare"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Tillåtna appar"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"media"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth aktiveras"</string>
 </resources>
diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml
index 53006c7..073afc1 100644
--- a/res/values-sw/arrays.xml
+++ b/res/values-sw/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Wastani"</item>
     <item msgid="6740026006576843477">"Muda mrefu"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Mfupi"</item>
+    <item msgid="7397961711906421599">"Wastani"</item>
+    <item msgid="4079132024502041928">"Mrefu"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Chaguomsingi"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Jumla"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA pekee"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Mitandao Yote"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 0a3e63c..15778e5 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Onyesha maelezo ya wasifu kwenye skrini iliyofungwa"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Akaunti"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Kutambua Mahali"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Tumia mahali"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Tumia kipengele cha mahali"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Umezima"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">Imewashwa - programu <xliff:g id="COUNT_1">%1$d</xliff:g> zinaweza kufikia maelezo ya mahali</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Tumia uso wako kuthibitisha"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Anza"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Ikiwa kipengele cha ufikivu cha kufungua kwa uso kimezimwa, huenda baadhi ya hatua za kuweka mipangilio zisifanye kazi vizuri pamoja na TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Rudi nyuma"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Endelea kuweka mipangilio"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Tumia mipangilio ya ufikivu"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="one">Lazima iwe na chini ya tarakimu <xliff:g id="NUMBER_0">%d</xliff:g></item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Msimamizi wa kifaa haruhusu utumie PIN uliyotumia hivi majuzi"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"PIN zinazotumika zaidi zimezuiwa na msimamizi wako wa Tehama. Jaribu PIN tofauti."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Hali hii haiwezi kujumuisha kibambo kisichoruhusiwa"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Ni lazima liwe na angalau herufi moja"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Ni lazima liwe na angalau tarakimu moja"</string>
@@ -653,7 +655,6 @@
       <item quantity="one">Ni lazima liwe na angalau herufi moja ambayo si tarakimu</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Msimamizi wa kifaa haruhusu kutumia nenosiri ulilotumia hivi majuzi"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Manenosiri yanayotumika sana yamezuiwa na msimamizi wako wa Tehama. Jaribu nenosiri tofauti."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Haturuhusi mpangilio wa kupanda, kushuka au kujirudia kwa tarakimu"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Thibitisha"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Ghairi"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Washa Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Tumia Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Tumia Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Mipangilio ya Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Weka na udhibiti vituo vya kufikia mitandao-hewa"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Weka katikati msimbo wa QR ulio hapa chini ili uunganishe kwenye “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Unganisha kwenye Wi-Fi kwa kuchanganua msimbo wa QR"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Shiriki Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Changanua msimbo huu wa QR ili uunganishe kwenye “<xliff:g id="SSID">%1$s</xliff:g>” na ushiriki nenosiri"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Changanua msimbo huu wa QR kwa kutumia kifaa kingine ili uunganishe “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Changanua msimbo huu wa QR ili uunganishe kwenye “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Jaribu tena. Tatizo hili likiendelea, wasiliana na kampuni iliyotengeneza kifaa"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Hitilafu fulani imetokea"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Nenosiri la Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Nenosiri la mtandaopepe: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Unganisha kiotomatiki"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Ruhusu simu iunganishe kiotomatiki ikiwa karibu na mtandao huu"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Ruhusu kompyuta kibao iunganishe kiotomatiki karibu na mtandao huu"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Ruhusu iunganishe kwenye mtandao huu unapokuwa karibu"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Ongeza kifaa"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Tumia msimbo wa QR ili uongeze kifaa kwenye mtandao huu"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"Msimbo wa QR si muundo sahihi"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Tumia vyeti vya mfumo"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Usitoe"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Usithibitishe"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Hakuna cheti kilichobainishwa. Muunganisho wako hautakuwa wa faragha."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Jina la mtandao ni refu sana."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Lazima ubainishe kikoa."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Inahitaji cheti."</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Unganisha"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Umewasha Wi‑Fi"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Imeunganishwa kwenye <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Inaunganisha kwenye <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Inaunganisha…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Imeshindwa kuunganisha kwa mtandao"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Mtandao hauko karibu"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Programu inashiriki maudhui. Ili ushiriki muunganisho wa intaneti, zima mtandao pepe, kisha uuwashe"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Hujaweka nenosiri lolote"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Jina la mtandaopepe"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Inawasha <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Inawasha <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Vifaa vingine vinaweza kuunganisha kwenye <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Nenosiri la mtandaopepe"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Bendi ya AP"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Onyesho Laini"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Huinua kiotomatiki kiwango cha kuonyesha upya kutoka Hz 60 hadi 90 kwa baadhi ya maudhui. Huongeza matumizi ya betri."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Onyesho Laini"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Lazimisha kiwango cha kuonyesha upya cha Hz 90"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Kiwango cha juu kabisa cha kuonyesha upya kwa utendakazi wa mguso ulioboreshwa na ubora wa uhuishaji. Huongeza matumizi ya betri."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Utashi wa skrini"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Umewashwa / Skrini haitazima ikiwa unaiangalia"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Toleo la Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Sasisho la usalama la Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Muundo"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Muundo: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Muundo na maunzi"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Toleo la maunzi"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Kitambulisho cha Kifaa"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Mipangilio ya mtandao imewekwa upya"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Imeshindwa kufuta data yote kwenye SIM"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Hitilafu imetokea wakati wa kufuta data iliyopakuliwa kwenye SIM.\n\nZima na uwashe kifaa chako na ujaribu tena."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Futa data yote (rejesha mipangilio ambayo kifaa kilitoka nayo kiwandani)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Futa data yote (rejesha mipangilio ya kiwandani)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Hatua hii itafuta data yote kwenye hifadhi yako iliyo "<b>"ndani ya kompyuta kibao"</b>", ikiwa pamoja na:\n \n"<li>"Akaunti yako ya Google"</li>\n<li>"Data na mipangilio ya mfumo na programu"</li>\n<li>"Programu zilizopakuliwa"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Hatua hii itafuta data yote kwenye hifadhi yako iliyo "<b>"ndani ya simu"</b>", ikiwa pamoja na:\n \n"<li>"Akaunti yako ya Google"</li>\n<li>"Data na mipangilio ya mfumo na programu"</li>\n<li>"Programu zilizopakuliwa"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Kwa sasa umeingia kwenye akaunti zifuatazo:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Kuna watumiaji wengine waliopo kwenye kifaa hiki.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Muziki"</li>\n<li>"Picha"</li>\n<li>"data nyingine ya mtumiaji"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Hatua hii haitaghairi mpango wako wa huduma ya simu ya mkononi."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Ili kufuta pia muziki, picha, na data zingine za mtumiaji, "<b>" hifadhi ya "</b>" inahitaji kufutwa."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Ili kufuta muziki, picha, na data zingine za mtumiaji, "<b>"kadi ya"</b>" inahitaji kufutwa."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Futa data yote (rejesha mipangilio Iliyotoka nayo kiwandani)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Futa data yote (rejesha mipangilio Iliyotoka nayo kiwandani)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Hatua hii itafuta data yote kwenye "<b>"hifadhi ya mfumo"</b>" ya kompyuta yako kibao, ikiwa ni pamoja na:\n \n"<li>"Akaunti yako ya Google"</li>\n<li>"Data na mipangilio ya mfumo na programu"</li>\n<li>"Programu zilizopakuliwa"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Hatua hii itafuta data yote kwenye "<b>"hifadhi ya mfumo"</b>" ya simu yako, ikiwa ni pamoja na:\n \n"<li>"Akaunti yako ya Google"</li>\n<li>"Data na mipangilio ya mfumo na programu"</li>\n<li>"Programu zilizopakuliwa"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Kwa sasa umeingia katika akaunti zifuatazo:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Kuna watumiaji wengine waliopo kwenye kifaa hiki.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Muziki"</li>\n<li>"Picha"</li>\n<li>"data nyingine ya mtumiaji"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Hatua hii haitaghairi mpango wako wa huduma ya simu ya mkononi."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Ili kufuta muziki, picha na data nyingine ya mtumiaji, data iliyo kwenye "<b>"hifadhi ya USB"</b>" inahitaji kufutwa."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Ili kufuta muziki, picha na data nyingine ya mtumiaji, data iliyo kwenye "<b>"kadi ya SD"</b>" inahitaji kufutwa."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Futa hifadhi ya USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Futa kadi ya SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Futa data zote kwenye hifadhi ya ndani ya USB, kama vile muziki au picha"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Futa data zote kwenye kadi ya SD, kama vile muziki au picha."</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Futa data yote"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Futa data yote"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Ungependa kufuta taarifa binafsi na programu zilizopakuliwa. Huwezi kutendua kitendo hiki."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Taarifa yako yote ya binafsi, zikiwemo programu zilizopakuliwa na SIM zitafutwa Huwezi kutendua kitendo hiki."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Futa kila kitu"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Hakuna mpangilio mpya uliofanywa kwa sababu huduma ya Mfumo wa Kufuta haipatikani."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Je, unataka kufuta data yote?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Urejeshaji wa mipangilio ya kiwandani haupatikani kwa mtumiaji huyu"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Inafuta"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Tafadhali subiri..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Futa data yote"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Futa data yote"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Taarifa binafsi na programu zako zote zilizopakuliwa zitafutwa. Huwezi kutendua kitendo hiki."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Taarifa yako yote ya binafsi, ikiwa ni pamoja na programu zilizopakuliwa na SIM, zitafutwa Huwezi kutendua kitendo hiki."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Ungependa kufuta data yote?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Urejeshaji wa mipangilio ya kiwandani haupatikani kwa mtumiaji huyu"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Inafuta"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Tafadhali subiri…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Mipangilio ya simu"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Weka mipangilio ya ujumbe wa sauti, kupitisha simu, kusubiri simu, kitambulisho cha mteja"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Shiriki intaneti kwa USB"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Haiwezi kuzuia kwa zaidi kuliko vifaa <xliff:g id="MAXCONNECTION">%1$d</xliff:g>"</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>itazuiwa"</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Kusambaza mtandao wa Ethaneti"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Shiriki muunganisho wa intaneti ya simu kupitia Ethaneti ya USB"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Shiriki muunganisho wa intaneti ya simu kupitia Ethaneti"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Tumia mtandao pepe na kipengele cha kusambaza mtandao ili ushiriki intaneti na vifaa vingine kupitia muunganisho wa data wa simu za mkononi. Programu pia zinaweza kuunda mtandao pepe ili kushiriki maudhui na vifaa vilivyo karibu."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Tumia mtandaopepe na huduma ya kusambaza mtandao ili uvisambazie vifaa vingine intaneti kupitia muunganisho wa data kwa simu za mkononi au Wi-Fi. Programu pia zinaweza kuunda mtandaopepe ili kushiriki maudhui na vifaa vilivyo karibu."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Usaidizi"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Mapendeleo ya manukuu"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Ukuzaji"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Eneo la ukuzaji"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Kuwasha hali ya ukuzaji"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Chagua maeneo ya ukuzaji ambayo ungependa kutumia unapokuza skrini"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Skrini nzima"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Sehemu ya skrini"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Skrini nzima na sehemu ya skrini"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Kuza skrini yote"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Kuza sehemu ya skrini"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Utabadili ili utumie kitufe cha zana za ufikivu?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Hatua ya kugusa mara tatu ili kukuza sehemu ya skrini itachelewesha kuandika na vitendo vingine.\n\nJe, ungependa kubadilisha ili utumie kitufe cha zana za ufikivu kukuza?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Badilisha utumie kitufe cha zana za ufikivu"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Endelea kutumia \"kugusa mara tatu ili kukuza\""</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Mipangilio ya ukuzaji"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Kuza kwa kugusa mara tatu"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Kuza kwa njia ya mkato"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Kata simu kwa kitufe cha kuwasha/kuzima"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Kielekezi kikubwa cha kipanya"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Ondoa uhuishaji"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Sauti ya mono"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Changanya vituo wakati wa kucheza sauti"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Usawazishaji wa sauti"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Kushoto"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Kulia"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Sauti ya mono"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Unganisha vituo unapocheza sauti"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Usawazishaji wa sauti"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Kushoto"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Kulia"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Chaguomsingi"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"Sekunde 10"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"Sekunde 30"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Mtetemo wa arifa"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Mtetemo wa mlio"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Mtetemo kifaa kinapoguswa"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Tumia <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Fungua <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Tumia usahihishaji wa rangi"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Onyesha manukuu"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Kwa ajili ya programu zinazotumika pekee"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Tumia <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Fungua <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Tumia kipengele cha usahihishaji wa rangi"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Onyesha manukuu"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Kwa ajili ya programu zinazotumika pekee"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Muundo na ukubwa wa manukuu"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Maandishi <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Chaguo zaidi"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Upofu rangi wa kutokuona rangi ya kijani"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Upofu rangi wa kutokuona rangi nyekundu"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Upofu rangi wa kutokuona rangi ya bluu"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Kijivu"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Nyekundu-kijani"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Nyekundu-kijani"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Bluu-manjano"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Udhibiti wa matumizi ya chinichini"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Iruhusu programu kutumika chini chini"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Programu hairuhusiwi kutumika chini chini"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Huwezi kudhibiti matumizi ya chinichini"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Huwezi kudhibiti matumizi ya chinichini"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Ungependa kudhibiti shughuli za chini chini?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Ikiwa utadhibiti shughuli za chini chini za programu, huenda isifanye kazi vizuri"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Kwa kuwa programu hii haiboreshi matumizi ya betri, huwezi kuizuia.\n\nIli uizuie, washa kuboresha matumizi ya betri."</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Weka ratiba"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Ongeza muda wa matumizi ya betri"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Zima kiokoa betri simu ikipata chaji"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Kiokoa betri hujizima simu yako inapofika <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Kiokoa betri hujizima kompyuta yako kibao inapokuwa na <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Kiokoa betri hujizima kifaa chako kinapokuwa na <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Kiokoa betri hujizima chaji ya simu yako inapokuwa zaidi ya <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Kiokoa betri hujizima chaji ya kompyuta yako kibao inapokuwa zaidi ya <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Kiokoa betri hujizima chaji ya kifaa chako inapokuwa zaidi ya <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Washa"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Weka upya"</string>
     <string name="tts_play" msgid="2945513377250757221">"Cheza"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Muunganisho unaojirekebisha"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Huboresha muda wa matumizi ya betri na kuboresha utendaji wa kifaa kwa kudhibiti kiotomatiki miunganisho yako ya mtandao"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Hifadhi ya hati-tambulishi"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Sakinisha cheti"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Sakinisha vyeti kutoka kwenye hifadhi"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Kitambulisho cha mtumiaji"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Angalia na urekebishe vitambulisho vilivyohifadhiwa"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Mipangilio Ya Kina"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Aina ya hifadhi"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Inaweza kutumiwa na maunzi"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Programu pekee"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Kitambulisho hakipatikani kwa mtumiaji huyu"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Imesakinishwa kwa ajili ya VPN na programu"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Imesakinishwa kwa ajili ya Wi-Fi"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Kulipa katika kituo"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Sanidi programu ya malipo. Kisha elekeza upande wa nyuma wa simu yako kwenye kituo chochote cha malipo chenye alama ya kulipa kwa njia za kielektroniki."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Nimeelewa"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Zaidi..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Zaidi…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Weka programu chaguomssingi ya kulipa"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Sasisha programu chaguomsingi ya kulipa"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Kwenye kituo cha kielektroniki, lipa ukitumia <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Tumia hii kwa simu wakati wote"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Chagua SIM ya data"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Chagua SIM kwa ajili ya SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Inabadili SIM ya data, hii inaweza kuchukua hadi dakika moja..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Inabadili SIM ya data, hii inaweza kuchukua hadi dakika moja…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Piga simu ukitumia"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Chagua SIM kadi"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"mpangilio, ratiba, kiokoa betri, kuokoa umeme, betri, otomatiki, asilimia"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, upigaji simu ulioimarishwa, upigaji simu kupitia 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"ongeza lugha, ongeza lugha"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"ukubwa wa maandishi"</string>
     <string name="default_sound" msgid="6604374495015245195">"Sauti chaguomsingi"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Kiwango cha sauti ya arifa na mlio wa simu ni <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Kiwango cha sauti, mtetemo, Usinisumbue"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Washa sauti"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Manukuu Papo Hapo"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Wekea maudhui manukuu kiotomatiki"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Hamna"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other">Umeweka ratiba <xliff:g id="ON_COUNT">%d</xliff:g></item>
-      <item quantity="one">Umeweka ratiba moja</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Hamna}=1{Umeweka ratiba moja}other{Umeweka ratiba #}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Usinisumbue"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Pata arifa za watu na programu muhimu pekee"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Punguza usumbufu"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Kipaumbele tu"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Imewashwa / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Imezimwa. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Imezimwa"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Imewashwa"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Uliza kila wakati"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Hadi utakapoizima"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other">Saa <xliff:g id="NUM_HOURS">%d</xliff:g></item>
-      <item quantity="one">Saa 1</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"Dakika <xliff:g id="NUM_MINUTES">%d</xliff:g>"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other">Ratiba <xliff:g id="ON_COUNT">%d</xliff:g> zinaweza kuwashwa kiotomatiki</item>
-      <item quantity="one">Ratiba 1 inaweza kuwashwa kiotomatiki</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{Saa moja}other{Saa #}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{Dakika moja}other{Dakika #}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Imezimwa}=1{Imezimwa / Ratiba 1 inaweza kuwashwa kiotomatiki}other{Zimezimwa / Ratiba # zinaweza kuwashwa kiotomatiki}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Kinachoweza kukatiza kipengele cha Usinisumbue"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Watu"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Programu"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Weka kiotomatiki arifa za kipaumbele cha chini ili Zisitoe sauti"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Nafasi ya arifa zinazojirekebisha"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Panga arifa kiotomatiki kulingana na uhusiano"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Maoni kuhusu arifa zinazojirekebisha"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Onyesha marekebisho yaliyofanywa kwenye arifa na uonyeshe chaguo la kutoa maoni kwenye mfumo"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Vitendo na majibu yaliyopendekezwa"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Onyesha kiotomatiki vitendo na majibu yaliyopendekezwa"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Onyesha arifa za hivi majuzi na zile ulizoahirisha"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Kufikia kipengele cha Usinisumbue"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Ruhusu kipengele cha Usinisumbue"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Hakuna programu zilizosakinishwa ambazo zimeomba kufikia kipengele cha Usinisumbue"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Inapakia programu ..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Inapakia programu…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Kutokana na ombi lako, Android inazuia arifa za programu hii ili zisionekane kwenye kifaa hiki"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Kutokana na ombi lako, Android inazuia aina hizi za arifa ili zisionekane kwenye kifaa hiki"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Kutokana na ombi lako, Android inazuia kikundi hiki cha arifa ili zisionekane kwenye kifaa hiki"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Mazungumzo yote"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Mazungumzo ya kipaumbele"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Hamna"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other">Mazungumzo <xliff:g id="CONVERSATIONS">%d</xliff:g></item>
-      <item quantity="one">Mazungumzo 1</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Hamna"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Hamna}=1{Mazungumzo 1}other{Mazungumzo #}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Anayeweza kukatiza"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Simu"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Simu zilizopigwa"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Ili uhakikishe kuwa simu zinazoruhusiwa zinatoa sauti, hakikisha umeweka mipangilio ya kifaa kulia"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Kwa ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ simu zinazoingia zimezuiwa. Unaweza kubadilisha mipangilio ili uwaruhusu marafiki, familia na watu wengine wawasiliane nawe."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Anwani zenye nyota"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other">Wengine <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="one">Mwingine 1</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Hamna"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Hamna}=1{{contact_1}}=2{{contact_1} na {contact_2}}=3{{contact_1}, {contact_2} na {contact_3}}other{{contact_1}, {contact_2} na zingine #}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Ujumbe"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"ujumbe"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Ujumbe"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Katika hali ya ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ ujumbe unaoingia umezuiwa. Unaweza kubadilisha mipangilio ili uwaruhusu marafiki, familia na watu wengine wawasiliane nawe."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Ujumbe wote unaweza kukufikia"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Simu zote zinaweza kukufikia"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Hamna"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other">Anwani <xliff:g id="NUM_CONTACTS">%d</xliff:g></item>
-      <item quantity="one">Anwani 1</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Hamna}=1{Anwani moja}other{Anwani #}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Mtu yeyote"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Anwani"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Anwani zenye nyota"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Arifa zote"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Baadhi ya arifa"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Watu uliochagua bado wanaweza kuwasiliana nawe, hata usiporuhusu programu zikatize"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> zinaweza kukatiza</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> inaweza kukatiza</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"Nyingine <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Hakuna programu zinazoweza kukatiza}=1{{app_1} inaweza kukatiza}=2{{app_1} na {app_2} zinaweza kukatiza}=3{{app_1}, {app_2} na {app_3} zinaweza kukatiza}other{{app_1}, {app_2} na zingine # zinaweza kukatiza}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Programu"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Arifa zote"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Baadhi ya arifa"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Arifa zinazoweza kukatiza"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Ruhusu arifa zote"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> zinaweza kukatiza</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> inaweza kukatiza</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Hakuna kinachoweza kukatiza"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"Nyingine <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Hakuna kinachoweza kukatiza}=1{{sound_category_1} inaweza kukatiza}=2{{sound_category_1} na {sound_category_2} zinaweza kukatiza}=3{{sound_category_1}, {sound_category_2} na{sound_category_3} zinaweza kukatiza}other{{sound_category_1}, {sound_category_2} na nyingine # zinaweza kukatiza}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Hakuna kinachoweza kukatiza"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Hakuna mtu anayeweza kukatiza"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Baadhi ya watu wanaweza kukatiza"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Watu wote wanaweza kukatiza"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB inadhibitiwa na"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Kifaa kilichounganishwa"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Kifaa hiki"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Unabadilisha..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Inabadilisha…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Imeshindwa kubadilisha"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Inachaji kifaa hiki"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Inachaji kifaa kilichounganishwa"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Angalia maelezo"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Kiokoa Data"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Data bila kipimo"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Data ya chini chini imezimwa"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Data ya chini chini imezimwa"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Kimewashwa"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Kimezimwa"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Tumia Kiokoa Data"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Ikiwa kifaa kimefungwa, usiruhusu uchapaji wa majibu au maandishi mengine kwenye arifa"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Kikagua tahajia chaguomsingi"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Chagua kikagua tahajia"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Tumia kikagua tahajia"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Tumia kikagua maendelezo"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Hakijachaguliwa"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(hamna)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Ili kuongeza nafasi ya hifadhi, kidhibiti cha hifadhi huondoa picha na video zilizohifadhiwa nakala kwenye kifaa chako."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Ondoa picha na video"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Kidhibiti cha hifadhi"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Tumia Kidhibiti cha hifadhi"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Tumia Kidhibiti cha hifadhi"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Otomatiki"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Mwongozo"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Futa ili uongeze nafasi sasa"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Gusa mara mbili ili uangalie simu"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Gusa mara mbili ili uangalie kompyuta kibao"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Gusa mara mbili ili uangalie kifaa"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Telezesha kidole ili upate arifa"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Telezesha kidole chini kwenye ukingo wa chini wa skrini ili kuonyesha arifa zako"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Hali ya kutumia kwa mkono mmoja"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Tumia hali ya kutumia kwa mkono mmoja"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Funga unapobadilisha programu"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Muda umekwisha"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"Sekunde 4"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"Sekunde 8"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"Sekunde 12"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"uwezo wa kufikia"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Ili uangalie saa, arifa na maelezo mengine, gusa skrini yako mara mbili."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Inua ili uangalie simu"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Inua ili uangalie kompyuta kibao"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Gusa ili uangalie kompyuta kibao"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Gusa ili uangalie kifaa"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Ili uangalie saa, arifa na maelezo mengine, gusa skrini yako."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Kitufe cha kengele ya kushtua"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Anzisha vitendo vya dharura vya SOS kwa kubonyeza kitufe cha kuwasha/kuzima haraka mara tano."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Sauti ya onyo"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Arifu kabla ya kuanza kutekeleza vitendo"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Unaowasiliana nao wakati wa dharura"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Telezesha kidole ili upate arifa"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Telezesha kidole"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Ili uangalie arifa zako, telezesha kidole kuelekea chini kwenye kitambua alama ya kidole kilicho upande wa nyuma wa simu yako."</string>
@@ -4637,7 +4623,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Washa katika programu zote"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Chagua Kiendeshaji cha Michoro"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Chaguomsingi"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Kiendeshaji cha Michezo"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Kiendeshaji cha Michezo"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Kiendeshaji cha Msanidi Programu"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Kiendeshaji cha Michoro cha Mfumo"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4706,6 +4692,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Imeshindwa kupata mitandao. Jaribu tena."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(hairuhusiwi)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Hakuna SIM kadi"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Hakuna SIM"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Hamna"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Inahitaji SIM ili uunganishe"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Inahitaji SIM ya <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> ili uunganishe"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Hali ya mtandao inayopendelewa: WCDMA pendekezwa"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Hali ya mtandao inayopendelewa: GSM pekee"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Hali ya mtandao inayopendelewa: WCDMA pekee"</string>
@@ -4759,6 +4750,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Data ya mtandao wa simu"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Tumia data ya mtandao wa simu"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Simu itabadili kiotomatiki itumie mtoa huduma huyu inapokuwa karibu"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Hakuna SIM kadi inayopatikana"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Mapendeleo ya simu"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Mapendeleo ya SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Iulize kila wakati"</string>
@@ -4941,10 +4933,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Ruhusu programu zinazowekelewa juu ya nyingine kwenye Mipangilio"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Ruhusu programu zinazoweza kuonyeshwa juu ya programu nyingine ziwekelewe juu ya skrini za Mipangilio"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Maudhui"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Ficha kichezaji kipindi cha maudhui kikiisha"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Kichezaji hukuruhusu kuendelea kucheza kipindi kwenye kidirisha kilichopanuliwa cha Mipangilio ya Haraka."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Kichezaji Faili za Sauti na Video katika Mipangilio ya Haraka"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Onyesha kichezaji faili za sauti na video kwa muda mrefu ili uendelee kucheza kwa urahisi"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Ficha kichezaji"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Onyesha kichezaji"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Hakuna vichezaji vinavyopatikana"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Programu zinazoruhusiwa"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"maudhui"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth itawaka"</string>
 </resources>
diff --git a/res/values-ta/arrays.xml b/res/values-ta/arrays.xml
index 737d835..37e476e 100644
--- a/res/values-ta/arrays.xml
+++ b/res/values-ta/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"நடுத்தரம்"</item>
     <item msgid="6740026006576843477">"நீளமானது"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"குறுகியது"</item>
+    <item msgid="7397961711906421599">"நடுத்தரமானது"</item>
+    <item msgid="4079132024502041928">"நீண்டது"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"இயல்புநிலை"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"குளோபல்"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA மட்டும்"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"குளோபல்"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 51d954c..5e0db80 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"லாக் ஸ்கிரீனில் சுயவிவரத் தகவலைக் காட்டு"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"கணக்குகள்"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"இருப்பிடம்"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"இருப்பிடத்தைப் பயன்படுத்து"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"இருப்பிடத்தைப் பயன்படுத்து"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"ஆஃப்"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ஆப்ஸிற்கு இருப்பிட அனுமதி ஆன் செய்யப்பட்டுள்ளது</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"அங்கீகரிக்க, முகத்தைப் பயன்படுத்தலாம்"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"தொடங்கு"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"அணுகல்தன்மை முகம் காட்டித் திறத்தல் ஆஃப் செய்யப்பட்டிருந்தால் சில அமைவுப் படிகள் TalkBack அம்சத்துடன் சரியாக இயங்காமல் போகலாம்."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"பின்செல்"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"அமைவைத் தொடர்க"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"அணுகல்தன்மை அமைவைப் பயன்படுத்து"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="one"><xliff:g id="NUMBER_0">%d</xliff:g> இலக்கத்தை விடக் குறைவாக இருக்க வேண்டும்</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"சாதன நிர்வாகி சமீபத்திய பின்னை பயன்படுத்துவதை அனுமதிக்கவில்லை"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"IT நிர்வாகியால், பொதுவான பின்கள் தடை செய்யப்பட்டுள்ளன. வேறொரு பின்னை முயலவும்."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"இதில் தவறான எழுத்துக்குறி இருக்கக்கூடாது"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"குறைந்தது ஒரு எழுத்து இருக்க வேண்டும்"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"குறைந்தது ஒரு இலக்கம் இருக்க வேண்டும்"</string>
@@ -653,7 +655,6 @@
       <item quantity="one">எண் அல்லாத 1 எழுத்தாவது இருக்க வேண்டும்</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"சாதன நிர்வாகி சமீபத்திய கடவுச்சொல்லைப் பயன்படுத்துவதை அனுமதிக்கவில்லை"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"IT நிர்வாகியால், பொதுவான கடவுச்சொற்கள் தடை செய்யப்பட்டுள்ளன. வேறொரு கடவுச்சொல்லை முயலவும்."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"இலக்கங்கள் ஏறுவரிசையில், இறங்குவரிசையில் அல்லது ஒரே இலக்கத்தைப் பயன்படுத்துவது அனுமதிக்கப்படவில்லை"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"உறுதிப்படுத்து"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"ரத்துசெய்"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"வைஃபை"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"வைஃபையை இயக்கு"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"வைஃபை"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"வைஃபையைப் பயன்படுத்து"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"வைஃபையைப் பயன்படுத்து"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"வைஃபை அமைப்பு"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"வைஃபை"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"வயர்லெஸ் ஆக்சஸ் பாயிண்ட்களை அமைத்து &amp; நிர்வகிக்கவும்"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"“<xliff:g id="SSID">%1$s</xliff:g>” இல் சாதனத்தை இணைப்பதற்குக் கீழேயுள்ள QR குறியீட்டை மையப்படுத்திக் காட்டவும்"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"QR குறியீட்டை ஸ்கேன் செய்வதன் மூலம் வைஃபையுடன் இணையலாம்"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"வைஃபையைப் பகிர்தல்"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"“<xliff:g id="SSID">%1$s</xliff:g>” உடன் இணைக்க இந்த QR குறியீட்டை ஸ்கேன் செய்து கடவுச்சொல்லைப் பகிரவும்"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"மற்றொரு சாதனத்தை “<xliff:g id="SSID">%1$s</xliff:g>” உடன் இணைக்க இந்த QR குறியீட்டை ஸ்கேன் செய்யவும்"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"“<xliff:g id="SSID">%1$s</xliff:g>” உடன் இணைக்க இந்த QR குறியீட்டை ஸ்கேன் செய்யவும்"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"மீண்டும் முயலவும். சிக்கல் தொடர்ந்தால் சாதன உற்பத்தியாளரைத் தொடர்புகொள்ளவும்"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"ஏதோ தவறாகிவிட்டது"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"வைஃபை கடவுச்சொல்: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"ஹாட்ஸ்பாட் கடவுச்சொல்: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"தானாக இணைத்தல்"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"இந்த நெட்வொர்க்கின் அருகில் இருக்கும்போது மொபைலைத் தானாக இணைவதற்கு அனுமதிக்கும்"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"இந்த நெட்வொர்க்கின் அருகில் இருக்கும்போது டேப்லெட்டைத் தானாக இணைவதற்கு அனுமதிக்கும்"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"தொடர்பு எல்லையில் இருக்கும்போது இந்த நெட்வொர்க்கிற்கு இணைப்பை அனுமதிக்கவும்"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"சாதனத்தைச் சேர்க்கவும்"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"நெட்வொர்க்கில் சாதனத்தைச் சேர்க்க QR குறியீட்டைப் பயன்படுத்தவும்"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR குறியீடு சரியான வடிவமில்லை"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"முறைமைச் சான்றிதழ்களைப் பயன்படுத்து"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"வழங்காதே"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"சரிபார்க்காதே"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"சான்றிதழ் எதுவும் குறிப்பிடப்படவில்லை. உங்கள் இணைப்பு தனிப்பட்டதாக இருக்காது."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"நெட்வொர்க்கின் பெயர் மிகவும் நீளமாக உள்ளது."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"டொமைனைக் குறிப்பிட வேண்டும்."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"சான்றிதழ் தேவை."</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"இணை"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"வைஃபை ஆன் செய்யப்பட்டது"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> உடன் இணைக்கப்பட்டது"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> உடன் இணைக்கிறது"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"இணைக்கிறது…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"நெட்வொர்க்குடன் இணைக்க முடியவில்லை"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"நெட்வொர்க் தொடர்பு எல்லையில் இல்லை"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"ஆப்ஸ், உள்ளடக்கத்தைப் பகிர்கிறது. இண்டர்நெட்டைப் பகிர, ஹாட்ஸ்பாட்டை ஆஃப் செய்து, ஆன் செய்யவும்"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"கடவுச்சொல் எதுவும் அமைக்கப்படவில்லை"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"ஹாட்ஸ்பாட் பெயர்"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>ஐ இயக்குகிறது..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ஐ ஆன் செய்கிறது…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> உடன் பிற சாதனங்களை இணைக்கலாம்"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"ஹாட்ஸ்பாட் கடவுச்சொல்"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP அலைவரிசை"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"சில உள்ளடக்கத்திற்குப் புதுப்பிக்கும் விகிதத்தை 60லிருந்து 90 Hzக்குத் தானாகவே உயர்த்தும். இதனால் பேட்டரி உபயோகம் அதிகரிக்கும்."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"ரெஃப்ரெஷ் விகிதம்: Force 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"மேம்பட்ட தொடு இயக்கத்திறனுக்கும் அனிமேஷன் தரத்திற்குமான அதிவேக ரெஃப்ரெஷ் விகிதம். இதனால் பேட்டரி உபயோகம் அதிகரிக்கும்."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"திரை மீது கவனம்"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"ஆன் / திரையைப் பார்த்துக் கொண்டிருக்கையில் அது ஆஃப் ஆகாது"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android பதிப்பு"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android பாதுகாப்புப் புதுப்பிப்பு"</string>
     <string name="model_info" msgid="8997566254717810904">"மாடல்"</string>
-    <string name="model_summary" msgid="2246651782442466213">"மாடல்: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"மாடல் &amp; வன்பொருள்"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"வன்பொருள் பதிப்பு"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"உபகரணத்தின் ஐடி"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"நெட்வொர்க் அமைப்புகள் மீட்டமைக்கப்பட்டன"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"சிம்களை அழிக்க இயலாது"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"பிழை ஏற்பட்டதால் பதிவிறக்கிய சிம்களை அழிக்க இயலாது.\n\nசாதனத்தை மீண்டும் தொடங்கி மறுபடியும் முயலவும்."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"எல்லா டேட்டாவையும் அழி (ஆரம்பநிலை மீட்டமைவு)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"எல்லாம் அழி (ஆரம்பநிலை ரீசெட்)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"இது உங்கள் டேப்லெட்டின் "<b>"அகச் சேமிப்பகத்தில்"</b>" உள்ள அனைத்துத் தரவையும் அழித்துவிடும். இவற்றில் \n\n"<li>"உங்களின் Google கணக்கு"</li>\n<li>"சிஸ்டம் மற்றும் ஆப்ஸ் தரவுகள் மற்றும் அமைப்புகள்"</li>\n<li>"பதிவிறக்கப்பட்ட ஆப்ஸ்"</li>" ஆகியவை உள்ளடங்கும்"</string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"இது உங்கள் மொபைலின் "<b>"அகச் சேமிப்பகத்தில்"</b>" உள்ள அனைத்து டேட்டாவையும் அழித்துவிடும். இவற்றில்\n\n"<li>"உங்களின் Google கணக்கு"</li>\n<li>"சிஸ்டம் மற்றும் ஆப்ஸ் டேட்டா மற்றும் அமைப்புகள்"</li>\n<li>"பதிவிறக்கப்பட்ட ஆப்ஸ்"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"தற்போது, பின்வரும் கணக்குகளில் உள்நுழைந்துள்ளீர்கள்:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"இந்தச் சாதனத்தில் பிற பயனர்கள் உள்ளனர்.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"இசை"</li>\n<li>"படங்கள்"</li>\n<li>"பிற பயனர் தரவு"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIMகள்"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"இதைச் செய்வதால், உங்கள் மொபைல் சேவைத் திட்டம் ரத்துசெய்யப்படாது."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"இசை, படங்கள் மற்றும் பிற பயனர் தரவை அழிப்பதற்கு, "<b>"USB சேமிப்பிடத்தை"</b>" அழிக்க வேண்டியிருக்கும்."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"இசை, படங்கள் மற்றும் பிற பயனர் தரவை அழிக்க "<b>"SD கார்டு"</b>" அழிக்கப்பட வேண்டும்."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"எல்லாத் தரவையும் அழி (ஆரம்பநிலை ரீசெட்)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"எல்லாத் தரவையும் அழி (ஆரம்பநிலை ரீசெட்)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"இது உங்கள் டேப்லெட்டின் "<b>"அகச் சேமிப்பகத்தில்"</b>" உள்ள எல்லாத் தரவையும் அழித்துவிடும். இவற்றில் \n\n"<li>"உங்களின் Google கணக்கு"</li>\n<li>"சிஸ்டம் மற்றும் ஆப்ஸ் தரவு அமைப்புகள்"</li>\n<li>"பதிவிறக்கப்பட்ட ஆப்ஸ்"</li>" ஆகியவை உள்ளடங்கும்"</string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"இது உங்கள் மொபைலின் "<b>"அகச் சேமிப்பகத்தில்"</b>" உள்ள எல்லாத் தரவையும் அழித்துவிடும். இவற்றில்\n\n"<li>"உங்களின் Google கணக்கு"</li>\n<li>"சிஸ்டம் மற்றும் ஆப்ஸ் தரவு அமைப்புகள்"</li>\n<li>"பதிவிறக்கப்பட்ட ஆப்ஸ்"</li>" ஆகியவை உள்ளடங்கும்"</string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"தற்போது பின்வரும் கணக்குகளில் உள்நுழைந்துள்ளீர்கள்:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"இந்தச் சாதனத்தில் பிற பயனர்கள் உள்ளனர்.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"இசை"</li>\n<li>"படங்கள்"</li>\n<li>"பிற பயனர் தரவு"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIMகள்"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"இதைச் செய்வதால் உங்கள் மொபைல் சேவைத் திட்டம் ரத்துசெய்யப்படாது."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"இசை, படங்கள் மற்றும் பிற பயனர் தரவை அழிக்க "<b>"USB சேமிப்பகத்தில்"</b>" உள்ளவை அழிக்கப்பட வேண்டும்."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"இசை, படங்கள் மற்றும் பிற பயனர் தரவை அழிக்க "<b>"SD கார்டில்"</b>" உள்ளவை அழிக்கப்பட வேண்டும்."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USB சேமிப்பிடத்தை அழி"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SD கார்டை அழி"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"இசை அல்லது படங்கள் போன்று அக USB சேமிப்பிடத்தில் உள்ள எல்லா தரவையும் அழி"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"இசை அல்லது படங்கள் போன்று SD கார்டில் உள்ள எல்லா தரவையும் அழி"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"அனைத்து டேட்டாவையும் அழி"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"அனைத்து டேட்டாவையும் அழி"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"உங்களின் அனைத்துத் தனிப்பட்ட தகவல்களும் பதிவிறக்கிய ஆப்ஸும் நீக்கப்படும். இதைச் செயல்தவிர்க்க இயலாது."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"பதிவிறக்கிய ஆப்ஸ் &amp; சிம்கள் உட்பட உங்களின் அனைத்துத் தனிப்பட்ட தகவல்களும் நீக்கப்படும். இதைச் செயல்தவிர்க்க இயலாது."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"எல்லாவற்றையும் அழி"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"System Clear சேவை இல்லை என்பதால் மீட்டமைவைச் செயற்படுத்தப்படவில்லை."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"அனைத்து டேட்டாவையும் அழிக்கவா?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"இவருக்கு ஆரம்பநிலை மீட்டமைவு இல்லை"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"அழிக்கிறது"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"காத்திருக்கவும்..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"எல்லாத் தரவையும் அழி"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"எல்லாத் தரவையும் அழி"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"உங்களின் அனைத்துத் தனிப்பட்ட தகவல்களும் பதிவிறக்கிய ஆப்ஸும் நீக்கப்படும். இதைச் செயல்தவிர்க்க இயலாது."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"பதிவிறக்கிய ஆப்ஸ், சிம்கள் ஆகியவை உட்பட உங்களின் அனைத்துத் தனிப்பட்ட தகவல்களும் நீக்கப்படும். இதைச் செயல்தவிர்க்க இயலாது."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"எல்லாத் தரவையும் அழிக்கவா?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"இவருக்கு ஆரம்பநிலை மீட்டமைவு இல்லை"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"அழிக்கிறது"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"காத்திருக்கவும்…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"அழைப்பு அமைப்பு"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"குரல் அஞ்சல், அழைப்புப் பகிர்வு, அழைப்பு காத்திருப்பு, அழைப்பாளர் ஐடி போன்றவற்றை அமைக்கவும்"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB டெதெரிங்"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> சாதனங்களுக்கு மேல் இணைக்க முடியாது."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> இன் இணைப்புமுறை நீக்கப்படும்."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"ஈத்தர்நெட் இணைப்புமுறை"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"USB ஈத்தர்நெட் மூலம் மொபைலின் இணைய இணைப்பைப் பகிருங்கள்"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"ஈத்தர்நெட் மூலம் மொபைலின் இணைய இணைப்பைப் பகிரும்"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"மொபைல் டேட்டா இணைப்பு வழியாக, மற்ற சாதனங்களுக்கு இண்டர்நெட்டை வழங்க, ஹாட்ஸ்பாட் மற்றும் டெதெரிங் முறையை பயன்படுத்தவும். அருகிலுள்ள சாதனங்களுடன் உள்ளடக்கத்தைப் பகிர, ஆப்ஸும் ஹாட்ஸ்பாட்டை உருவாக்கலாம்."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"உங்கள் வைஃபை அல்லது மொபைல் டேட்டா மூலம் வேறு சாதனங்களுக்கு இணைய இணைப்பை வழங்க ஹாட்ஸ்பாட்டையும் இணைப்பு முறையையும் பயன்படுத்தும். மேலும், அருகிலுள்ள சாதனங்களுடன் உள்ளடக்கத்தைப் பகிர, தனியாக ஒரு ஹாட்ஸ்பாட்டையும் ஆப்ஸ் உருவாக்கலாம்."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"உதவி"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"வசன விருப்பத்தேர்வுகள்"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"பெரிதாக்கல்"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"பெரிதாக்கும் பகுதி"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"பெரிதாக்கலை இயக்குதல்"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"திரையைப் பெரிதாக்கும்போது நீங்கள் பயன்படுத்த விரும்பும் பெரிதாக்கும் பகுதிகளைத் தேர்ந்தெடுக்கவும்"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"முழுத்திரை"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"திரையின் ஒரு பகுதி"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"முழுத்திரை &amp; திரையின் ஒரு பகுதி"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"முழுத்திரையைப் பெரிதாக்கும்"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"திரையின் ஒரு பகுதியைப் பெரிதாக்கும்"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"அணுகல்தன்மை பட்டனுக்கு மாற்றவா?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"திரையின் ஒரு பகுதியைப் பெரிதாக்க மூன்று முறை தட்டலைப் பயன்படுத்துவது தட்டச்சு மற்றும் பிற செயல்களைத் தாமதப்படுத்தும்.\n\nபெரிதாக்க அணுகல்தன்மை பட்டனைப் பயன்படுத்துவதற்கு மாற விரும்புகிறீர்களா?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"அணுகல்தன்மை பட்டனுக்கு மாறு"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"மூன்று முறைத் தட்டிப் பெரிதாக்கும் முறையே தொடர்தல்"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"பெரிதாக்கல் அமைப்புகள்"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"மூன்றுமுறை தட்டிப் பெரிதாக்குதல்"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"ஷார்ட்கட் மூலம் பெரிதாக்குதல்"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"பவர் பட்டன் அழைப்பை நிறுத்தும்"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"பெரிய மவுஸ் பாயிண்டர்"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"அனிமேஷன்களை அகற்று"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"மோனோ ஆடியோ"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"ஆடியோ இயக்கத்தில் இருக்கும் போது சேனல்களை ஒன்றிணைக்கலாம்"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"ஆடியோ பேலன்ஸ்"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"இடது"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"வலது"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"மோனோ ஆடியோ"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"ஆடியோ இயங்கும்போது சேனல்களை ஒன்றிணைக்கலாம்"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"ஆடியோ பேலன்ஸ்"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"இடது"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"வலது"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"இயல்பு"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 விநாடிகள்"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 விநாடிகள்"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"அறிவிப்பு அதிர்வுகள்"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"ரிங் அதிர்வுகள்"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"தொட்டு கருத்து தெரிவித்தல்"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>ஐப் பயன்படுத்து"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ஆப்ஸைத் திற"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"வண்ணத் திருத்தத்தைப் பயன்படுத்து"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"தலைப்புகளைக் காண்பி"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"ஆதரிக்கப்படும் ஆப்ஸுக்கு மட்டும்"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>ஐப் பயன்படுத்து"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ஆப்ஸைத் திற"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"கலர் கரெக்‌ஷனைப் பயன்படுத்து"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"தலைப்புகளைக் காண்பி"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"ஆதரிக்கப்படும் ஆப்ஸுக்கு மட்டும்"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"தலைப்பின் அளவும் நடையும்"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> உரை அளவு"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"மேலும் விருப்பங்கள்"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"டியூட்டரானோமலி"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"பிரோடனோமலி"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"ட்ரைடானோமலி"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"கிரே ஸ்கேல்"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"சிவப்பு-பச்சை"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"சிவப்பு-பச்சை"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"நீலம்-மஞ்சள்"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"பின்னணி உபயோகத்தைக் கட்டுப்படுத்துதல்"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"பின்னணியில் இயங்குவதற்குப் ஆப்ஸை அனுமதிக்கும்"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"பின்னணியில் இயங்குவதற்குப் ஆப்ஸ் அனுமதிக்கப்படவில்லை"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"பின்னணி உபயோகத்தைக் கட்டுப்படுத்த முடியவில்லை"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"பின்னணி உபயோகத்தைக் கட்டுப்படுத்த முடியவில்லை"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"பின்னணி செயல்பாட்டைக் கட்டுப்படுத்தவா?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"ஆப்ஸின் பின்னணி செயல்பாட்டைக் கட்டுப்படுத்தினால், சரியாக வேலை செய்யாது."</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"பேட்டரியை மேம்படுத்த அமைக்கப்படவில்லை, எனவே கட்டுப்படுத்த முடியாது.\n\nஆப்ஸை கட்டுப்படுத்த, பேட்டரி மேம்படுத்தலை ஆன் செய்க."</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"பேட்டரி சேமிப்பு திட்டமிடல்"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"பேட்டரி நிலையை நீட்டிக்கும்"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"சார்ஜ் ஆகும்போது ஆஃப் செய்"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"உங்கள் மொபைலின் பேட்டரி <xliff:g id="PERCENT">%1$s</xliff:g> சார்ஜ் ஆகியிருக்கையில் பேட்டரி சேமிப்பான் ஆஃப் ஆகிவிடும்"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"உங்கள் டேப்லெட்டின் பேட்டரி <xliff:g id="PERCENT">%1$s</xliff:g> சார்ஜ் ஆகியிருக்கையில் பேட்டரி சேமிப்பான் ஆஃப் ஆகிவிடும்"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"உங்கள் சாதனத்தின் பேட்டரி <xliff:g id="PERCENT">%1$s</xliff:g> சார்ஜ் ஆகியிருக்கையில் பேட்டரி சேமிப்பான் ஆஃப் ஆகிவிடும்"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"<xliff:g id="PERCENT">%1$s</xliff:g> மேல் மொபைலின் பேட்டரி சார்ஜ் ஆகும்போது பேட்டரி சேமிப்பான் ஆஃப் ஆகிவிடும்"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"<xliff:g id="PERCENT">%1$s</xliff:g> மேல் டேப்லெட்டின் பேட்டரி சார்ஜ் ஆகும்போது பேட்டரி சேமிப்பான் ஆஃப் ஆகிவிடும்"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"<xliff:g id="PERCENT">%1$s</xliff:g> மேல் சாதனத்தின் பேட்டரி சார்ஜ் ஆகும்போது பேட்டரி சேமிப்பான் ஆஃப் ஆகிவிடும்"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"ஆன் செய்"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"மீட்டமை"</string>
     <string name="tts_play" msgid="2945513377250757221">"இயக்கு"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"சூழல்சார் இணைப்புநிலை"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"உங்கள் நெட்வொர்க் இணைப்புகளைத் தானாக நிர்வகிப்பதன் மூலம் பேட்டரி நிலையை நீட்டிப்பதோடு சாதனச் செயல்திறனையும் மேம்படுத்தும்"</string>
     <string name="credentials_title" msgid="7535942196886123656">"அனுமதிச் சான்று சேமிப்பிடம்"</string>
     <string name="credentials_install" msgid="3933218407598415827">"சான்றிதழை நிறுவுதல்"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"சேமிப்பிடத்திலிருந்து சான்றிதழ்களை நிறுவு"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"பயனரின் அனுமதிச் சான்றுகள்"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"சேமித்த அனுமதிச் சான்றுகளைப் பார்க்கும், திருத்தும்"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"மேம்பட்டது"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"சேமிப்பிடத்தின் வகை"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"வன்பொருள்-காப்புப் பிரதியெடுக்கப்பட்டது"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"மென்பொருள் மட்டும்"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"இவருக்கு நற்சான்றுகளை அணுக அனுமதியில்லை"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN மற்றும் பயன்பாடுகளுக்காக நிறுவியது"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"வைஃபைக்காக நிறுவியது"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"டெர்மினலில் பணம் செலுத்துதல்"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"பேமெண்ட் ஆப்ஸை அமைக்கவும். கான்டாக்ட்லெஸ் சின்னம் கொண்ட எந்த டெர்மினலிலும் உங்கள் மொபைலின் பின்பகுதியைக் காட்டவும்."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"சரி"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"மேலும்..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"மேலும்…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"இயல்புநிலை பேமெண்ட் ஆப்ஸாக அமைத்தல்"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"இயல்புநிலை பேமெண்ட் ஆப்ஸை மாற்றுதல்"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"காண்டாக்ட்லெஸ் டெர்மினலில் <xliff:g id="APP">%1$s</xliff:g> மூலம் பணம் செலுத்தவும்"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"அழைப்புகளுக்கு எப்போதும் இதை பயன்படுத்து"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"தரவுக்கான SIMஐத் தேர்ந்தெடுக்கவும்"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"மெசேஜூக்கான சிம்மைத் தேர்வுசெய்க"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"தரவு சிம் மாறுகிறது, இதற்கு ஒரு நிமிடம் வரை ஆகலாம்..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"டேட்டா சிம்மை மாற்றுகிறது, இதற்கு ஒரு நிமிடம் வரை ஆகலாம்…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"இந்த SIM வழியாக அழை"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"சிம் கார்டைத் தேர்வுசெய்யவும்"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"சிம் <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"வழக்கமான செயல்பாடு, கால அட்டவணை, பேட்டரி சேமிப்பான், மின்சக்தி சேமிப்பான், பேட்டரி, தானியங்கு, சதவீதம்"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, மேம்பட்ட அழைப்பு, 4g அழைப்பு"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"மொழியைச் சேர்க்கவும், ஒரு மொழியைச் சேர்க்கவும்"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"உரை அளவு"</string>
     <string name="default_sound" msgid="6604374495015245195">"இயல்பு ஒலி"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"ஒலி &amp; அறிவிப்பு ஒலியளவு: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"ஒலியளவு, அதிர்வு, தொந்தரவு செய்யாதே"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"ஒலிகளை இயக்கு"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"உடனடி வசன உரை"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"வசன உரைகளைத் தானாக எழுதும்"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"ஏதுமில்லை"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> திட்டமிடல்கள் அமைக்கப்பட்டன</item>
-      <item quantity="one">1 திட்டமிடல் அமைக்கப்பட்டது</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{எதுவுமில்லை}=1{1 திட்டமிடல் அமைக்கப்பட்டது}other{# திட்டமிடல்கள் அமைக்கப்பட்டன}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"தொந்தரவு செய்யாதே"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"முக்கியமான நபர்கள் மற்றும் ஆப்ஸிலிருந்து மட்டும் அறிவிப்புகளைப் பெறு"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"குறுக்கீடுகளைக் குறைத்தல்"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"முக்கியமானவை மட்டும்"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"ஆன் / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"ஆஃப் / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"ஆஃப்"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"ஆன்"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"ஒவ்வொரு முறையும் கேள்"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"ஆஃப் செய்யும் வரை"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> மணிநேரம்</item>
-      <item quantity="one">1 மணிநேரம்</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> நிமிடங்கள்"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> கால அட்டவணைகள் தானாகவே ஆன் செய்யப்படலாம்</item>
-      <item quantity="one">1 கால அட்டவணை தானாகவே ஆன் செய்யப்படலாம்</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{ஒரு மணிநேரம்}other{# மணிநேரம்}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 நிமிடம்}other{# நிமிடங்கள்}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{ஆஃப்}=1{ஆஃப் / 1 திட்டமிடல் தானாகவே ஆன் செய்யப்படலாம்}other{ஆஃப் / # திட்டமிடல்கள் தானாகவே ஆன் செய்யப்படலாம்}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"\'தொந்தரவு செய்ய வேண்டாம்\' அம்சத்தை எவையெல்லாம் குறுக்கிடும்?"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"நபர்கள்"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"ஆப்ஸ்"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"\'ஜென்டிலில்\' குறைந்த முன்னுரிமை அறிவிப்புகளைத் தானாக அமைக்கும்"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"சூழலுக்கேற்ற அறிவிப்புக்கான ரேங்க்"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"தொடர்பின் அடிப்படையில் அறிவிப்புக்களைத் தானாக வரிசைப்படுத்தும்"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"சூழலுக்கேற்ற அறிவிப்புக்கான கருத்து"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"அறிவிப்புகளில் செய்யப்பட்ட மாற்றங்களைக் குறிக்கும் மற்றும் சிஸ்டத்திற்குக் கருத்தை வழங்குவதற்கான விருப்பத்தைக் காட்டும்"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"பரிந்துரைக்கப்படும் செயல்களும் பதில்களும்"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"பரிந்துரைக்கப்படும் செயல்கள் &amp; பதில்களைத் தானாகவே காட்டு"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"சமீபத்திய மற்றும் ஒத்திவைத்த அறிவிப்புகளைக் காட்டும்"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"\'தொந்தரவு செய்யாதே\' அணுகல்"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"’தொந்தரவு செய்ய வேண்டாம்’ அம்சத்தை அனுமதி"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"\'தொந்தரவு செய்யாதே\' அணுகலை நிறுவப்பட்ட ஆப்ஸ் எதுவும் கோரவில்லை"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"ஆப்ஸை ஏற்றுகிறது..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"ஆப்ஸை ஏற்றுகிறது…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"உங்கள் கோரிக்கையின் படி, சாதனத்தில் இந்த ஆப்ஸின் அறிவிப்புகள் தோன்றுவதை Android தடுக்கிறது"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"உங்கள் கோரிக்கையின் படி, இந்தச் சாதனத்தில், இந்த வகை அறிவிப்புகள் தோன்றுவதை Android தடுக்கிறது"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"உங்கள் கோரிக்கையின் படி, இந்தச் சாதனத்தில், இந்தக் குழு அறிவிப்புகள் தோன்றுவதை Android தடுக்கிறது"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"அனைத்து உரையாடல்களும்"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"முன்னுரிமை அளிக்கப்பட்ட உரையாடல்கள்"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"ஏதுமில்லை"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> உரையாடல்கள்</item>
-      <item quantity="one">1 உரையாடல்</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"ஏதுமில்லை"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{எதுவுமில்லை}=1{1 உரையாடல்}other{# உரையாடல்கள்}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"யாரால் குறுக்கிட முடியும்?"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"அழைப்புகள்"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"அழைப்புகள்"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"அனுமதிக்கப்படும் அழைப்புகள் ஒலி எழுப்புமா என்பதை உறுதிப்படுத்த உங்கள் சாதனம் ஒலி எழுப்பும்படி உள்ளதா என்பதைச் சரிபார்க்கவும்"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’க்கு வரும் அழைப்புகள் தடுக்கப்பட்டுள்ளன. உங்களை நண்பர்களோ, குடும்பத்தினரோ, வேறு தொடர்புகளோ தொடர்புகொள்வதற்கு அனுமதிக்க நீங்கள் அமைப்புகளை மாற்றிக்கொள்ளலாம்."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"நட்சத்திரமிட்ட தொடர்புகள்"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> பேர்</item>
-      <item quantity="one">ஒருவர்</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"ஏதுமில்லை"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{எதுவுமில்லை}=1{{contact_1}}=2{{contact_1} &amp; {contact_2}}=3{{contact_1}, {contact_2}, {contact_3} ஆகியோர்}other{{contact_1}, {contact_2} மற்றும் # பேர்}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Messages"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"மெசேஜ்கள்"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Messages"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ என்பதற்கு உள்வரும் மெசேஜ்கள் தடுக்கப்பட்டுள்ளன. உங்களைத் தொடர்புகொள்ள நண்பர்களையோ குடும்பத்தினரையோ வேறு தொடர்புகளையோ அனுமதிக்குமாறு அமைப்புகளை மாற்றிக்கொள்ளலாம்."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"மேசெஜ்கள் அனைத்தையும் பெற முடியும்"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"அழைப்புகள் அனைத்தையும் பெற முடியும்"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"ஏதுமில்லை"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> தொடர்புகள்</item>
-      <item quantity="one">1 தொடர்பு</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{எதுவுமில்லை}=1{1 தொடர்பு}other{# தொடர்புகள்}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"எவரிடம் இருந்தும்"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"தொடர்புகள்"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"நட்சத்திரமிட்ட தொடர்புகள்"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"அனைத்து அறிவிப்புகளும்"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"சில அறிவிப்புகள்"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"ஆப்ஸ் குறுக்கிடுவதை நீங்கள் அனுமதிக்காவிட்டாலும் தேர்ந்தெடுக்கப்பட்ட நபர்களால் உங்களைத் தொடர்பு கொள்ள முடியும்"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> ஆகிய ஆப்ஸால் குறுக்கிட முடியும்</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> ஆப்ஸால் குறுக்கிட முடியும்</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"மேலும் <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{எந்த ஆப்ஸும் குறுக்கிட முடியாது}=1{{app_1} குறுக்கிட முடியும்}=2{{app_1} மற்றும் {app_2} குறுக்கிட முடியும்}=3{{app_1}, {app_2}, {app_3} ஆகியவைக் குறுக்கிட முடியும்}other{{app_1}, {app_2} மற்றும் கூடுதலாக # ஆப்ஸால் குறுக்கிட முடியும்}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"ஆப்ஸ்"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"அனைத்து அறிவிப்புகளும்"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"சில அறிவிப்புகள்"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"குறுக்கிட முடிகின்ற அறிவிப்புகள்"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"அறிவிப்புகள் அனைத்தையும் அனுமதி"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> ஆகிய ஒலிகளால் குறுக்கிட முடியும்</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> குறுக்கிட முடியும்</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"எதுவும் குறுக்கிட முடியாது"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"மேலும் <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{எதுவும் குறுக்கிட முடியாது}=1{{sound_category_1} குறுக்கிட முடியும்}=2{{sound_category_1} மற்றும் {sound_category_2} குறுக்கிட முடியும்}=3{{sound_category_1}, {sound_category_2},{sound_category_3} ஆகியவைக் குறுக்கிட முடியும்}other{{sound_category_1}, {sound_category_2}, மற்றும் கூடுதலாக # குறுக்கிட முடியும்}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"எதுவும் குறுக்கிட முடியாது"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"யாரும் குறுக்கிட முடியாது"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"சிலரால் குறுக்கிட முடியும்"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"அனைவரும் குறுக்கிட முடியும்"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USBயை இதன்மூலம் கட்டுப்படுத்து:"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"இணைக்கப்பட்ட சாதனம்"</string>
     <string name="usb_control_device" msgid="527916783743021577">"இந்தச் சாதனம்"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"மாறுகிறீர்கள்..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"மாற்றுகிறது…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"மாற முடியவில்லை"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"இந்தச் சாதனத்தைச் சார்ஜ் செய்வதற்கு"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"இணைக்கப்பட்ட சாதனத்தைச் சார்ஜ் செய்தல்"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"விவரங்களைக் காட்டு"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"டேட்டா சேமிப்பான்"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"வரம்பற்ற டேட்டா"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"பின்புல டேட்டா உபயோகம் முடக்கப்பட்டது"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"பின்புலத் தரவு ஆஃப் செய்யப்பட்டது"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"ஆன்"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"ஆஃப்"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"டேட்டா சேமிப்பானைப் பயன்படுத்து"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"சாதனம் பூட்டப்பட்டிருந்தால், அறிவிப்புகளில் பதில்கள் அல்லது பிற உரையை உள்ளிடுவதைத் தடு"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"இயல்பு பிழைத்திருத்தி"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"பிழைத்திருத்தியைத் தேர்வுசெய்க"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"பிழைதிருத்தியைப் பயன்படுத்துதல்"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"பிழைதிருத்தியைப் பயன்படுத்து"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"தேர்ந்தெடுக்கவில்லை"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(எதுவுமில்லை)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"சேமிப்பக இடத்தைக் காலியாக்க உதவ, காப்புப் பிரதி எடுக்கப்பட்ட படங்களையும் வீடியோக்களையும் உங்கள் சாதனத்திலிருந்து சேமிப்பக நிர்வாகி அகற்றும்."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"படங்கள் &amp; வீடியோக்களை அகற்று"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"சேமிப்பக நிர்வாகி"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"சேமிப்பக நிர்வாகியைப் பயன்படுத்து"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"சேமிப்பக நிர்வாகியைப் பயன்படுத்து"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"தானியங்கு"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"கைமுறை"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"இப்போதே இடத்தைக் காலியாக்கு"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"மொபைல் திரையில் அறிவிப்புகளைப் பார்க்க, இருமுறை தட்டவும்"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"டேப்லெட் திரையில் அறிவிப்புகளைப் பார்க்க, இருமுறை தட்டவும்"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"சாதனத் திரையில் அறிவிப்புகளைப் பார்க்க, இருமுறை தட்டவும்"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"அறிவிப்புகளுக்கு ஸ்வைப் செய்க"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"அறிவிப்புகளைக் காட்ட, திரையின் கீழ் விளிம்பில் கீழ்நோக்கி ஸ்வைப் செய்யவும்"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"ஒற்றைக் கைப் பயன்முறை"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"ஒற்றைக் கைப் பயன்முறையைப் பயன்படுத்து"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"ஆப்ஸிற்கிடையில் மாறும்போது இதிலிருந்து வெளியேறு"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"நேரம் முடிந்தது"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 வினாடிகள்"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 வினாடிகள்"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 வினாடிகள்"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"ஒற்றைக் கை அணுகல்"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"நேரம், அறிவிப்புகள் மற்றும் பிற தகவலைப் பார்க்கத் திரையை இருமுறை தட்டவும்."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"திரையில் அறிவிப்புகளைப் பார்க்க, மொபைலைக் கையில் எடுக்கவும்"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"திரையில் அறிவிப்புகளை பார்க்க, டேப்லெட்டை கையில் எடுக்கவும்"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"டேப்லெட் திரையில் அறிவிப்புகளைப் பார்க்கத் தட்டவும்"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"சாதனத் திரையில் அறிவிப்புகளைப் பார்க்கத் தட்டவும்"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"நேரம், அறிவிப்புகள் மற்றும் பிற தகவலைப் பார்க்கத் திரையைத் தட்டவும்."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"ஆபத்துக் காலங்களில் பயன்படுத்துவதற்கான பட்டன்"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"பவர் பட்டனை விரைவாக 5 முறை அழுத்துவதன் மூலம் அவசரகால SOS செயல்களைத் தொடங்கலாம்."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"எச்சரிக்கை ஒலி"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"செயல்களைத் தொடங்கும் முன் விழிப்பூட்டும்"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"அவசரகாலத் தொடர்புகள்"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"அறிவிப்புகளைப் பெற சென்சாரில் ஸ்வைப் செய்தல்"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"கைரேகை ஸ்வைப்"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"அறிவிப்புகளைப் பார்க்க, மொபைலின் பின்புறத்தில் உள்ள கைரேகை சென்சாரில் கீழ் நோக்கி ஸ்வைப் செய்தல்."</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"அனைத்து ஆப்ஸிற்கும் இயக்குதல்"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Graphics Driverரைத் தேர்ந்தெடுத்தல்"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"இயல்பு"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Game Driver"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"கேம் டிரைவர்"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"டெவெலப்பர் டிரைவர்"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"System Graphics Driver"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"நெட்வொர்க்குகளைக் கண்டறிய முடியவில்லை. மீண்டும் முயலவும்."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(தடுக்கப்பட்டது)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"சிம் கார்டு இல்லை"</string>
+    <string name="sim_card" msgid="6381158752066377709">"சிம்"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"சிம் இல்லை"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"ஏதுமில்லை"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"இணைப்பதற்கு சிம் தேவைப்படுகிறது"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"இணைப்பதற்கு <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> சிம் தேவைப்படுகிறது"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"விருப்பமான நெட்வொர்க் பயன்முறை: WCDMAக்கு முன்னுரிமை"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"விருப்பமான நெட்வொர்க் பயன்முறை: GSM மட்டும்"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"விருப்பமான நெட்வொர்க் பயன்முறை: WCDMA மட்டும்"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"மொபைல் டேட்டா"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"மொபைல் நெட்வொர்க் மூலம் டேட்டாவைப் பயன்படுத்துதல்"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"தொடர்பு எல்லையில் இருக்கும்போது மொபைல் தானாகவே இந்த மொபைல் நிறுவனத்தின் சேவைக்கு மாறிவிடும்"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"சிம் கார்டு எதுவும் இல்லை"</string>
     <string name="calls_preference" msgid="2166481296066890129">"அழைப்புகளின் விருப்பம்"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS விருப்பம்"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"ஒவ்வொரு முறையும் கேள்"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"அமைப்புகளில் திரை மேலடுக்கை அனுமதித்தல்"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"அமைப்புகள் திரைகளுக்கு மேலாகக் காட்டுவதற்கு மற்ற ஆப்ஸில் டிஸ்ப்ளே செய்யப்படக்கூடிய ஆப்ஸை அனுமதிக்கும்"</string>
     <string name="media_controls_title" msgid="403271085636252597">"மீடியா"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"மீடியா அமர்வு முடிந்தபிறகு பிளேயரை மறை"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"விரிவாக்கப்பட்ட விரைவு அமைப்புகள் பேனலிலிருந்து அமர்வு ஒன்றை மீண்டும் தொடங்க இந்தப் பிளேயர் அனுமதிக்கும்."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"விரைவு அமைப்புகளில் மீடியா பிளேயர்"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"பிளேபேக்கை எளிதாக மீண்டும் தொடங்க மீடியா பிளேயரை கூடுதல் நேரத்துக்குக் காண்பிக்கும்"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"பிளேயர் மறை"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"பிளேயரைக் காட்டு"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"பிளேயர்கள் எதுவுமில்லை"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"அனுமதிக்கப்படும் ஆப்ஸ்"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"மீடியா"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"புளூடூத் ஆன் செய்யப்படும்"</string>
 </resources>
diff --git a/res/values-te/arrays.xml b/res/values-te/arrays.xml
index 68d5427..93ffc1f 100644
--- a/res/values-te/arrays.xml
+++ b/res/values-te/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"మధ్యస్థం"</item>
     <item msgid="6740026006576843477">"ఎక్కువ సేపు"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"చిన్నగా"</item>
+    <item msgid="7397961711906421599">"మధ్యస్థంగా"</item>
+    <item msgid="4079132024502041928">"ఎక్కువగా"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"ఆటోమేటిక్"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"అంతర్జాతీయ"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA మాత్రమే"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"గ్లోబల్"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 23133c1..e78ebd1 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"లాక్ స్క్రీన్‌లో ప్రొఫైల్ సమాచారాన్ని చూపు"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"ఖాతాలు"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"లొకేషన్"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"లొకేషన్‌ను ఉపయోగించండి"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"లొకేషన్‌ను ఉపయోగించండి"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"ఆఫ్"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">లొకేషన్ ఆన్‌లో ఉన్నప్పుడు - <xliff:g id="COUNT_1">%1$d</xliff:g> యాప్‌లకు లొకేషన్ యాక్సెస్ ఉంటుంది</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"ప్రామాణీకరించడానికి మీ ముఖం ఉపయోగించండి"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"ప్రారంభం"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"యాక్సెసిబిలిటీ ఫేస్ అన్‌లాక్ ఆఫ్ చేయబడితే, కొన్ని సెటప్ దశలు TalkBackతో సరిగా పని చేయకపోవచ్చు."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"వెనుకకు"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"సెటప్‌ను కొనసాగించు"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"యాక్సెసిబిలిటీ సెటప్‌ని ఉపయోగించు"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="one"><xliff:g id="NUMBER_0">%d</xliff:g> కంటే తక్కువ అంకె తప్పక ఉండాలి</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"ఇటీవలి పిన్‌ని ఉపయోగించడానికి డివైజ్ నిర్వాహకులు అనుమతించరు"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"సాధారణ PINలను మా IT నిర్వాహకుడు బ్లాక్ చేసారు. వేరే PINని ప్రయత్నించండి."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"ఇందులో చెల్లని అక్షరం ఉండకూడదు"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"తప్పనిసరిగా కనీసం ఒక అక్షరాన్ని కలిగి ఉండాలి"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"తప్పనిసరిగా కనీసం ఒక అంకెను కలిగి ఉండాలి"</string>
@@ -653,7 +655,6 @@
       <item quantity="one">తప్పనిసరిగా కనీసం 1 అసంఖ్యాత్మక అక్షరాన్ని కలిగి ఉండాలి</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"ఇటీవలి పాస్‌వర్డ్‌ను ఉపయోగించడానికి పరికర నిర్వాహకులు అనుమతించరు"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"సాధారణ పాస్‌వర్డ్‌లను మా IT నిర్వాహకుడు బ్లాక్ చేసారు. వేరే పాస్‌వర్డ్‌ని ప్రయత్నించండి."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"అంకెలను ఆరోహణ, అవరోహణ క్రమంలో లేదా ఒకే అంకెను వరుసగా పునరావృతంగా ఉపయోగించకూడదు"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"నిర్ధారించండి"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"రద్దు చేయి"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Wi‑Fiని ప్రారంభించండి"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Wi-Fiని ఉపయోగించండి"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Wi-Fiని ఉపయోగించండి"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wi‑Fi సెట్టింగ్‌లు"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"వైర్‌లెస్ యాక్సెస్ స్థానాలను సెటప్ చేయండి &amp; నిర్వహించండి"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"“<xliff:g id="SSID">%1$s</xliff:g>”కి కనెక్ట్ అవ్వడానికి ఈ కింద QR కోడ్ నమోదు చేయండి"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"QR కోడ్‌ని స్కాన్ చేయడం ద్వారా Wi‑Fiలో చేరండి"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Wi‑Fi షేర్ చేయి"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"“<xliff:g id="SSID">%1$s</xliff:g>”కు కనెక్ట్ చేయడానికి, అలాగే షేర్ చేయడానికి ఈ QR కోడ్‌ను స్కాన్ చేయండి"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"“<xliff:g id="SSID">%1$s</xliff:g>”లో చేరడానికి వేరొక పరికరంతో ఈ QR కోడ్‌ను స్కాన్ చేయండి"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"“<xliff:g id="SSID">%1$s</xliff:g>”కు కనెక్ట్ చేయడానికి ఈ QR కోడ్‌ను స్కాన్ చేయండి"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"మళ్లీ ప్రయత్నించండి. సమస్య ఇంకా కొనసాగితే, పరికరం తయారీదారుని సంప్రదించండి"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"ఏదో తప్పు జరిగింది"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi‑Fi పాస్‌వర్డ్: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"హాట్‌స్పాట్ పాస్‌వర్డ్: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"ఆటోమేటిక్-కనెక్ట్"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"ఫోన్ ఈ నెట్‌వర్క్ సమీపంలోకి రాగానే, ఆటోమేటిక్‌గా కనెక్ట్ అయ్యేలా అనుమతించండి"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"ఈ నెట్‌వర్క్ సమీపంలో ఆటోమేటిక్‌గా కనెక్ట్ అవ్వడానికి టాబ్లెట్‌ను అనుమతించండి"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"పరిధిలో ఉన్నప్పుడు ఈ నెట్‌వర్క్‌కు కనెక్షన్‌ని అనుమతించండి"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"పరికరాన్ని జోడించండి"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"ఈ నెట్‌వర్క్‌కు పరికరాన్ని జోడించడానికి QR కోడ్‌ను ఉపయోగించండి"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR కోడ్ చెల్లుబాటు అయ్యే ఫార్మాట్‌లో లేదు"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"సిస్టమ్ సర్టిఫికెట్‌లను ఉపయోగించు"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"అందించవద్దు"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"ప్రామాణీకరించవద్దు"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"సర్టిఫికెట్ ఏదీ పేర్కొనబడలేదు. మీ కనెక్షన్ ప్రైవేట్‌గా ఉండదు."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"నెట్‌వర్క్ పేరు చాలా పొడవుగా ఉంది."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"తప్పనిసరిగా డొమైన్‌ను పేర్కొనాలి."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"సర్టిఫికెట్ అవసరం."</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"కనెక్ట్ చేయి"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi‑Fi ఆన్ చేయబడింది"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>కు కనెక్ట్ అయ్యింది"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>కు కనెక్ట్ చేయబడుతోంది"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"కనెక్ట్ అవుతోంది…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"నెట్‌వర్క్‌కు కనెక్ట్ చేయడం విఫలమైంది"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"నెట్‌వర్క్ పరిధిలో లేదు"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"యాప్ కంటెంట్‌ని షేర్ చేస్తోంది. ఇంటర్నెట్ కనెక్షన్‌ని షేర్ చేయాలంటే, హాట్‌స్పాట్‌ని ఆఫ్ చేసి, ఆన్ చేయండి"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"పాస్‌వర్డ్‌ సెట్ చేయలేదు"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"హాట్‌స్పాట్ పేరు"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>ని ఆన్ చేస్తోంది..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>ను ఆన్ చేస్తోంది…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"ఇతర పరికరాలు <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>కు కనెక్ట్ కావచ్చు"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"హాట్‌స్పాట్ పాస్‌వర్డ్‌"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP బ్యాండ్"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"స్మూత్ డిస్‌ప్లే"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"కొంత కంటెంట్ కోసం రిఫ్రెష్ రేటును ఆటోమేటిక్‌గా 60 నుండి 90 Hz వరకు పెంచుతుంది. బ్యాటరీ వినియోగం పెరుగుతుంది."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"స్మూత్ డిస్‌ప్లే"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"ఫోర్స్ 90 Hz రిఫ్రెష్ రేటు"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"మెరుగైన స్పర్శ ప్రతిస్పందన &amp; యానిమేషన్ నాణ్యత కోసం అత్యధిక రిఫ్రెష్ రేటు. ఇది బ్యాటరీ వినియోగం పెరిగేలా చేస్తుంది."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"స్క్రీన్ అటెన్ష‌న్‌"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"ఆన్ / మీరు స్క్రీన్ వేపే చూస్తూ ఉంటే అది ఆఫ్ కాదు"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android వెర్షన్"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android భద్రతా అప్‌డేట్"</string>
     <string name="model_info" msgid="8997566254717810904">"మోడల్"</string>
-    <string name="model_summary" msgid="2246651782442466213">"మోడల్: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"మోడల్ &amp; హార్డ్‌వేర్"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"హార్డ్‌వేర్ వెర్షన్"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ఉపకరణం ID"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"నెట్‌వర్క్ సెట్టింగ్‌లు రీసెట్ చేయబడ్డాయి"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"SIMల డేటాను తొలగించలేకపోయింది"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"ఎర్రర్ కారణంగా డౌన్‌లోడ్ చేసిన SIMలను తొలగించలేకపోయింది.\n\nమీ పరికరాన్ని పునఃప్రారంభించి, ఆపై మళ్లీ ప్రయత్నించండి."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"మొత్తం డేటాను తొలగించండి (ఫ్యాక్టరీ రీసెట్)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"మొత్తం డేటాను తొలగించండి (ఫ్యాక్టరీ రీసెట్)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"ఇందువలన మీ టాబ్లెట్ యొక్క "<b>"అంతర్గత నిల్వ"</b>", నుండి వీటితో సహా, మొత్తం డేటా సమూలంగా తొలగించబడుతుంది:\n\n"<li>"మీ Google ఖాతా"</li>\n<li>"సిస్టమ్ మరియు యాప్ డేటా మరియు సెట్టింగ్‌లు"</li>\n<li>"డౌన్‌లోడ్ చేసిన యాప్‌లు"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"ఇందువలన మీ ఫోన్ యొక్క "<b>"అంతర్గత నిల్వ"</b>" నుండి వీటితో సహా, మొత్తం డేటా తొలగించబడుతుంది:\n\n"<li>"మీ Google ఖాతా"</li>\n<li>"సిస్టమ్ మరియు యాప్ డేటా మరియు సెట్టింగ్‌లు"</li>\n<li>"డౌన్‌లోడ్ చేసిన యాప్‌లు"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"మీరు ప్రస్తుతం క్రింది ఖాతాలకు సైన్ ఇన్ చేసారు:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"ఈ పరికరంలో ఇతర వినియోగదారులు ఉన్నారు.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"సంగీతం"</li>\n<li>"ఫోటోలు"</li>\n<li>"ఇతర వినియోగదారు డేటా"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIMలు"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"ఇది మొబైల్ సేవా ప్లాన్‌ని రద్దు చేయదు."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"సంగీతం, చిత్రాలు మరియు ఇతర వినియోగదారు డేటాను క్లియర్ చేయడానికి, "<b>"USB నిల్వ"</b>"ను ఎరేజ్ చేయాల్సి ఉంటుంది."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"సంగీతం, చిత్రాలు మరియు ఇతర వినియోగదారు డేటాను క్లియర్ చేయడానికి, "<b>"SD కార్డు"</b>"ను ఎరేజ్ చేయాల్సి ఉంటుంది."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"మొత్తం డేటాను తొలగించు (ఫ్యాక్టరీ రీసెట్)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"మొత్తం డేటాను తొలగించు (ఫ్యాక్టరీ రీసెట్)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"ఇది మీ టాబ్లెట్ యొక్క "<b>"అంతర్గత స్టోరేజ్"</b>" నుండి ఇక్కడున్న వాటితో సహా, మొత్తం డేటాను తొలగిస్తుంది:\n\n"<li>"మీ Google ఖాతా"</li>\n<li>"సిస్టమ్‌తో పాటు యాప్ డేటా, అలాగే సెట్టింగ్‌లు"</li>\n<li>"డౌన్‌లోడ్ చేయబడిన యాప్‌లు"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"ఇది మీ ఫోన్ యొక్క "<b>"అంతర్గత స్టోరేజ్"</b>" నుండి ఇక్కడున్న వాటితో సహా, మొత్తం డేటాను తొలగిస్తుంది:\n\n"<li>"మీ Google ఖాతా"</li>\n<li>"సిస్టమ్‌తో పాటు యాప్ డేటా, అలాగే సెట్టింగ్‌లు"</li>\n<li>"డౌన్‌లోడ్ చేయబడిన యాప్‌లు"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"మీరు ప్రస్తుతం కింది ఖాతాలకు సైన్ ఇన్ చేశారు:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"ఈ పరికరంలో ఇతర యూజర్‌లు ఉన్నారు.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"సంగీతం"</li>\n<li>"ఫోటోలు"</li>\n<li>"ఇతర యూజర్ డేటా"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIMలు"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"ఇది మీ మొబైల్ సర్వీస్ ప్లాన్‌ను రద్దు చేయదు."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"సంగీతం, ఫోటోలు, ఇతర యూజర్ డేటాను క్లియర్ చేయడానికి, "<b>"USB స్టోరేజ్"</b>"ను తొలగించాల్సి ఉంటుంది."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"సంగీతం, ఫోటోలు, ఇతర యూజర్ డేటాను క్లియర్ చేయడానికి, "<b>"SD కార్డు"</b>" డేటాను తొలగించాల్సి ఉంటుంది."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USB నిల్వను ఎరేజ్ చేయి"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SD కార్డుని ఎరేజ్ చేయి"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"అంతర్గత USB నిల్వలోని డేటా అంతటినీ అనగా సంగీతం లేదా ఫోటోల వంటివి ఎరేజ్ చేయి"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"SD కార్డు‌లో సంగీతం లేదా ఫోటోల వంటి మొత్తం డేటాను ఎరేజ్ చేయి"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"డేటా మొత్తాన్ని తొలగించు"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"డేటా మొత్తాన్ని తొలగించు"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"మీ మొత్తం వ్యక్తిగత సమాచారంతో పాటు డౌన్‌లోడ్ చేసిన యాప్‌లు అన్నీ సమూలంగా తొలగించబడతాయి. మీరు ఈ చర్యను తిరిగి ఉపసంహరించలేరు."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"మీ మొత్తం వ్యక్తిగత సమాచారంతో పాటు డౌన్‌లోడ్ చేసిన యాప్‌లు, SIMలు అన్నీ సమూలంగా తొలగించబడతాయి. మీరు ఈ చర్యను తిరిగి ఉపసంహరించలేరు."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"ప్రతిదాన్ని ఎరేజ్ చేయి"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"సిస్టమ్ క్లియర్ సేవ అందుబాటులో లేనందున రీసెట్ చేయడం అమలు కాలేదు."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"మొత్తం డేటాను తొలగించాలా?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"ఈ వినియోగదారుకి ఫ్యాక్టరీ రీసెట్ అందుబాటులో లేదు"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"ఎరేజ్ చేస్తోంది"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"దయచేసి వేచి ఉండండి..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"డేటా మొత్తాన్ని తొలగించు"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"డేటా మొత్తాన్ని తొలగించు"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"మీ మొత్తం వ్యక్తిగత సమాచారంతో పాటు డౌన్‌లోడ్ చేసిన యాప్‌లు అన్నీ సమూలంగా తొలగించబడతాయి. ఒక్కసారి డేటాను తొలగిస్తే మళ్లీ వెనక్కు తెచ్చుకోలేరు."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"మీ మొత్తం వ్యక్తిగత సమాచారంతో పాటు డౌన్‌లోడ్ చేసిన యాప్‌లు, SIMలు అన్నీ సమూలంగా తొలగించబడతాయి. ఒక్కసారి డేటాను తొలగిస్తే మళ్లీ వెనక్కు తెచ్చుకోలేరు."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"మొత్తం డేటాను తొలగించాలా?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"ఈ యూజర్‌కు ఫ్యాక్టరీ రీసెట్ అందుబాటులో లేదు"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"తొలగిస్తోంది"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"దయచేసి వేచి ఉండండి…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"కాల్ సెట్టింగ్‌లు"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"వాయిస్ మెయిల్‌ను, కాల్ ఫార్వార్డింగ్‌ను, కాల్ వెయిటింగ్‌ను, కాలర్ IDని సెటప్ చేయండి"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB టీథరింగ్"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> కంటే ఎక్కువ పరికరాలకు టీథర్ చేయబడవు."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> అన్‌టీథెర్ చేయబడుతుంది."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"ఈథర్‌నెట్ టెథరింగ్"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"USB ఈథర్‌నెట్ ద్వారా ఫోన్ ఇంటర్నెట్ కనెక్షన్‌ను షేర్ చేయండి"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"ఈథర్‌నెట్ ద్వారా ఫోన్ ఇంటర్నెట్ కనెక్షన్‌ను షేర్ చేయండి"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"మీ మొబైల్ డేటా కనెక్షన్ ద్వారా ఇతర పరికరాలకు ఇంటర్నెట్‌ని అందించడం కోసం హాట్‌స్పాట్ మరియు టెథెరింగ్‌ని ఉపయోగించండి. ఇంకా, యాప్‌లు సమీప పరికరాలతో కంటెంట్‌ని షేర్ చేయడం కోసం హాట్‌స్పాట్‌ని సృష్టించవచ్చు."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"మీ Wi‑Fi లేదా మొబైల్ డేటా కనెక్షన్ ద్వారా ఇతర పరికరాలకు ఇంటర్నెట్‌ను అందించడం కోసం హాట్‌స్పాట్ మరియు టెథరింగ్‌ను ఉపయోగించండి. సమీప పరికరాలతో కంటెంట్‌ను షేర్ చేయడం కోసం యాప్‌లు కూడా హాట్‌స్పాట్‌ను రూపొందించవచ్చు."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"సహాయం"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"క్యాప్షన్ ప్రాధాన్యతలు"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"మాగ్నిఫికేషన్"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"మాగ్నిఫికేషన్ ప్రాంతం"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"మాగ్నిఫికేషన్ ఎనేబుల్"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"స్క్రీన్‌ను మాగ్నిఫై చేస్తున్నప్పుడు మీరు ఉపయోగించాలనుకుంటున్న మాగ్నిఫికేషన్ ప్రాంతము(ల)ను ఎంచుకోండి"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"ఫుల్ స్క్రీన్"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"స్క్రీన్‌లో భాగం"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"ఫుల్ స్క్రీన్ &amp; స్క్రీన్‌లో భాగం"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"స్క్రీన్ మొత్తాన్ని మాగ్నిఫై చేయండి"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"స్క్రీన్‌లో భాగాన్ని మాగ్నిఫై చేయండి"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"యాక్సెసిబిలిటీ బటన్‌కు స్విచ్ చేయాలా?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"స్క్రీన్‌లోని కొంత భాగాన్ని మాగ్నిఫై చేయడానికి మూడు సార్లు ట్యాప్ చేయడం వల్ల టైప్ చేయడం, అలాగే ఇతర చర్యలు ఆలస్యమవుతాయి.\n\nమీరు మాగ్నిఫై చేయడానికి యాక్సెసిబిలిటీ బటన్‌ను ఉపయోగించేలా స్విచ్ చేయాలనుకుంటున్నారా?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"యాక్సెసిబిలిటీ బటన్‌కు స్విచ్ చేయి"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"మాగ్నిఫై చేయడానికి మూడు సార్లు ట్యాప్‌ ఎంపికను ఉంచండి"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"మాగ్నిఫికేషన్ సెట్టింగ్‌లు"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"మూడుసార్లు నొక్కడంతో మాగ్నిఫై చేయండి"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"షార్ట్‌కట్‌తో మాగ్నిఫై చేయండి"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"పవర్ బటన్ కాల్‌ను ముగిస్తుంది"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"పెద్ద మౌస్ పాయింటర్"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"యానిమేషన్‌లను తీసివేయండి"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"మోనో ఆడియో"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"ఆడియో ప్లే చేసేటప్పుడు ఛానెల్‌లను మిళితం చేస్తుంది"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"ఆడియో బ్యాలెన్స్"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"ఎడమ"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"కుడి"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"మోనో ఆడియో"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"ఆడియో ప్లే చేసేటప్పుడు ఛానెల్‌లను మిళితం చేస్తుంది"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"ఆడియో బ్యాలెన్స్"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"ఎడమ"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"కుడి"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"డిఫాల్ట్"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 సెకన్లు"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 సెకన్లు"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"నోటిఫికేషన్ వైబ్రేషన్"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"రింగ్ వైబ్రేషన్"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"స్పర్శ ప్రతిస్పందన"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>‌ను ఉపయోగించు"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>‌ను తెరువు"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"\'కలర్‌ను సరిచేయడం\' అనే ఫీచర్‌ను ఉపయోగించు"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"క్యాప్షన్‌లను చూపించు"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"మద్దతు ఉన్న యాప్ కోసం మాత్రమే"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>ను ఉపయోగించు"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>‌ను తెరవండి"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"\'కలర్-సరిచేయడం\' ఫీచర్‌ను ఉపయోగించండి"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"క్యాప్షన్‌లను చూపించు"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"సపోర్ట్ ఉన్న యాప్ కోసం మాత్రమే"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"క్యాప్షన్ సైజు, శైలి"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> టెక్స్ట్ సైజ్"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"మరిన్ని ఎంపికలు"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"డ్యూటెరానోమలీ"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"ప్రొటానోమలీ"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"ట్రైటనోమలీ"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"గ్రేస్కేల్"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"ఎరుపు-ఆకుపచ్చ రంగు"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"ఎరుపు-ఆకుపచ్చ రంగు"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"నీలం-పసుపు"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"బ్యాక్‌గ్రౌండ్ ప‌రిమితి"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"నేపథ్యంలో అమలు కావడానికి అనువర్తనాన్ని అనుమతించండి"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"నేపథ్యంలో అమలు కావడానికి యాప్ అనుమతించబడలేదు"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"నేపథ్య వినియోగం పరిమితం చేయబడదు"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"బ్యాక్‌గ్రౌండ్ వినియోగం పరిమితం చేయబడదు"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"నేపథ్య కార్యకలాపాన్ని పరిమితం చేయాలా?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"మీరు యాప్ నేపథ్య కార్యకలాపాన్ని పరిమితం చేస్తే, అది సరిగ్గా పని చేయకపోవచ్చు."</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"ఈ యాప్ బ్యాటరీని ఆప్టిమైజ్ చేయికి సెట్ చేయబడలేదు కనుక, దీన్ని మీరు పరిమితం చేయలేరు.\n\nయాప్‌ను పరిమితం చేయడానికి, మొదట బ్యాటరీ ఆప్టిమైజేషన్‌ను ఆన్ చేయండి."</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"షెడ్యూల్ సెట్ చేయండి"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"బ్యాటరీ జీవితకాలాన్ని పెంచుకోండి"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"ఛార్జ్ అయ్యాక ఆఫ్ చేయండి"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"మీ ఫోన్ ఛార్జింగ్ <xliff:g id="PERCENT">%1$s</xliff:g> వద్దకు చేరినప్పుడు బ్యాటరీ సేవర్ ఆఫ్ అవుతుంది"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"మీ టాబ్లెట్ ఛార్జింగ్ <xliff:g id="PERCENT">%1$s</xliff:g> వద్దకు చేరినప్పుడు బ్యాటరీ సేవర్ ఆఫ్ అవుతుంది"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"మీ పరికరంలో బ్యాటరీ స్థాయి <xliff:g id="PERCENT">%1$s</xliff:g> వద్ద ఉన్నప్పుడు బ్యాటర్ సేవర్ ఆఫ్ అవుతుంది"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"మీ ఫోన్ <xliff:g id="PERCENT">%1$s</xliff:g> కంటే ఎక్కువగా ఛార్జ్ అయినప్పుడు బ్యాటరీ సేవర్ ఆఫ్ అవుతుంది"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"మీ టాబ్లెట్ <xliff:g id="PERCENT">%1$s</xliff:g> కంటే ఎక్కువగా ఛార్జ్ అయినప్పుడు బ్యాటరీ సేవర్ ఆఫ్ అవుతుంది"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"మీ పరికరం <xliff:g id="PERCENT">%1$s</xliff:g> కంటే ఎక్కువగా ఛార్జ్ అయినప్పుడు బ్యాటరీ సేవర్ ఆఫ్ అవుతుంది"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"ఆన్ చేయి"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"రీసెట్ చేయి"</string>
     <string name="tts_play" msgid="2945513377250757221">"ప్లే చేయి"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"అనుకూల కనెక్టివిటీ"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"మీ నెట్‌వర్క్ కనెక్షన్‌లను ఆటోమేటిక్‌గా మేనేజ్ చేయడం ద్వారా బ్యాటరీ జీవితకాలాన్ని పొడిగిస్తుంది, అలాగే పరికర పనితీరును మెరుగుపరుస్తుంది"</string>
     <string name="credentials_title" msgid="7535942196886123656">"ఆధారాల నిల్వ"</string>
     <string name="credentials_install" msgid="3933218407598415827">"సర్టిఫికెట్ ఇన్‌స్టాల్ చేయండి"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"నిల్వ నుండి స‌ర్టిఫికెట్‌ల‌ను ఇన్‌స్టాల్ చేయండి"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"యూజర్ ఆధారాలు"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"నిల్వ ఉన్న ఆధారాలను చూడండి, వాటిని సవరించండి"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"అధునాతన సెట్టింగ్‌లు"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"నిల్వ రకం"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"హార్డ్‌వేర్ మద్దతు"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"సాప్ట్‌వేర్ మాత్రమే"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"ఈ వినియోగదారు కోసం ఆధారాలు అందుబాటులో లేవు"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN మరియు అనువర్తనాల కోసం ఇన్‌స్టాల్ చేయబడింది"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi కోసం ఇన్‌స్టాల్ చేయబడింది"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"టెర్మినల్ వద్ద చెల్లించడం"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"చెల్లింపు యాప్ సెటప్ చేయండి. ఆపై తాకకూడదనే చిహ్నం ఉండే ఏదైనా టెర్మినల్ వద్ద మీ ఫోన్ వెనుక భాగం పైకి ఉండేలా పట్టుకోండి."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"అర్థమైంది"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"మరిన్ని..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"మరిన్ని…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"డిఫాల్ట్ చెల్లింపు యాప్‌ను సెట్ చెయ్యండి"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"డిఫాల్ట్ చెల్లింపు యాప్‌ను అప్‌డేట్ చెయ్యండి"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"స్పర్శరహిత టెర్మినల్ వద్ద, <xliff:g id="APP">%1$s</xliff:g> ద్వారా చెల్లించండి"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"కాల్‌ల కోసం దీన్ని ఎల్లప్పుడూ ఉపయోగించు"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"డేటా కోసం SIMను ఎంచుకోండి"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"SMS కోసం SIM కార్డ్‌ను ఎంచుకోండి"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"డేటా SIMని మార్చుతోంది, ఇందుకు ఒక నిమిషం పట్టవచ్చు..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"డేటా SIMను మార్చుతోంది, ఇందుకు ఒక నిమిషం పట్టవచ్చు…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"దీనితో కాల్ చేయండి"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"సిమ్ కార్డును ఎంచుకోండి"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"సిమ్ <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"సాధారణ సమయం, షెడ్యూల్, బ్యాటరీ సేవర్, పవర్ సేవర్, బ్యాటరీ, ఆటోమేటిక్, శాతం"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, అధునాతన కాలింగ్, 4g కాలింగ్"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"భాషను జోడించు, ఒక భాషను జోడించు"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"టెక్స్ట్ సైజ్"</string>
     <string name="default_sound" msgid="6604374495015245195">"డిఫాల్ట్ ధ్వని"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"రింగ్ &amp; నోటిఫికేషన్ వాల్యూమ్ <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"వాల్యూమ్, వైబ్రేషన్, అంతరాయం కలిగించవద్దు"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"పవర్ ఆన్ చేసేటప్పుడు ధ్వనులు"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"లైవ్ క్యాప్షన్"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"మీడియాకు ఆటోమేటిక్ శీర్షికలు"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"ఏవీ లేవు"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> షెడ్యూల్‌లు సెట్ చేయబడ్డాయి</item>
-      <item quantity="one">1 షెడ్యూల్ సెట్ చేయబడింది</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{ఏవీ లేవు}=1{1 షెడ్యూల్ సెట్ చేయబడింది}other{# షెడ్యూల్‌లు సెట్ చేయబడ్డాయి}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"అంతరాయం కలిగించవద్దు"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"ముఖ్యమైన వ్యక్తులు, యాప్‌ల నుంచి వచ్చే నోటిఫికేషన్‌లను మాత్రమే అందించు"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"అంతరాయాలను పరిమితం చేయండి"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"ప్రాధాన్యత మాత్రమే"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"ఆన్‌ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"ఆఫ్ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"ఆఫ్"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"ఆన్"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"ప్రతిసారి అడుగు"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"మీరు ఆఫ్ చేసే వరకు"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> గంటలు</item>
-      <item quantity="one">1 గంట</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> నిమిషాలు"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> షెడ్యూల్‌లు ఆటోమేటిక్‌గా ఆన్ అవుతాయి</item>
-      <item quantity="one">1 షెడ్యూల్ ఆటోమేటిక్‌గా ఆన్ అవుతుంది</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 గంట}other{# గంటలు}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 నిమిషం}other{# నిమిషాలు}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{ఆఫ్‌లో ఉంది}=1{ఆఫ్ / 1 షెడ్యూల్ ఆటోమేటిక్‌గా ఆన్ అవుతుంది}other{ఆఫ్ / # షెడ్యూల్ ఆటోమేటిక్‌గా ఆన్ అవుతుంది}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"\'అంతరాయం కలిగించవద్దు\'కు ఏది ఆటంకం కలిగించగలదు"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"వ్యక్తులు"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"యాప్‌లు"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"తక్కువ ప్రాధాన్యత నోటిఫికేషన్‌లను ఆటోమేటిక్‌గా సాధారణానికి సెట్ చేసి ఉంచుతుంది"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"అనుకూల నోటిఫికేషన్ ర్యాంకింగ్"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"ఇది నోటిఫికేషన్‌లను ఔచిత్యాన్ని బట్టి ఆటోమేటిక్‌గా ర్యాంక్ చేస్తుంది"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"అనుకూల నోటిఫికేషన్ ఫీడ్‌బ్యాక్"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"నోటిఫికేషన్‌లకు చేసిన సర్దుబాట్లను సూచిస్తుంది, అలాగే సిస్టమ్‌కు ఫీడ్‌బ్యాక్‌ను అందించే ఆప్షన్‌ను చూపుతుంది"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"సూచించబడిన చర్యలు, ప్రత్యుత్తరాలు"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"చర్య సూచనలు &amp; ప్రత్యుత్తరాలను ఆటోమేటిక్‌గా చూపుతుంది"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"ఇటీవలి మరియు స్నూజ్ చేయబడిన నోటిఫికేషన్‌లను చూపించు"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"అంతరాయం కలిగించవద్దు యాక్సెస్"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"\'అంతరాయం కలిగించవద్దు\' ఫీచర్‌ను అనుమతించు"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"ఇన్‌స్టాల్ చేసిన యాప్‌లేవీ అంతరాయం కలిగించవద్దు యాక్సెస్ అభ్యర్థించలేదు"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"అనువర్తనాలను లోడ్ చేస్తోంది..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"అప్లికేషన్‌లను లోడ్ చేస్తోంది…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"మీ అభ్యర్ధన మేరకు Android, ఈ పరికరంలో ఈ యాప్ యొక్క నోటిఫికేషన్‌లను కనిపించకుండా బ్లాక్ చేస్తోంది"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"మీ అభ్యర్ధన మేరకు Android, ఈ పరికరంలో ఈ వర్గం యొక్క నోటిఫికేషన్‌లను కనిపించకుండా బ్లాక్ చేస్తోంది"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"మీ అభ్యర్ధన మేరకు Android, ఈ పరికరంలో ఈ సమూహం యొక్క నోటిఫికేషన్‌లను కనిపించకుండా బ్లాక్ చేస్తోంది"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"అన్ని సంభాషణలు"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"ప్రాధాన్య సంభాషణలు"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"ఏదీ లేదు"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> సంభాషణలు</item>
-      <item quantity="one">1 సంభాషణ</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"ఏదీ లేదు"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{ఏవీ లేవు}=1{1 సంభాషణ}other{# సంభాషణలు}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"ఎవరు అంతరాయం కలిగించగలరు"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"కాల్‌లు"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"కాల్‌లు"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"అనుమతించిన కాల్‌లు వచ్చినప్పుడు శబ్దం వస్తుందని నిర్ధారించుకోవడానికి, పరికరం రింగ్ మోడ్‌లో ఉందో లేదో చెక్ చేయండి"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ సంబంధిత‌ ఇన్‌కమింగ్ కాల్‌లు బ్లాక్ చేయబడ్డాయి. మీ స్నేహితులు, కుటుంబ సభ్యులు లేదా ఇతర పరిచయాలు మిమ్మల్ని సంప్రదించగలిగేలా మీరు సెట్టింగ్‌లను సర్దుబాటు చేయవచ్చు."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"నక్షత్రం గుర్తు ఉన్న పరిచయాలు"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other">మరో <xliff:g id="NUM_PEOPLE">%d</xliff:g> మంది</item>
-      <item quantity="one">మరో 1 వ్యక్తి</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"ఏవీ లేవు"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{ఏవీ లేవు}=1{{contact_1}}=2{{contact_1}, {contact_2}}=3{{contact_1}, {contact_2}, {contact_3}}other{{contact_1}, {contact_2}, # మంది ఇతరులు}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Messages"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"మెసేజ్‌లు"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Messages"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’కి సంబంధించిన ఇన్‌కమింగ్ కాల్‌లు బ్లాక్ చేయబడ్డాయి. మీ స్నేహితులు, కుటుంబ సభ్యులు లేదా ఇతర పరిచయాలు మిమ్మల్ని సంప్రదించగలిగేలా మీరు సెట్టింగ్‌లను సర్దుబాటు చేయవచ్చు."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"అన్ని మెసేజ్‌లు మిమ్మల్ని చేరుతాయి"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"అన్ని కాల్‌లు మిమ్మల్ని చేరుతాయి"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"ఏవీ లేవు"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> కాంటాక్ట్‌లు</item>
-      <item quantity="one">1 కాంటాక్ట్</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{ఏవీ లేవు}=1{1 కాంటాక్ట్}other{# కాంటాక్ట్‌లు}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"ఎవరైనా"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"కాంటాక్ట్‌లు"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"నక్షత్రం గుర్తు ఉన్న కాంటాక్ట్‌లు"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"అన్ని నోటిఫికేషన్‌లు"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"కొన్ని నోటిఫికేషన్‌లు"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"యాప్‌లను అంతరాయం కలిగించడానికి మీరు అనుమతించకపోయినప్పటికీ, ఎంచుకున్న వ్యక్తులు ఇప్పటికీ మిమ్మల్ని సంప్రదించగలరు"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> అంతరాయం కలిగించవచ్చు</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> అంతరాయం కలిగించవచ్చు</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"మరో <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{యాప్‌లు ఏవీ అంతరాయాన్ని కలిగించలేవు}=1{{app_1} అంతరాయాన్ని కలిగించగలదు}=2{{app_1}, {app_2}లు అంతరాయాన్ని కలిగించగలవు}=3{{app_1}, {app_2}, అలాగే {app_3}లు అంతరాయాన్ని కలిగించగలవు}other{{app_1}, {app_2}, మరో # అంతరాయాన్ని కలిగించగలవు}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"యాప్‌లు"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"అన్ని నోటిఫికేషన్‌లు"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"కొన్ని నోటిఫికేషన్‌లు"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"అంతరాయం కలిగించ గల నోటిఫికేషన్‌లు"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"అన్ని నోటిఫికేషన్‌లను అనుమతించు"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> అంతరాయం కలిగించవచ్చు</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> అంతరాయం కలిగించవచ్చు</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"ఏదీ అంతరాయాన్ని కలిగించలేదు"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"మరో <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{ఏదీ అంతరాయాన్ని కలిగించలేదు}=1{{sound_category_1} అంతరాయాన్ని కలిగించగలదు}=2{{sound_category_1}, {sound_category_2}లు అంతరాయాన్ని కలిగించగలవు}=3{{sound_category_1}, {sound_category_2}, అలాగే {sound_category_3}లు అంతరాయాన్ని కలిగించగలవు}other{{sound_category_1}, {sound_category_2}, మరో # అంతరాయాన్ని కలిగించగలవు}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"ఏదీ అంతరాయాన్ని కలిగించలేదు"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"ఎవ్వరూ అంతరాయాన్ని కలిగించలేరు"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"కొంతమంది వ్యక్తులు అంతరాయాన్ని కలిగించగలరు"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"వ్యక్తులందరూ అంతరాయం కలిగించగలరు"</string>
@@ -4074,7 +4045,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USBని ఏది నియంత్రించాలి"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"కనెక్ట్ చేసిన పరికరం"</string>
     <string name="usb_control_device" msgid="527916783743021577">"ఈ పరికరం"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"మారుస్తున్నారు..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"స్విచ్ అవుతోంది…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"మార్చడం సాధ్యపడలేదు"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"ఈ పరికరాన్ని ఛార్జ్ చేస్తోంది"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"కనెక్ట్ చేయబడిన పరికరాన్ని ఛార్జ్ చేస్తోంది"</string>
@@ -4321,7 +4292,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"వివరాలను చూడండి"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"డేటా సేవర్"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"అనియంత్రిత డేటా"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"నేపథ్య డేటా ఆఫ్ చేయబడింది"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"బ్యాక్‌గ్రౌండ్ డేటా ఆఫ్ చేయబడింది"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"ఆన్‌లో ఉంది"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"ఆఫ్‌లో ఉంది"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"డేటా సేవర్‌ని ఉపయోగించు"</string>
@@ -4344,7 +4315,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"పరికరం లాక్ చేయబడితే, నోటిఫికేషన్‌ల్లో ప్రత్యుత్తరాలు లేదా ఇతర వచనాన్ని టైప్ చేయకుండా నిరోధించు"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"డిఫాల్ట్ స్పెల్‌ చెక‌ర్‌"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"స్పెల్‌ చెక‌ర్‌ను ఎంచుకోండి"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"స్పెల్‌ చెక‌ర్‌ను ఉప‌యోగించు"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"స్పెల్-చెకర్‌ను ఉపయోగించండి"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"ఎంచుకోబడలేదు"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(ఏదీ లేదు)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4434,7 +4405,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"నిల్వ స్థలాన్ని ఖాళీ చేయడంలో సహాయపడటానికి, నిల్వ నిర్వాహికి మీ పరికరం నుండి బ్యాకప్ చేసిన ఫోటోలు మరియు వీడియోలను తీసివేస్తుంది."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"ఫోటోలు &amp; వీడియోలను తీసివేయి"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"నిల్వ నిర్వాహికి"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"నిల్వ మేనేజర్‌ని ఉపయోగించండి"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"స్టోరేజ్ మేనేజర్‌ను ఉపయోగించండి"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"ఆటోమేటిక్‌"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"మాన్యువల్"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"ఇప్పుడు స్థలాన్ని ఖాళీ చేయి"</string>
@@ -4472,6 +4443,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"ఫోన్ చెక్ చేయ‌డానికి 2 సార్లు నొక్కడం"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"టాబ్లెట్‌ను తరచి చూడటానికి రెండుసార్లు నొక్కండి"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"పరికరాన్ని తరచి చూడటానికి రెండుసార్లు నొక్కండి"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"నోటిఫికేషన్‌ల కోసం స్వైప్"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"మీ నోటిఫికేషన్‌లను చూపించడానికి స్క్రీన్ దిగువ అంచు వరకు కిందికి స్వైప్ చేయండి"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"వన్-హ్యాండెడ్ మోడ్"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"వన్-హ్యాండెడ్ మోడ్‌ను ఉపయోగించండి"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"యాప్‌ల మధ్య స్విచ్ అయినప్పుడు నిష్క్రమించండి"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"గడువు ముగింపు"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 సెకన్లు"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 సెకన్లు"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 సెకన్లు"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"చేరుకోగలిగే బటన్"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"సమయం, నోటిఫికేషన్‌లు మరియు ఇతర సమాచారాన్ని తనిఖీ చేయడం కోసం, మీ స్క్రీన్‌ని రెండుసార్లు నొక్కండి."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"ఫోన్‌ను తరచి చూడటానికి పైకి ఎత్తండి"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"టాబ్లెట్‌ను తరచి చూడటానికి పైకి ఎత్తండి"</string>
@@ -4484,6 +4465,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"టాబ్లెట్‌ను తనిఖీ చేయడానికి నొక్కండి"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"పరికరాన్ని తనిఖీ చేయడానికి నొక్కండి"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"సమయం, నోటిఫికేషన్‌లు మరియు ఇతర సమాచారాన్ని తనిఖీ చేయడానికి నొక్కండి."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"ఎమర్జెన్సీ బటన్"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"పవర్ బటన్‌ను వెంట వెంటనే 5 సార్లు నొక్కడం ద్వారా ఎమర్జెన్సీ SOS చర్యలను ప్రారంభించండి."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"హెచ్చరిక సౌండ్"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"చర్యలను ప్రారంభించడానికి ముందు అలర్ట్ చేయండి"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"ఎమర్జెన్సీ కాంటాక్ట్‌లు"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"నోటిఫికేషన్‌ల కోసం వేలిముద్రతో స్వైప్ చేయండి"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"వేలిముద్రతో స్వైప్ చేయి"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"మీ నోటిఫికేషన్‌లను తనిఖీ చేయడానికి, మీ ఫోన్ వెనుకవైపు ఉన్న వేలిముద్ర సెన్సార్‌పై కిందికి స్వైప్ చేయండి."</string>
@@ -4638,7 +4624,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"అన్ని యాప్‌లకు ఎనేబుల్ చేయండి"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"గ్రాఫిక్స్ డ్రైవర్‌ను ఎంచుకోండి"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"డిఫాల్ట్"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"గేమ్ డ్రైవర్"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"గేమ్ డ్రైవర్"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"డెవలపర్ డ్రైవర్"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"సిస్టమ్ గ్రాఫిక్స్ డ్రైవర్"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4707,6 +4693,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"నెట్‌వర్క్‌లను కనుగొనడం సాధ్యపడలేదు. మళ్లీ ప్రయత్నించండి."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(నిషేధించబడింది)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"SIM కార్డ్ లేదు"</string>
+    <string name="sim_card" msgid="6381158752066377709">"సిమ్"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"సిమ్ లేదు"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"ఏదీ కాదు"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"కనెక్ట్ కావడానికి సిమ్ కావాలి"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"కనెక్ట్ కావడానికి <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> సిమ్ కావాలి"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"ప్రాధాన్యత గల నెట్‌వర్క్ మోడ్: WCDMAకు ప్రాధాన్యత"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"ప్రాధాన్యత గల నెట్‌వర్క్ మోడ్: GSM మాత్రమే"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"ప్రాధాన్యత గల నెట్‌వర్క్ మోడ్: WCDMA మాత్రమే"</string>
@@ -4760,6 +4751,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"మొబైల్ డేటా"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"మొబైల్ నెట్‌వర్క్‌ను ఉపయోగించి డేటాను యాక్సెస్ చేయండి"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"ఈ కార్యియర్ పరిధిలోకి వచ్చినప్పుడు ఈ ఫోన్ ఆటోమేటిక్‌గా ఈ కార్యియర్ కనెక్షన్‌కు మారుతుంది"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"SIM కార్డ్ అందుబాటులో లేదు"</string>
     <string name="calls_preference" msgid="2166481296066890129">"కాల్‌ల ప్రాధాన్యత"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS ప్రాధాన్యత"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"ప్రతిసారి అడుగు"</string>
@@ -4942,10 +4934,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"సెట్టింగ్‌లలో స్క్రీన్ ఓవర్‌లేలను అనుమతించండి"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"సెట్టింగ్‌లలోకి వెళ్లి, ఇతర యాప్‌లపై స్క్రీన్ ఓవర్‌లే పద్ధతిలో కనిపించదగ్గ యాప్‌లకు అనుమతినివ్వండి"</string>
     <string name="media_controls_title" msgid="403271085636252597">"మీడియా"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"మీడియా సెషన్ ముగిసినప్పుడు, ప్లేయర్‌ను దాచు"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"విస్తరించిన త్వరిత సెట్టింగ్‌ల ప్యానెల్ నుండి సెషన్‌ను కొనసాగించడానికి ప్లేయర్ మిమ్మల్ని అనుమతిస్తుంది."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"త్వరిత సెట్టింగ్‌లలో మీడియా ప్లేయర్"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"ప్లేబ్యాక్‌ను సులభంగా తిరిగి కొనసాగించడానికి, మీడియా ప్లేయర్‌ను ఎక్కువ సేపు చూపించండి"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"ప్లేయర్‌ను దాచు"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"ప్లేయర్‌ను చూపించు"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"ప్లేయర్‌లు ఏవీ అందుబాటులో లేవు"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"అనుమతించబడిన యాప్‌లు"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"మీడియా"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"బ్లూటూత్ ఆన్ చేయబడుతుంది"</string>
 </resources>
diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml
index e7549a6..d9ebe44 100644
--- a/res/values-th/arrays.xml
+++ b/res/values-th/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"ปานกลาง"</item>
     <item msgid="6740026006576843477">"ยาว"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"สั้น"</item>
+    <item msgid="7397961711906421599">"ปานกลาง"</item>
+    <item msgid="4079132024502041928">"ยาว"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"ค่าเริ่มต้น"</item>
     <item msgid="4234707448428002595">"Sans Serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"ทั่วโลก"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA เท่านั้น"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"ทั่วโลก"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 6f53148..a02f303 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"แสดงข้อมูลโปรไฟล์บนหน้าจอล็อก"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"บัญชี"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"ตำแหน่ง"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"ใช้ตำแหน่ง"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"ใช้ตำแหน่ง"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"ปิด"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">เปิดอยู่ - แอป <xliff:g id="COUNT_1">%1$d</xliff:g> แอปมีสิทธิ์เข้าถึงตำแหน่ง</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"ใช้ใบหน้าในการตรวจสอบสิทธิ์"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"เริ่ม"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"หากการปลดล็อกด้วยใบหน้าในการช่วยเหลือพิเศษปิดอยู่ ขั้นตอนการตั้งค่าบางรายการอาจทำงานกับ TalkBack ไม่ถูกต้อง"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"ย้อนกลับ"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"ตั้งค่าต่อ"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"ใช้การตั้งค่าการช่วยเหลือพิเศษ"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="one">ต้องมีตัวเลขไม่เกิน <xliff:g id="NUMBER_0">%d</xliff:g> ตัว</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"ผู้ดูแลระบบอุปกรณ์ไม่อนุญาตให้ใช้ PIN ที่เพิ่งใช้ไป"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"ผู้ดูแลระบบไอทีบล็อก PIN ที่ไม่รัดกุม ลอง PIN อื่น"</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"ต้องใช้อักขระที่ใช้ได้ทั้งหมด"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"ต้องมีตัวอักษรอย่างน้อย 1 ตัว"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"ต้องมีตัวเลขอย่างน้อย 1 ตัว"</string>
@@ -653,7 +655,6 @@
       <item quantity="one">ต้องมีอักขระที่ไม่ใช่ตัวเลขอย่างน้อย 1 ตัว</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"ผู้ดูแลระบบอุปกรณ์ไม่อนุญาตให้ใช้รหัสผ่านที่เพิ่งใช้ไป"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"ผู้ดูแลระบบไอทีบล็อกรหัสผ่านที่ไม่รัดกุม ลองรหัสผ่านอื่น"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"ไม่อนุญาตให้เรียงจากน้อยไปมาก จากมากไปน้อย หรือเรียงลำดับตัวเลขที่ซ้ำกัน"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"ยืนยัน"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"ยกเลิก"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"เปิด WiFi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"ใช้ Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"ใช้ Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"การตั้งค่า WiFi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"ตั้งค่าและจัดการจุดเข้าใช้งานระบบไร้สาย"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"ให้คิวอาร์โค้ดอยู่กลางช่องด้านล่างเพื่อเชื่อมต่อไปยัง “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"ร่วมใช้ Wi‑Fi โดยการสแกนคิวอาร์โค้ด"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"แชร์ Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"สแกนคิวอาร์โค้ดนี้เพื่อเชื่อมต่อกับ “<xliff:g id="SSID">%1$s</xliff:g>” และแชร์รหัสผ่าน"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"ใช้อุปกรณ์เครื่องอื่นสแกนคิวอาร์โค้ดนี้เพื่อเข้าร่วม “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"สแกนคิวอาร์โค้ดนี้เพื่อเชื่อมต่อกับ “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"ลองอีกครั้ง หากยังแก้ปัญหาไม่ได้ ให้ติดต่อผู้ผลิตอุปกรณ์"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"มีข้อผิดพลาดเกิดขึ้น"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"รหัสผ่าน Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"รหัสผ่านฮอตสปอต: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"เชื่อมต่ออัตโนมัติ"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"อนุญาตให้โทรศัพท์เชื่อมต่อโดยอัตโนมัติเมื่ออยู่ใกล้เครือข่ายนี้"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"อนุญาตให้แท็บเล็ตเชื่อมต่อโดยอัตโนมัติเมื่ออยู่ใกล้เครือข่ายนี้"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"อนุญาตให้เชื่อมต่อกับเครือข่ายนี้เมื่ออยู่ในพื้นที่ให้บริการ"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"เพิ่มอุปกรณ์"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"ใช้คิวอาร์โค้ดเพื่อเพิ่มอุปกรณ์ในเครือข่ายนี้"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"คิวอาร์โค้ดมีรูปแบบไม่ถูกต้อง"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"ใช้ใบรับรองของระบบ"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"ไม่ต้องระบุ"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"ไม่ต้องตรวจสอบ"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"ไม่ได้ระบุใบรับรอง การเชื่อมต่อของคุณจะไม่เป็นส่วนตัว"</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"ชื่อเครือข่ายยาวเกินไป"</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"ต้องระบุโดเมน"</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"ต้องมีใบรับรอง"</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"เชื่อมต่อ"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"เปิด Wi-Fi แล้ว"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"เชื่อมต่อกับ <xliff:g id="NETWORK_NAME">%1$s</xliff:g> แล้ว"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"กำลังเชื่อมต่อกับ <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"กำลังเชื่อมต่อ…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"ไม่สามารถเชื่อมต่อกับเครือข่าย"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"เครือข่ายไม่อยู่ในพื้นที่ให้บริการ"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"แอปไม่ได้แชร์เนื้อหา หากต้องการแชร์การเชื่อมต่ออินเทอร์เน็ต ให้ปิดฮอตสปอตแล้วเปิดใหม่"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"ไม่ได้ตั้งค่ารหัสผ่าน"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"ชื่อฮอตสปอต"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"กำลังเปิด <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"กำลังเปิด <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"อุปกรณ์อื่นๆ สามารถเชื่อมต่อกับ <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"รหัสผ่านฮอตสปอต"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"ย่านความถี่ AP"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"เพิ่มอัตราการรีเฟรชจาก 60 เป็น 90 Hz โดยอัตโนมัติสำหรับเนื้อหาบางรายการ เพิ่มการใช้งานแบตเตอรี่"</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"บังคับอัตราการรีเฟรชเป็น 90 เฮิร์ตซ์"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"อัตราการรีเฟรชสูงสุดสำหรับการตอบสนองต่อการแตะและคุณภาพของภาพเคลื่อนไหวที่ดียิ่งขึ้น เพิ่มการใช้งานแบตเตอรี่"</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"การจดจ่อที่หน้าจอ"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"เปิด/หน้าจอจะไม่ปิดหากคุณกำลังดูอยู่"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"เวอร์ชันของ Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"การอัปเดตความปลอดภัยของ Android"</string>
     <string name="model_info" msgid="8997566254717810904">"โมเดล"</string>
-    <string name="model_summary" msgid="2246651782442466213">"รุ่น: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"โมเดลและฮาร์ดแวร์"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"เวอร์ชันฮาร์ดแวร์"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"รหัสอุปกรณ์"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"รีเซ็ตการตั้งค่าเครือข่ายแล้ว"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"ลบซิมไม่ได้"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"ลบซิมที่ดาวน์โหลดไม่ได้เนื่องจากมีข้อผิดพลาด\n\nรีสตาร์ทอุปกรณ์แล้วลองอีกครั้ง"</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"ลบข้อมูลทั้งหมด (รีเซ็ตเป็นค่าเริ่มต้น)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"ลบข้อมูล (รีเซ็ตเป็นค่าเริ่มต้น)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"การดำเนินการนี้จะลบข้อมูลทั้งหมดออกจาก"<b>"ที่จัดเก็บข้อมูลภายใน"</b>"ของแท็บเล็ตของคุณ ซึ่งประกอบด้วย\n\n"<li>"บัญชี Google ของคุณ"</li>\n<li>"ข้อมูลและการตั้งค่าของระบบและแอป"</li>\n<li>"แอปที่ดาวน์โหลด"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"การดำเนินการนี้จะลบข้อมูลทั้งหมดออกจาก"<b>"พื้นที่เก็บข้อมูลภายใน"</b>"โทรศัพท์ ได้แก่\n\n"<li>"บัญชี Google"</li>\n<li>"ข้อมูลและการตั้งค่าของระบบและแอป"</li>\n<li>"แอปที่ดาวน์โหลด"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"ขณะนี้คุณได้ลงชื่อเข้าใช้บัญชีต่อไปนี้แล้ว:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"มีผู้ใช้รายอื่นอยู่บนอุปกรณ์เครื่องนี้\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"เพลง"</li>\n<li>"รูปภาพ"</li>\n<li>"ข้อมูลผู้ใช้อื่นๆ"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"การดำเนินการนี้จะไม่ยกเลิกแพ็กเกจอินเทอร์เน็ตมือถือของคุณ"</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"หากต้องการล้างข้อมูลเพลง รูปภาพ และข้อมูลผู้ใช้อื่นๆ จะต้องลบ"<b>"ที่จัดเก็บข้อมูล USB"</b></string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"หากต้องการล้างข้อมูลเพลง รูปภาพ และข้อมูลผู้ใช้อื่นๆ คุณต้องลบ"<b>"การ์ด SD"</b></string>
+    <string name="main_clear_title" msgid="277664302144837723">"ลบข้อมูลทั้งหมด (รีเซ็ตเป็นค่าเริ่มต้น)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"ลบข้อมูลทั้งหมด (รีเซ็ตเป็นค่าเริ่มต้น)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"การดำเนินการนี้จะลบข้อมูลทั้งหมดออกจาก"<b>"ที่จัดเก็บข้อมูลภายใน"</b>"แท็บเล็ต ได้แก่\n\n"<li>"บัญชี Google"</li>\n<li>"ข้อมูลและการตั้งค่าของระบบและแอป"</li>\n<li>"แอปที่ดาวน์โหลด"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"การดำเนินการนี้จะลบข้อมูลทั้งหมดออกจาก"<b>"ที่จัดเก็บข้อมูลภายใน"</b>"โทรศัพท์ ได้แก่\n\n"<li>"บัญชี Google"</li>\n<li>"ข้อมูลและการตั้งค่าของระบบและแอป"</li>\n<li>"แอปที่ดาวน์โหลด"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"ขณะนี้คุณลงชื่อเข้าใช้บัญชีต่อไปนี้อยู่\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"มีผู้ใช้รายอื่นอยู่ในอุปกรณ์เครื่องนี้\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"เพลง"</li>\n<li>"รูปภาพ"</li>\n<li>"ข้อมูลผู้ใช้อื่นๆ"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"การดำเนินการนี้จะไม่ยกเลิกแพ็กเกจอินเทอร์เน็ตมือถือของคุณ"</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"หากต้องการล้างข้อมูลเพลง รูปภาพ และข้อมูลผู้ใช้อื่นๆ จะต้องลบ"<b>"ที่จัดเก็บข้อมูล USB"</b></string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"หากต้องการล้างข้อมูลเพลง รูปภาพ และข้อมูลผู้ใช้อื่นๆ จะต้องลบ"<b>"การ์ด SD"</b></string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"ลบที่เก็บข้อมูล USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"ลบการ์ด SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"ลบข้อมูลทั้งหมดในที่จัดเก็บข้อมูล USB ภายใน เช่น เพลงหรือรูปภาพ"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"ลบข้อมูลทั้งหมดในการ์ด SD เช่น เพลงหรือรูปภาพ"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"ลบข้อมูลทั้งหมด"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"ลบข้อมูลทั้งหมด"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"ระบบจะลบข้อมูลส่วนบุคคลและแอปที่ดาวน์โหลดทั้งหมด คุณจะยกเลิกการดำเนินการนี้ไม่ได้"</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"ระบบจะลบข้อมูลส่วนบุคคล รวมถึงแอปและซิมที่ดาวน์โหลดมาทั้งหมด คุณจะยกเลิกการดำเนินการนี้ไม่ได้"</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"ลบทุกอย่าง"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"ไม่มีการรีเซ็ตเนื่องจากบริการล้างข้อมูลระบบไม่พร้อมใช้งาน"</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"ลบข้อมูลทั้งหมดใช่ไหม"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"การรีเซ็ตเป็นค่าจากโรงงานไม่สามารถใช้ได้สำหรับผู้ใช้รายนี้"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"กำลังลบ"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"โปรดรอสักครู่..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"ลบข้อมูลทั้งหมด"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"ลบข้อมูลทั้งหมด"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"ระบบจะลบข้อมูลส่วนบุคคลและแอปที่ดาวน์โหลดทั้งหมด คุณจะยกเลิกการดำเนินการนี้ไม่ได้"</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"ระบบจะลบข้อมูลส่วนบุคคล รวมถึงแอปและซิมที่ดาวน์โหลดมาทั้งหมด คุณจะยกเลิกการดำเนินการนี้ไม่ได้"</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"ลบข้อมูลทั้งหมดใช่ไหม"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"การรีเซ็ตเป็นค่าเริ่มต้นไม่พร้อมใช้งานสำหรับผู้ใช้รายนี้"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"กำลังลบ"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"โปรดรอสักครู่…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"การตั้งค่าการโทร"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"ตั้งค่าข้อความเสียง การโอนสาย สายเรียกซ้อน หมายเลขผู้โทร"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"ปล่อยสัญญาณผ่าน USB"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"ไม่สามารถปล่อยการเชื่อมต่อมากกว่า <xliff:g id="MAXCONNECTION">%1$d</xliff:g> อุปกรณ์"</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> จะถูกยกเลิกการปล่อยสัญญาณ"</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"การเชื่อมต่ออีเทอร์เน็ตผ่านมือถือ"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"แชร์การเชื่อมต่ออินเทอร์เน็ตของโทรศัพท์ผ่านอีเทอร์เน็ต USB"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"แชร์การเชื่อมต่ออินเทอร์เน็ตของโทรศัพท์ผ่านอีเทอร์เน็ต"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"ใช้ฮอตสปอตและการเชื่อมต่ออินเทอร์เน็ตผ่านมือถือ เพื่อให้อุปกรณ์อื่นๆ ใช้อินเทอร์เน็ตจากการเชื่อมต่อเน็ตมือถือได้ และแอปยังสามารถสร้างฮอตสปอตเพื่อแชร์เนื้อหากับอุปกรณ์ที่อยู่ใกล้เคียงได้อีกด้วย"</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"ใช้ฮอตสปอตและการเชื่อมต่ออินเทอร์เน็ตผ่านมือถือเพื่อให้อุปกรณ์อื่นๆ ใช้อินเทอร์เน็ตจาก Wi-Fi หรือการเชื่อมต่ออินเทอร์เน็ตมือถือของคุณได้ แอปยังสร้างฮอตสปอตเพื่อแชร์เนื้อหากับอุปกรณ์ที่อยู่ใกล้เคียงได้อีกด้วย"</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"ความช่วยเหลือ"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"ค่ากำหนดคำบรรยายวิดีโอ"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"การขยาย"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"พื้นที่ในการขยาย"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"เปิดใช้การขยาย"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"เลือกพื้นที่ในการขยายที่ต้องการใช้เมื่อขยายหน้าจอ"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"เต็มหน้าจอ"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"บางส่วนของหน้าจอ"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"เต็มหน้าจอและบางส่วนของหน้าจอ"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"ขยายทั้งหน้าจอ"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"ขยายบางส่วนของหน้าจอ"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"เปลี่ยนไปใช้ปุ่มการช่วยเหลือพิเศษใช่ไหม"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"การใช้การแตะ 3 ครั้งเพื่อขยายหน้าจอบางส่วนจะทำให้การพิมพ์และการดำเนินการอื่นๆ ล่าช้า\n\nคุณต้องการเปลี่ยนไปใช้ปุ่มการช่วยเหลือพิเศษเพื่อขยายไหม"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"เปลี่ยนไปใช้ปุ่มการช่วยเหลือพิเศษ"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"ใช้การแตะ 3 ครั้งเพื่อขยายต่อไป"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"การตั้งค่าการขยาย"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"ขยายด้วยการแตะ 3 ครั้ง"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"ขยายโดยใช้ทางลัด"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"กดปุ่มเปิด/ปิดเพื่อวางสาย"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"ตัวชี้เมาส์ขนาดใหญ่"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"นำภาพเคลื่อนไหวออก"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"เสียงแบบโมโน"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"รวมช่องเสียงเมื่อเล่นไฟล์เสียง"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"สมดุลเสียง"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"ซ้าย"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"ขวา"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"เสียงแบบโมโน"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"รวมช่องเสียงเมื่อเล่นไฟล์เสียง"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"สมดุลเสียง"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"ซ้าย"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"ขวา"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"ค่าเริ่มต้น"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 วินาที"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 วินาที"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"การสั่นเมื่อมีการแจ้งเตือน"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"การสั่นเมื่อมีเสียงเรียกเข้า"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"การตอบสนองการสัมผัส"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"ใช้ \"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>\""</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"เปิด \"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>\""</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"ใช้การแก้สี"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"แสดงคำบรรยาย"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"สำหรับแอปที่รองรับเท่านั้น"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"ใช้ <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"เปิด <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"ใช้การแก้สี"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"แสดงคำบรรยาย"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"สำหรับแอปที่รองรับเท่านั้น"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"ขนาดและรูปแบบของคำบรรยาย"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"ขนาดข้อความ <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"ตัวเลือกเพิ่มเติม"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"ตาบอดสีเขียว"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"ตาบอดสีแดง"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"ตาบอดสีน้ำเงิน"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"โทนสีเทา"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"สีแดง/เขียว"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"สีแดง/เขียว"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"สีน้ำเงิน/เหลือง"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"การจำกัดการทำงานในเบื้องหลัง"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"อนุญาตให้แอปทำงานในเบื้องหลัง"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"ไม่อนุญาตให้แอปทำงานในพื้นหลัง"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"จำกัดการใช้งานในพื้นหลังไม่ได้"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"จำกัดการใช้งานในเบื้องหลังไม่ได้"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"จำกัดกิจกรรมในพื้นหลังใช่ไหม"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"แอปอาจทำงานผิดพลาดหากคุณจำกัดกิจกรรมในพื้นหลัง"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"เนื่องจากแอปนี้ไม่ได้ตั้งค่าให้เพิ่มประสิทธิภาพแบตเตอรี่ คุณจึงจำกัดการใช้งานไม่ได้\n\nหากต้องการจำกัด ให้เปิดการเพิ่มประสิทธิภาพแบตเตอรี่ก่อน"</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"ตั้งกำหนดการ"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"ยืดอายุใช้งานแบตเตอรี่"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"ปิดเมื่อชาร์จเต็มแล้ว"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"โหมดประหยัดแบตเตอรี่จะปิดเมื่อมีแบตเตอรี่โทรศัพท์อยู่ที่ <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"โหมดประหยัดแบตเตอรี่จะปิดเมื่อแบตเตอรี่แท็บเล็ตอยู่ที่ <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"โหมดประหยัดแบตเตอรี่จะปิดเมื่อแบตเตอรี่อุปกรณ์อยู่ที่ <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"โหมดประหยัดแบตเตอรี่จะปิดเมื่อโทรศัพท์ชาร์จเกิน <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"โหมดประหยัดแบตเตอรี่จะปิดเมื่อแท็บเล็ตชาร์จเกิน <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"โหมดประหยัดแบตเตอรี่จะปิดเมื่ออุปกรณ์ชาร์จเกิน <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"เปิด"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"รีเซ็ต"</string>
     <string name="tts_play" msgid="2945513377250757221">"เล่น"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"การเชื่อมต่อแบบปรับอัตโนมัติ"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"เพิ่มอายุการใช้งานแบตเตอรี่และปรับปรุงประสิทธิภาพของอุปกรณ์ด้วยการจัดการการเชื่อมต่อเครือข่ายโดยอัตโนมัติ"</string>
     <string name="credentials_title" msgid="7535942196886123656">"ที่เก็บข้อมูลเข้าสู่ระบบ"</string>
     <string name="credentials_install" msgid="3933218407598415827">"ติดตั้งใบรับรอง"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"ติดตั้งใบรับรองจากพื้นที่เก็บข้อมูล"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"ข้อมูลเข้าสู่ระบบของผู้ใช้"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"ดูและแก้ไขข้อมูลเข้าสู่ระบบที่เก็บไว้"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"ขั้นสูง"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"ประเภทพื้นที่เก็บข้อมูล"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"ใช้ฮาร์ดแวร์"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"ซอฟต์แวร์เท่านั้น"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"ข้อมูลรับรองไม่พร้อมใช้งานสำหรับผู้ใช้รายนี้"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"ติดตั้งแล้วสำหรับ VPN และแอป"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"ติดตั้งแล้วสำหรับ Wi-Fi"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"การชำระเงินที่เครื่องชำระเงิน"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"ตั้งค่าแอปการชำระเงิน แล้วแตะด้านหลังของโทรศัพท์กับเครื่องชำระเงินเครื่องใดก็ได้ที่มีสัญลักษณ์ \"ไม่ต้องสัมผัส\""</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"รับทราบ"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"เพิ่มเติม..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"เพิ่มเติม…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"ตั้งค่าแอปการชำระเงินเริ่มต้น"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"อัปเดตแอปการชำระเงินเริ่มต้น"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"ใช้ <xliff:g id="APP">%1$s</xliff:g> เพื่อจ่ายเงินที่เครื่องชำระเงินแบบไม่ต้องสัมผัส"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"ใช้ในการโทรทุกครั้ง"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"เลือกซิมสำหรับข้อมูล"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"เลือกซิมสำหรับ SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"กำลังสลับซิมข้อมูล การดำเนินการนี้อาจใช้เวลาถึง 1 นาที..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"กำลังสลับซิมข้อมูล การดำเนินการนี้อาจใช้เวลาถึง 1 นาที…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"โทรด้วย"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"เลือกซิมการ์ด"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"ซิมหมายเลข <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"กิจวัตร, ตั้งเวลา, โหมดประหยัดแบตเตอรี่, โหมดประหยัดพลังงาน, แบตเตอรี่, อัตโนมัติ, เปอร์เซ็นต์"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"VoLTE, การโทรขั้นสูง, การโทรผ่าน 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"เพิ่มภาษา"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"ขนาดข้อความ"</string>
     <string name="default_sound" msgid="6604374495015245195">"เสียงเริ่มต้น"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"เสียงเรียกเข้าและการแจ้งเตือนอยู่ที่ <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"ระดับเสียง การสั่น ห้ามรบกวน"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"เสียงเปิดเครื่อง"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"คำบรรยายสด"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"แสดงคำบรรยายสื่อโดยอัตโนมัติ"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"ไม่มี"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other">ตั้งกำหนดการแล้ว <xliff:g id="ON_COUNT">%d</xliff:g> รายการ</item>
-      <item quantity="one">ตั้งกำหนดการแล้ว 1 รายการ</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{ไม่มี}=1{ตั้งกำหนดการแล้ว 1 รายการ}other{ตั้งกำหนดการแล้ว # รายการ}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"ห้ามรบกวน"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"รับเฉพาะการแจ้งเตือนจากผู้คนและแอปที่สำคัญ"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"จำกัดการรบกวน"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"เฉพาะเรื่องสำคัญ"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g> <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"เปิด / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"ปิด / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"ปิด"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"เปิด"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"ถามทุกครั้ง"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"จนกว่าคุณจะปิด"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> ชั่วโมง</item>
-      <item quantity="one">1 ชั่วโมง</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> นาที"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> กำหนดการเปิดได้โดยอัตโนมัติ</item>
-      <item quantity="one">1 กำหนดการเปิดได้โดยอัตโนมัติ</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 ชั่วโมง}other{# ชั่วโมง}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 นาที}other{# นาที}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{ปิด}=1{ปิด / 1 กำหนดการเปิดได้โดยอัตโนมัติ}other{ปิด / # กำหนดการเปิดได้โดยอัตโนมัติ}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"สิ่งที่ให้รบกวนได้ในโหมดห้ามรบกวน"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"ผู้คน"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"แอป"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"ตั้งค่าการแจ้งเตือนที่มีลำดับความสำคัญน้อยเป็นแจ้งเตือนเบาๆ โดยอัตโนมัติ"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"การจัดอันดับการแจ้งเตือนแบบปรับอัตโนมัติ"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"จัดอันดับการแจ้งเตือนตามความเกี่ยวข้องโดยอัตโนมัติ"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"ความคิดเห็นเกี่ยวกับการแจ้งเตือนแบบปรับอัตโนมัติ"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"ระบุการปรับเปลี่ยนที่เกิดขึ้นกับการแจ้งเตือนและแสดงตัวเลือกในการแสดงความคิดเห็นให้กับระบบ"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"การดำเนินการและการตอบที่แนะนำ"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"แสดงการดำเนินการและการตอบที่แนะนำโดยอัตโนมัติ"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"แสดงการแจ้งเตือนล่าสุดและการแจ้งเตือนที่มีการเลื่อนเวลา"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"การเข้าถึง \"ห้ามรบกวน\""</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"อนุญาตโหมดห้ามรบกวน"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"ไม่มีแอปที่ติดตั้งใดๆ ส่งคำขอสิทธิ์เข้าถึง \"ห้ามรบกวน\""</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"กำลังโหลดแอป..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"กำลังโหลดแอป…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Android กำลังบล็อกไม่ให้การแจ้งเตือนของแอปนี้ปรากฏในอุปกรณ์นี้ตามที่คุณขอ"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Android กำลังบล็อกไม่ให้การแจ้งเตือนหมวดหมู่นี้ปรากฏในอุปกรณ์นี้ตามที่คุณขอ"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Android กำลังบล็อกไม่ให้การแจ้งเตือนกลุ่มนี้ปรากฏในอุปกรณ์นี้ตามที่คุณขอ"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"การสนทนาทั้งหมด"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"การสนทนาสำคัญ"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"ไม่มี"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other">การสนทนา <xliff:g id="CONVERSATIONS">%d</xliff:g> รายการ</item>
-      <item quantity="one">การสนทนา 1 รายการ</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"ไม่มี"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{ไม่มี}=1{การสนทนา 1 รายการ}other{การสนทนา # รายการ}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"ผู้ที่รบกวนคุณได้"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"การโทร"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"การโทร"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"ตรวจสอบว่าคุณตั้งค่าอุปกรณ์ให้ส่งเสียง เพื่อให้แน่ใจว่าอุปกรณ์จะส่งเสียงเมื่อมีสายเรียกเข้าที่อนุญาต"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"บล็อกสายเรียกเข้าสำหรับ \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" เอาไว้ คุณปรับเปลี่ยนการตั้งค่าเพื่ออนุญาตให้เพื่อน ครอบครัว หรือรายชื่อติดต่อคนอื่นๆ ติดต่อคุณได้"</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"รายชื่อติดต่อที่ติดดาว"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other">อีก <xliff:g id="NUM_PEOPLE">%d</xliff:g> คน</item>
-      <item quantity="one">อีก 1 คน</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"ไม่มี"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{ไม่มี}=1{{contact_1}}=2{{contact_1} และ {contact_2}}=3{{contact_1}, {contact_2} และ {contact_3}}other{{contact_1}, {contact_2} และคนอื่นๆ อีก # ราย}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"ข้อความ"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"ข้อความ"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"ข้อความ"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"บล็อกข้อความเข้าสำหรับ \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" เอาไว้ คุณปรับเปลี่ยนการตั้งค่าเพื่ออนุญาตให้เพื่อน ครอบครัว หรือรายชื่อติดต่อคนอื่นๆ ติดต่อคุณได้"</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"คุณจะได้รับทุกข้อความ"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"คุณจะได้รับทุกสาย"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"ไม่มี"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other">รายชื่อติดต่อ <xliff:g id="NUM_CONTACTS">%d</xliff:g> ราย</item>
-      <item quantity="one">รายชื่อติดต่อ 1 ราย</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{ไม่มี}=1{รายชื่อติดต่อ 1 ราย}other{รายชื่อติดต่อ # ราย}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"ทุกคน"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"รายชื่อติดต่อ"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"รายชื่อติดต่อที่ติดดาว"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"การแจ้งเตือนทั้งหมด"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"การแจ้งเตือนบางรายการ"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"บุคคลที่เลือกไว้จะยังคงติดต่อคุณได้ แม้ว่าคุณจะไม่ได้อนุญาตแอปให้รบกวนก็ตาม"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g>รบกวนได้</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g>รบกวนได้</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"อีก <xliff:g id="NUMBER">%d</xliff:g> รายการ"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{ไม่ให้แอปใดรบกวนเลย}=1{{app_1} รบกวนได้}=2{{app_1} และ {app_2} รบกวนได้}=3{{app_1}, {app_2} และ {app_3} รบกวนได้}other{{app_1}, {app_2} และอีก # แอปรบกวนได้}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"แอป"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"การแจ้งเตือนทั้งหมด"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"การแจ้งเตือนบางรายการ"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"การแจ้งเตือนที่รบกวนคุณได้"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"อนุญาตการแจ้งเตือนทั้งหมด"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g>รบกวนได้</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g>รบกวนได้</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"ไม่ให้อะไรรบกวนเลย"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"อีก <xliff:g id="NUMBER">%d</xliff:g> รายการ"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{ไม่ให้อะไรรบกวนเลย}=1{{sound_category_1} รบกวนได้}=2{{sound_category_1} และ {sound_category_2} รบกวนได้}=3{{sound_category_1}, {sound_category_2} และ {sound_category_3} รบกวนได้}other{{sound_category_1}, {sound_category_2} และอีก # เสียงรบกวนได้}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"ไม่ให้อะไรรบกวนเลย"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"ไม่ให้ใครรบกวนเลย"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"ให้รบกวนได้แค่บางคน"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"ให้ทุกคนรบกวนได้"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"ควบคุม USB โดย"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"อุปกรณ์ที่เชื่อมต่อ"</string>
     <string name="usb_control_device" msgid="527916783743021577">"อุปกรณ์นี้"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"กำลังเปลี่ยน..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"กำลังเปลี่ยน…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"เปลี่ยนไม่ได้"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"ชาร์จอุปกรณ์นี้"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"การชาร์จอุปกรณ์ที่เชื่อมต่อ"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"ดูรายละเอียด"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"การประหยัดอินเทอร์เน็ต"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"ไม่จำกัดการใช้อินเทอร์เน็ต"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"ปิดใช้อินเทอร์เน็ตที่ใช้งานอยู่เบื้องหลัง"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"ปิดใช้อินเทอร์เน็ตที่ใช้งานอยู่เบื้องหลัง"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"เปิด"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"ปิด"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"ใช้โปรแกรมประหยัดอินเทอร์เน็ต"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"หากอุปกรณ์ล็อกอยู่ จะป้องกันไม่ให้มีการพิมพ์คำตอบหรือข้อความอื่นๆ ในการแจ้งเตือน"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"โปรแกรมตรวจตัวสะกดเริ่มต้น"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"เลือกโปรแกรมตรวจตัวสะกด"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"ใช้โปรแกรมตรวจตัวสะกด"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"ใช้โปรแกรมตรวจตัวสะกด"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"ไม่ได้เลือก"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(ไม่มี)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"ตัวจัดการพื้นที่เก็บข้อมูลจะนำรูปภาพและวิดีโอที่สำรองไว้ออกจากอุปกรณ์ของคุณ เพื่อช่วยเพิ่มพื้นที่เก็บข้อมูล"</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"นำรูปภาพและวิดีโอออก"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"ตัวจัดการพื้นที่เก็บข้อมูล"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"ใช้ตัวจัดการพื้นที่เก็บข้อมูล"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"ใช้ตัวจัดการพื้นที่เก็บข้อมูล"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"อัตโนมัติ"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"คู่มือ"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"เพิ่มพื้นที่ว่างเลย"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"แตะสองครั้งเพื่อดูโทรศัพท์"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"แตะ 2 ครั้งเพื่อตรวจสอบแท็บเล็ต"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"แตะ 2 ครั้งเพื่อตรวจสอบอุปกรณ์"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"เลื่อนเพื่อดูการแจ้งเตือน"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"เลื่อนลงไปที่ขอบด้านล่างของหน้าจอเพื่อแสดงการแจ้งเตือน"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"โหมดมือเดียว"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"ใช้โหมดมือเดียว"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"ออกเมื่อสลับแอป"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"หมดเวลา"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 วินาที"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 วินาที"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 วินาที"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"ความสามารถในการเข้าถึง"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"หากต้องการดูเวลา การแจ้งเตือน และข้อมูลอื่นๆ ให้แตะหน้าจอสองครั้ง"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"ยกขึ้นเพื่อดูโทรศัพท์"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"ยกขึ้นเพื่อตรวจสอบแท็บเล็ต"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"แตะเพื่อดูแท็บเล็ต"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"แตะเพื่อดูอุปกรณ์"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"หากต้องการดูเวลา การแจ้งเตือน และข้อมูลอื่นๆ ให้แตะหน้าจอ"</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"ปุ่มสัญญาณเตือนภัย"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"เริ่มการดำเนินการขอความช่วยเหลือฉุกเฉินโดยกดปุ่มเปิด/ปิดเร็วๆ 5 ครั้ง"</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"เสียงเตือน"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"การแจ้งเตือนก่อนเริ่มดำเนินการ"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"ผู้ติดต่อกรณีฉุกเฉิน"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"ใช้ลายนิ้วมือแสดงการแจ้งเตือน"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"เลื่อนนิ้วสแกนลายนิ้วมือ"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"ในการตรวจสอบการแจ้งเตือน ให้เลื่อนนิ้วลงผ่านเซ็นเซอร์ลายนิ้วมือที่ด้านหลังโทรศัพท์"</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"เปิดใช้สำหรับแอปทั้งหมด"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"เลือกไดรเวอร์กราฟิก"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"ค่าเริ่มต้น"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"ไดรเวอร์เกม"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"ไดรเวอร์เกม"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"ไดรเวอร์ของนักพัฒนาซอฟต์แวร์"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"ไดรเวอร์กราฟิกของระบบ"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"ไม่พบเครือข่าย โปรดลองอีกครั้ง"</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(ห้ามใช้)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"ไม่มีซิมการ์ด"</string>
+    <string name="sim_card" msgid="6381158752066377709">"ซิม"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"ไม่มีซิม"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"ไม่มี"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"ต้องใช้ซิมเพื่อเชื่อมต่อ"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"ต้องใช้ซิม <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> เพื่อเชื่อมต่อ"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"โหมดเครือข่ายที่ต้องการ: ต้องการ WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"โหมดเครือข่ายที่ต้องการ: GSM เท่านั้น"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"โหมดเครือข่ายที่ต้องการ: WCDMA เท่านั้น"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"เน็ตมือถือ"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"เข้าถึงอินเทอร์เน็ตโดยใช้เครือข่ายมือถือ"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"โทรศัพท์จะเปลี่ยนไปใช้ผู้ให้บริการรายนี้โดยอัตโนมัติเมื่ออยู่ในพื้นที่ให้บริการ"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"ไม่มีซิมการ์ดพร้อมใช้งาน"</string>
     <string name="calls_preference" msgid="2166481296066890129">"ค่ากำหนดการโทร"</string>
     <string name="sms_preference" msgid="7742964962568219351">"ค่ากำหนด SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"ถามทุกครั้ง"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"อนุญาตการซ้อนทับบนหน้าจอในการตั้งค่า"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"อนุญาตแอปที่แสดงเหนือแอปอื่นๆ ได้เพื่อวางซ้อนหน้าจอการตั้งค่า"</string>
     <string name="media_controls_title" msgid="403271085636252597">"สื่อ"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"ซ่อนโปรแกรมเล่นเมื่อเซสชันสื่อสิ้นสุดลง"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"โปรแกรมเล่นให้คุณดำเนินเซสชันต่อได้จากแผงการตั้งค่าด่วนที่ขยายออกมา"</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"โปรแกรมเล่นสื่อในการตั้งค่าด่วน"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"แสดงโปรแกรมเล่นสื่อนานขึ้นเพื่อให้กลับมาเล่นอีกครั้งได้โดยง่าย"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"ซ่อนโปรแกรมเล่น"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"แสดงโปรแกรมเล่น"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"ไม่มีโปรแกรมเล่น"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"แอปที่อนุญาต"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"สื่อ"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"บลูทูธจะเปิด"</string>
 </resources>
diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml
index a8cef12..de3096d 100644
--- a/res/values-tl/arrays.xml
+++ b/res/values-tl/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Katamtaman"</item>
     <item msgid="6740026006576843477">"Mahaba"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Maikli"</item>
+    <item msgid="7397961711906421599">"Katamtaman"</item>
+    <item msgid="4079132024502041928">"Mahaba"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Default"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Pangkalahatan"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA lang"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Pandaigdigan"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 04b1219..b2e3eb8 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Ipakita ang impormasyon ng profile sa lock screen"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Mga Account"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Lokasyon"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Gumamit ng lokasyon"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Gumamit ng lokasyon"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Naka-off"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">Naka-on - <xliff:g id="COUNT_1">%1$d</xliff:g> app ang may access sa lokasyon</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Gamitin ang mukha mo sa pag-authenticate"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Simula"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Kung naka-off ang face unlock sa accessibility, posibleng hindi gumana nang maayos sa TalkBack ang ilang hakbang ng setup."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Bumalik"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Ituloy ang pag-set up"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Gamitin ang accessibility setup"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="other">Dapat ay wala pang <xliff:g id="NUMBER_1">%d</xliff:g> na digit</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Hindi pinapayagan ng admin ng device ang paggamit ng kamakailang PIN"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Bina-block ng iyong IT admin ang mga pangkaraniwang PIN. Sumubok ng ibang PIN."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Hindi ito maaaring magsama ng di-wastong character"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Dapat maglaman ng kahit isang titik lang"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Dapat maglaman ng kahit isang digit lang"</string>
@@ -653,7 +655,6 @@
       <item quantity="other">Dapat ay may kahit <xliff:g id="COUNT">%d</xliff:g> na hindi numerong character</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Hindi pinapayagan ng admin ng device ang paggamit ng kamakailang password"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Bina-block ng iyong IT admin ang mga pangkaraniwang password. Sumubok ng ibang password."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Hindi pinapayagan ang pataas, pababa, o paulit-ulit na pagkakasunod-sunod ng mga digit"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Kumpirmahin"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Kanselahin"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"I-on ang Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Gumamit ng Wi‑Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Gumamit ng Wi‑Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Mga setting ng Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Mag-set up &amp; mamahala ng mga wireless na access point"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Igitna ang QR code sa ibaba para makakonekta sa “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Sumali sa Wi‑Fi sa pamamagitan ng pag-scan ng QR code"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Ibahagi ang Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"I-scan ang QR code na ito para kumonekta sa “<xliff:g id="SSID">%1$s</xliff:g>” at ibahagi ang password"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"I-scan ang QR code na ito gamit ang isa pang device para makasali sa “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"I-scan ang QR code na ito para kumonekta sa “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Subukang muli. Kung magpatuloy ang isyu, makipag-ugnayan sa manufacturer ng device"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Nagkaproblema"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Password ng Wi‑Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Password ng hotspot: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Auto‑connect"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Payagan ang telepono na awtomatikong kumonekta malapit sa network na ito"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Payagan ang tablet na awtomatikong kumonekta malapit sa network na ito"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Payagan ang pagkonekta sa network na ito kapag may signal ito"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Magdagdag ng device"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Gumamit ng QR code para makapagdagdag ng device sa network na ito"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"Hindi valid na format ang QR code"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Gamitin ang mga certificate ng system"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Huwag ibigay"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Huwag patotohanan"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Walang natukoy na certificate. Hindi magiging pribado ang iyong koneksyon."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Masyadong mahaba ang pangalan ng network."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Dapat tumukoy ng domain."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Kinakailangan ang certificate."</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Kumonekta"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Na-on ang Wi‑Fi"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Nakakonekta sa <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Kumokonekta sa <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Kumokonekta…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Nabigong kumonekta sa network."</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Walang signal ang network"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Nagbabahagi ng content ang app. Upang magbahagi ng koneksyon sa internet, i-off ang hotspot, pagkatapos ay i-on"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Walang naitakdang password"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Pangalan ng hotspot"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Ino-on ang <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Ino-on ang <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Maaaring kumonekta ang iba pang device sa <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Password ng hotspot"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP Band"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth na Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Awtomatikong itinataas sa 90 Hz mula sa 60 Hz ang refresh rate para sa ilang content. Mas lumalakas ang paggamit ng baterya."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Pilitin ang 90 Hz na rate ng pag-refresh"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Pinakamataas na rate ng pag-refresh para sa pinahusay na pagiging responsive ng pagpindot at kalidad ng animation. Pinapalakas ang paggamit ng baterya."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Atensyon sa screen"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Naka-on / Hindi mag-o-off ang screen kung tinitingnan mo ito"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Bersyon ng Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Update sa seguridad ng Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Modelo"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Modelo: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Modelo at hardware"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Bersyon ng hardware"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ID ng Kagamitan"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Na-reset na ang mga network setting"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Hindi mabura ang mga SIM"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Hindi mabura ang mga na-download na SIM dahil sa isang error.\n\nI-restart ang iyong device at subukang muli."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Burahin ang lahat ng data (factory reset)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Burahin lahat (factory reset)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Buburahin nito ang lahat ng data sa "<b>"internal storage"</b>" ng iyong tablet, kasama ang:\n\n"<li>"Google Account mo"</li>\n<li>"Mga data at setting ng system at app"</li>\n<li>"Mga na-download na app"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Buburahin nito ang lahat ng data sa "<b>"internal storage"</b>" ng iyong telepono, kasama ang:\n\n"<li>"Google Account mo"</li>\n<li>"Data at mga setting ng system at app"</li>\n<li>"Mga na-download na app"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Kasalukuyan kang naka-sign in sa mga sumusunod na account:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"May iba pang mga user sa device na ito.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Musika"</li>\n<li>"Mga Larawan"</li>\n<li>"Ibang data ng user"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"mga eSIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Hindi nito kakanselahin ang iyong plano ng serbisyo sa mobile."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Upang i-clear ang musika, mga larawan at iba pang data ng user, kailangang mabura ang "<b>"USB storage"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Upang i-clear ang musika, mga larawan at ibang data ng user, kailangang mabura ang "<b>"SD card"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Burahin lahat (factory reset)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Burahin lahat (factory reset)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Buburahin nito ang lahat ng data sa "<b>"internal storage"</b>" ng iyong tablet, kasama ang:\n\n"<li>"Google Account mo"</li>\n<li>"Mga data at setting ng system at app"</li>\n<li>"Mga na-download na app"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Buburahin nito ang lahat ng data sa "<b>"internal storage"</b>" ng iyong telepono, kasama ang:\n\n"<li>"Google Account mo"</li>\n<li>"Data at mga setting ng system at app"</li>\n<li>"Mga na-download na app"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Kasalukuyan kang naka-sign in sa mga sumusunod na account:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"May iba pang user sa device na ito.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Musika"</li>\n<li>"Mga Larawan"</li>\n<li>"Ibang data ng user"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"mga eSIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Hindi nito kakanselahin ang iyong plano ng serbisyo sa mobile."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Para i-clear ang musika, mga larawan at iba pang data ng user, kailangang mabura ang "<b>"USB storage"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Para i-clear ang musika, mga larawan at ibang data ng user, kailangang mabura ang "<b>"SD card"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Burahin ang storage na USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Burahin ang SD card"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Burahin ang lahat ng data sa panloob na USB storage, gaya ng musika o mga larawan"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Burahin ang lahat ng data sa SD card, gaya ng musika o mga larawan"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Burahin ang lahat ng data"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Burahin ang lahat ng data"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Made-delete ang lahat ng iyong personal na impormasyon at na-download na app. Hindi mo maa-undo ang pagkilos na ito."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Made-delete ang lahat ng iyong personal na impormasyon, kasama ang mga na-download na app at SIM. Hindi mo maa-undo ang pagkilos na ito."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Burahin lahat"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Walang isinagawang pag-reset dahil hindi available ang serbisyong System Clear."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Burahin ang lahat ng data?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Hindi available ang factory reset para sa user na ito"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Binubura"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Mangyaring maghintay..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Burahin ang lahat ng data"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Burahin ang lahat ng data"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Made-delete ang lahat ng iyong personal na impormasyon at na-download na app. Hindi mo maa-undo ang pagkilos na ito."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Made-delete ang lahat ng iyong personal na impormasyon, kasama ang mga na-download na app at SIM. Hindi mo maa-undo ang pagkilos na ito."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Burahin ang lahat ng data?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Hindi available ang factory reset para sa user na ito"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Binubura"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Pakihintay…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Mga setting ng tawag"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"I-set up ang voicemail, pagpasa ng tawag, call waiting, caller ID"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Pag-tether sa USB"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Hindi ma-tether sa higit sa <xliff:g id="MAXCONNECTION">%1$d</xliff:g> (na) device."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Maa-untether ang <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Pag-tether ng Ethernet"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Ibahagi ang koneksyon sa internet ng telepono gamit ang USB Ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Ibahagi ang koneksyon sa internet ng telepono gamit ang Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Gamitin ang hotspot at pag-tether upang makapagbigay ng internet sa iba pang device sa pamamagitan ng iyong koneksyon ng mobile data. Maaari ding gumawa ang mga app ng hotspot upang magbahagi ng content sa mga kalapit na device."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Gamitin ang hotspot at pag-tether para magbigay ng internet sa iba pang device sa pamamagitan ng iyong koneksyon sa Wi‑Fi o mobile data. Puwede ring gumawa ng hotspot ang mga app para magbahagi ng content sa mga kalapit na device."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Tulong"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Mga kagustuhan sa caption"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Pag-magnify"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Bahaging ima-magnify"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"I-enable ang pag-magnify"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Piliin ang (mga) bahaging ima-magnify na gusto mong gamitin kapag mina-magnify ang screen"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Full screen"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Bahagi ng screen"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Full screen at bahagi ng screen"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"I-magnify ang buong screen"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"I-magnify ang bahagi ng screen"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Lumipat sa button ng pagiging accessible?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Kapag gumamit ng triple tap para i-magnify ang isang bahagi ng screen, maaantala ang pag-type at iba pang pagkilos.\n\nGusto mo bang lumipat sa paggamit ng button ng pagiging accessible para mag-magnify?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Lumipat sa button ng pagiging accessible"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Gamitin pa rin ang triple tap para mag-magnify"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Mga setting ng pag-magnify"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Mag-magnify gamit ang triple-tap"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Mag-magnify gamit ang shortcut"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Tatapusin ng power button ang tawag"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Malaking pointer ng mouse"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Alisin ang mga animation"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Mono audio"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Pagsamahin ang mga channel kapag nagpapatugtog"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Balanse ng audio"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Kaliwa"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Kanan"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Mono audio"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Pagsamahin ang mga channel kapag nagpapatugtog"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Balanse ng audio"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Kaliwa"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Kanan"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Default"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 segundo"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 segundo"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Pag-vibrate kapag may notification"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Pag-vibrate kapag nag-ring"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Feedback sa pagpindot"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Gamitin ang <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Buksan ang <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Gumamit ng pagtatama ng kulay"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Ipakita ang mga caption"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Para sa sinusuportahang app lang"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Gamitin ang <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Buksan ang <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Gumamit ng pagtatama ng kulay"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Ipakita ang mga caption"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Para sa sinusuportahang app lang"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Laki at istilo ng caption"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> (na) sukat ng text"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Higit pang opsyon"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomaly"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomaly"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomaly"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Grayscale"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Pula-berde"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Pula-berde"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Asul-dilaw"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Paghihigpit sa background"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Pahintulutan ang app na tumakbo sa background"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Hindi pinapahintulutan ang app na tumakbo sa background"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Hindi maaaring paghigpitan ang paggamit sa background"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Hindi puwedeng paghigpitan ang paggamit sa background"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Limitahan ang aktibidad sa background?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Kung lilimitahan mo ang aktibidad sa background ng app, maaari itong gumana nang hindi tama"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Hindi nakatakda ang app na mag-optimize ng baterya kaya hindi ito malilimitahan.\n\nPara malimitahan, i-on ang battery optimization."</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Magtakda ng iskedyul"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Patagalin ang baterya"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"I-off kapag naka-charge"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Mao-off ang Pangtipid sa Baterya kapag nasa <xliff:g id="PERCENT">%1$s</xliff:g> na ang iyong telepono"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Mao-off ang Pangtipid sa Baterya kapag nasa <xliff:g id="PERCENT">%1$s</xliff:g> na ang iyong tablet"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Mao-off ang Pangtipid sa Baterya kapag nasa <xliff:g id="PERCENT">%1$s</xliff:g> na ang iyong device"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Mag-o-off ang Pantipid ng Baterya kapag lampas <xliff:g id="PERCENT">%1$s</xliff:g> na ang charge ng iyong telepono"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Mag-o-off ang Pantipid ng Baterya kapag lampas <xliff:g id="PERCENT">%1$s</xliff:g> na ang charge ng iyong tablet"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Mag-o-off ang Pantipid ng Baterya kapag lampas <xliff:g id="PERCENT">%1$s</xliff:g> na ang charge ng iyong device"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"I-on"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"I-reset"</string>
     <string name="tts_play" msgid="2945513377250757221">"I-play"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Adaptive na pagkakonekta"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Pinapatagal ang baterya at pinapahusay ang performance ng device sa pamamagitan ng awtomatikong pamamahala sa iyong mga koneksyon ng network"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Storage ng kredensyal"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Mag-install ng certificate"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Mag-install ng mga certificate mula sa storage"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Mga kredensyal ng user"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Tingnan at baguhin ang mga naka-store na kredensyal"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Advanced"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Uri ng storage"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardware-backed"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Software lang"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Hindi available ang mga kredensyal para sa user na ito"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Na-install para sa VPN at mga app"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Na-install para sa Wi-Fi"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Pagbabayad sa terminal"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Mag-set up ng app sa pagbabayad. Pagkatapos ay idikit ang iyong telepono sa anumang terminal na may simbolong walang pakikipag-ugnayan."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Nakuha ko"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Higit pa..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Higit pa…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Itakda ang default na app sa pagbabayad"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"I-update ang default na app sa pagbabayad"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Sa contactless terminal, magbayad gamit ang <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Palaging gamitin ito para sa mga tawag"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Pumili ng SIM para sa data"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Pumili ng SIM para sa SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Lumilipat ng data SIM, maaari itong magtagal nang hanggang isang minuto..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Lumilipat ng data SIM, puwede itong magtagal nang hanggang isang minuto…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Tumawag gamit ang"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Pumili ng SIM card"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"routine, iskedyul, pangtipid sa baterya, pangtipid ng power, baterya, awtomatiko, porsyento"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, advanced na pagtawag, pagtawag gamit ang 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"idagdag ang wika, magdagdag ng wika"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"laki ng text"</string>
     <string name="default_sound" msgid="6604374495015245195">"Default na tunog"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Nasa <xliff:g id="PERCENTAGE">%1$s</xliff:g> ang volume ng pag-ring at notification"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Volume, pag-vibrate, Huwag Istorbohin"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"I-on ang mga tunog"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Instant Caption"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"I-autocaption ang media"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Wala"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one">Naitakda ang <xliff:g id="ON_COUNT">%d</xliff:g> iskedyul</item>
-      <item quantity="other">Naitakda ang <xliff:g id="ON_COUNT">%d</xliff:g> na iskedyul</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Wala}=1{Naitakda ang 1 iskedyul}one{Naitakda ang # iskedyul}other{Naitakda ang # na iskedyul}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Huwag Istorbohin"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Makakuha lang ng notification mula sa mahahalagang tao at app"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limitahan ang mga pagkaantala"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Priyoridad lang"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Naka-on / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Naka-off / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Naka-off"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Naka-on"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Itanong palagi"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Hanggang sa i-off mo"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> oras</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> na oras</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> (na) minuto"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> (na) iskedyul ang maaaring awtomatikong mag-on</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> (na) iskedyul ang maaaring awtomatikong mag-on</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 oras}one{# oras}other{# na oras}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minuto}one{# minuto}other{# na minuto}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Naka-off}=1{Naka-off / 1 iskedyul ang puwedeng awtomatikong mag-on}one{Naka-off / # iskedyul ang puwedeng awtomatikong mag-on}other{Naka-off / # na iskedyul ang puwedeng awtomatikong mag-on}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Ang puwedeng makaabala sa Huwag Istorbohin"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Mga Tao"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Mga App"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Awtomatikong itakda sa Malumanay ang mga notification na may mababang priyoridad"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Pag-rank ng adaptive na notification"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Awtomatikong i-rank ang mga notification ayon sa kaugnayan nito"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Feedback sa adaptive na notification"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Isaad ang mga pagsasaayos na ginawa sa mga notification at ipakita ang opsyon para makapagbigay ng feedback sa system"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Mga iminumungkahing pagkilos at tugon"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Awtomatikong ipakita ang mga iminumungkahing pagkilos at tugon"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Ipakita ang mga kamakailan at na-snooze na notification"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Access na Huwag Istorbohin"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Payagan ang Huwag Istorbohin"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Walang mga naka-install na app ang humiling ng access na Huwag Istorbohin"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Naglo-load ng mga app..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Naglo-load ng mga app…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Bilang tugon sa iyong kahilingan, pinipigilan ng Android na lumabas sa device na ito ang mga notification ng app na ito"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Bilang tugon sa iyong kahilingan, pinipigilan ng Android na lumabas sa device na ito ang ganitong kategorya ng mga notification"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Bilang tugon sa iyong kahilingan, pinipigilan ng Android na lumabas sa device na ito ang ganitong grupo ng mga notification"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Lahat ng pag-uusap"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Mga priyoridad na pag-uusap"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Wala"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> pag-uusap</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> na pag-uusap</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Wala"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Wala}=1{1 pag-uusap}one{# pag-uusap}other{# na pag-uusap}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Sino ang puwedeng umabala"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Mga Tawag"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Mga Tawag"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Para matiyak na tumunog ang mga pinapayagang tawag, tiyaking nakatakda ang device na mag-ring"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Para sa ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>,’ naka-block ang mga papasok na tawag. Maaari mong isaayos ang mga setting para mabigyang-daan ang iyong mga kaibigan, kapamilya, o iba pang contact na makaugnayan ka."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Mga naka-star na contact"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one"><xliff:g id="NUM_PEOPLE">%d</xliff:g> iba pa</item>
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> na iba pa</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Wala"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Wala}=1{{contact_1}}=2{{contact_1} at {contact_2}}=3{{contact_1}, {contact_2}, at {contact_3}}one{{contact_1}, {contact_2}, at # pa}other{{contact_1}, {contact_2}, at # pa}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Mga Mensahe"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"mga mensahe"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Messages"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Para sa ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>,’ naka-block ang mga papasok na mensahe. Puwede mong isaayos ang mga setting para payagan ang iyong mga kaibigan, kapamilya, o iba pang contact na makipag-ugnayan sa iyo."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Makakapasok ang lahat ng mensahe"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Makakapasok ang lahat ng tawag"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Wala"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> contact</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> na contact</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Wala}=1{1 contact}one{# contact}other{# na contact}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Sinuman"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Mga Contact"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Mga naka-star na contact"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Lahat ng notification"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Ilang notification"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Magagawa pa rin ng mga napiling tao na makipag-ugnayan sa iyo, kahit na hindi mo pinapayagan ang mga app na umabala"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one">Puwedeng makaabala ang <xliff:g id="APP_NAMES">%s</xliff:g></item>
-      <item quantity="other">Puwedeng makaabala ang <xliff:g id="APP_NAMES">%s</xliff:g></item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> pa"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Walang app ang puwedeng makaabala}=1{Puwedeng makaabala ang {app_1}}=2{Puwedeng makaabala ang {app_1} at {app_2}}=3{Puwedeng makaabala ang {app_1}, {app_2}, at {app_3}}one{Puwedeng makaabala ang {app_1}, {app_2}, at # pa}other{Puwedeng makaabala ang {app_1}, {app_2}, at # pa}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Mga App"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Lahat ng notification"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Ilang notification"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Mga notification na puwedeng umabala"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Payagan ang lahat ng notification"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one">Puwedeng makaabala ang <xliff:g id="SOUND_CATEGORIES">%s</xliff:g></item>
-      <item quantity="other">Puwedeng makaabala ang <xliff:g id="SOUND_CATEGORIES">%s</xliff:g></item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Walang puwedeng makaabala"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> pa"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Walang puwedeng makaabala}=1{Puwedeng makaabala ang {sound_category_1}}=2{Puwedeng makaabala ang {sound_category_1} at {sound_category_2}}=3{Puwedeng makaabala ang {sound_category_1}, {sound_category_2}, at {sound_category_3}}one{Puwedeng makaabala ang {sound_category_1}, {sound_category_2}, at # pa}other{Puwedeng makaabala ang {sound_category_1}, {sound_category_2}, at # pa}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Walang puwedeng makaabala"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Walang taong puwedeng makaabala"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Puwedeng makaabala ang ilang tao"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Puwedeng makaabala ang lahat ng tao"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"Kinokontrol ang USB ng"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Nakakonektang device"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Ang device na ito"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Lumilipat..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Lumilipat…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Hindi mailipat"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Pag-charge sa device na ito"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Pag-charge ng nakakonektang device"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Tingnan ang mga detalye"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Data Saver"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Hindi pinaghihigpitang data"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Naka-off ang data ng background"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Naka-off ang data sa background"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Naka-on"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Naka-off"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Gumamit ng Data Saver"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Kung naka-lock ang device, iwasang mag-type ng mga tugon o iba pang text sa mga notification"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Default na spell checker"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Pumili ng spell checker"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Gamitin ang spell checker"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Gamitin ang spell checker"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Hindi napili"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(wala)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Upang tumulong na magbakante ng space sa storage, inaalis ng storage manager ang mga naka-back up na larawan at video mula sa iyong device."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Alisin ang mga larawan at video"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Storage manager"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Gumamit ng Storage manager"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Gumamit ng Storage manager"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Awtomatiko"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Magbakante ng espasyo ngayon"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Mag-double tap para tingnan ang telepono"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Mag-double tap upang suriin ang tablet"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Mag-double tap upang suriin ang device"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Mag-swipe para sa notif"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Mag-swipe sa pinakababa ng screen para ipakita ang iyong mga notification"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"One-Handed mode"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Gumamit ng one-handed mode"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Lumabas kapag nagpapalit ng mga app"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Timeout"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 na segundo"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 segundo"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 segundo"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"reachability"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Para tingnan ang oras, mga notification, at iba pang impormasyon, i-double tap ang iyong screen."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Kunin para tingnan ang telepono"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Kunin upang suriin ang tablet"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"I-tap para suriin ang tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"I-tap para suriin ang device"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Para tingnan ang oras, mga notification, at iba pang impormasyon, i-tap ang iyong screen."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Panic button"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Simulan ang mga pang-emergency na SOS na pagkilos sa pamamagitan ng mabilis na pagpindot sa power button nang 5 beses."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Pambabalang tunog"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Mag-alerto bago ang pagsisimula ng mga pagkilos"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Mga pang-emergency na contact"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"I-swipe ang fingerprint para sa mga notification"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"I-swipe ang fingerprint"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Para makita ang iyong mga notification, mag-swipe pababa sa sensor para sa fingerprint sa likod ng telepono mo."</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"I-enable para sa lahat ng app"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Pumili ng Graphics Driver"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Default"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Game Driver"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Game Driver"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Developer Driver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Graphics Driver ng System"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Hindi makahanap ng mga network. Subukang muli."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(ipinagbabawal)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Walang SIM card"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Walang SIM"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Wala"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Kailangan ng SIM para makakonekta"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Kailangan ng SIM ng <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> para makakonekta"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Mas gustong network mode: WCDMA ang mas gusto"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Mas gustong network mode: GSM lang"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Mas gustong network mode: WCDMA lang"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobile data"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"I-access ang data gamit ang mobile network"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Awtomatikong lilipat sa carrier na ito ang telepono kapag may signal ito"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Walang available na SIM card"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Kagustuhan sa mga tawag"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Kagustuhan sa SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Itanong palagi"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Payagan ang pag-overlay sa screen sa Mga Setting"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Payagang mag-overlay sa mga screen ng Mga Setting ang mga app na puwedeng lumabas sa ibabaw ng ibang app"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Media"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Itago ang player kapag tapos na ang session ng media"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Nagbibigay-daan sa iyo ang player na magtuloy ng session mula sa pinalawak na panel ng Mga Mabilisang Setting."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Media player sa Mga Mabilisang Setting"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Ipakita ang media player nang mas matagal para madaling ituloy ang pag-playback"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Itago ang player"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Ipakita ang player"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Walang available na player"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Mga pinapayagang app"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"media"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Mag-o-on ang Bluetooth"</string>
 </resources>
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
index e193a59..8ea8ebc 100644
--- a/res/values-tr/arrays.xml
+++ b/res/values-tr/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Orta"</item>
     <item msgid="6740026006576843477">"Uzun"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Kısa"</item>
+    <item msgid="7397961711906421599">"Orta uzunlukta"</item>
+    <item msgid="4079132024502041928">"Uzun"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Varsayılan"</item>
     <item msgid="4234707448428002595">"Sans Serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Genel"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Yalnızca TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Genel"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index ca32478..1cb2f61 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Kilit ekranında profil bilgisini göster"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Hesaplar"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Konum"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Konumu kullan"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Konumu kullan"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Kapalı"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">Açık - <xliff:g id="COUNT_1">%1$d</xliff:g> uygulamanın konuma erişimi var</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Kimlik doğrulama için yüzünüzü kullanın"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Başla"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Erişilebilirlik yüz tanıma kilidi kapalıysa kurulum adımlarından bazıları TalkBack ile düzgün çalışmayabilir."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Geri dön"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Kuruluma devam et"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Erişilebilirlik kurulumunu kullan"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="one"><xliff:g id="NUMBER_0">%d</xliff:g> basamaktan az olmalıdır</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Cihaz yöneticisi yakın zamanda kullanılan bir PIN\'e izin vermiyor"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Yaygın olarak kullanılan PIN\'ler BT yöneticiniz tarafından engellendi. Farklı bir PIN deneyin."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Burada geçersiz bir karakter kullanılamaz"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"En az bir harf içermelidir"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"En az bir rakam içermelidir"</string>
@@ -653,7 +655,6 @@
       <item quantity="one">En az 1 rakam olmayan karakter içermelidir</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Cihaz yöneticisi yakın zamanda kullanılan bir şifreye izin vermiyor"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Yaygın olarak kullanılan şifreler BT yöneticiniz tarafından engellendi. Farklı bir şifre deneyin."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Artan, azalan veya tekrar eden rakam dizisine izin verilmiyor"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Onayla"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"İptal"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Kablosuz"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Kablosuz\'u aç"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Kablosuz"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Kablosuz bağlantıyı kullan"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Kablosuz bağlantıyı kullan"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Kablosuz ayarları"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Kablosuz"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Kablosuz erişim noktalarını kur ve yönet"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"“<xliff:g id="SSID">%1$s</xliff:g>” ile bağlantı kurmak için aşağıdaki QR kodunu ortalayın."</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"QR kodu tarayarak kablosuz ağa katılın"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Kablosuz ağı paylaşın"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"\"<xliff:g id="SSID">%1$s</xliff:g>\" ağına bağlanmak ve şifreyi paylaşmak için bu QR kodunu tarayın"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"“<xliff:g id="SSID">%1$s</xliff:g>” ağına katılmak için bu QR kodunu başka bir cihazla tarayın"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"\"<xliff:g id="SSID">%1$s</xliff:g>\" ağına bağlanmak için bu QR kodunu tarayın"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Tekrar deneyin. Sorun devam ederse cihaz üreticisiyle iletişime geçin"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Bir hata oluştu"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Kablosuz ağ şifresi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Hotspot şifresi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Otomatik bağlan"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Bu ağın yakınındayken telefonun otomatik olarak bağlanmasına izin verin"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Bu ağın yakınındayken tabletin otomatik olarak bağlanmasına izin verin"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Kapsama alanındayken bu ağa bağlanmaya izin verin"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Cihaz ekle"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Bu ağa cihaz eklemek için QR kodu kullanın"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR kodu geçerli bir biçim değil"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Sistem sertifikalarını kullan"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Sağlama"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Doğrulama yapma"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Sertifika belirtilmedi. Bağlantınız gizli olmayacak."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Ağ adı çok uzun."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Alan adı belirtilmelidir."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Sertifika zorunlu."</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Bağlan"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Kablosuz bağlantı açık"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ağına bağlandı"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> cihazına bağlanıyor"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Bağlanıyor…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Ağa bağlanılamadı"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Ağ, kapsama alanında değil"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Uygulama içerik paylaşıyor. İnternet bağlantısını paylaşmak için hotspot\'u kapatıp tekrar açın"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Şifre ayarlanmadı"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Hotspot adı"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> etkinleştiriliyor..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> açılıyor…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Diğer cihazlar şuna bağlanabilir: <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Hotspot şifresi"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Erişim Noktası Bandı"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Bazı içerikler için yenileme hızını otomatik olarak 60 Hz\'den 90 Hz\'e yükseltir. Pil kullanımını artırır."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"90 Hz yenileme hızına zorla"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Geliştirilmiş dokunma duyarlılığı ve animasyon kalitesi için en yüksek yenileme hızı. Pil kullanımını artırır."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Ekrana dikkat verme"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Açık / Bakıyorsanız ekran kapanmaz"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android sürümü"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android güvenlik güncellemesi"</string>
     <string name="model_info" msgid="8997566254717810904">"Model"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Model: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Model ve donanım"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Donanım sürümü"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Cihaz Kimliği"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Ağ ayarları sıfırlandı"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"SIM\'ler silinemiyor"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"İndirilen SIM\'ler bir hata nedeniyle silinemiyor.\n\nCihazınızı yeniden başlatın ve tekrar deneyin."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Tüm verileri sil (fabrika ayarlarına sıfırla)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Tüm verileri sil (sıfırla)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Bu işlem, tabletinizin "<b>"dahili depolama alanından"</b>"şu verilerin tümünü siler:\n\n"<li>"Google hesabınız"</li>\n<li>"Sistem ve uygulama verileri ile ayarları"</li>\n<li>"İndirilen uygulamalar"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Bu işlem, telefonunuzun "<b>"dahili depolama alanından"</b>" şu verilerin tümünü siler:\n\n"<li>"Google hesabınız"</li>\n<li>"Sistem ve uygulama verileri ile ayarları"</li>\n<li>"İndirilen uygulamalar"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Şu anda aşağıdaki hesaplarda oturum açmış durumdasınız:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Bu cihazda başka kullanıcılar da var.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Müzik"</li>\n<li>"Fotoğraflar"</li>\n<li>"Diğer kullanıcı verileri"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM\'ler"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Bu işlem mobil hizmet planınızı iptal etmeyecektir."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Müzik, resimler ve diğer kullanıcı verilerinin temizlenmesi için "<b>"USB belleğin"</b>" silinmesi gerekir."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Müzik, resimler ve diğer kullanıcı verilerinin temizlenmesi için "<b>"SD kartın"</b>" silinmesi gerekir."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Tüm verileri sil (fabrika ayarlarına sıfırla)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Tüm verileri sil (fabrika ayarlarına sıfırla)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Bu işlem, tabletinizin "<b>"dahili depolama alanından"</b>"şu verilerin tümünü siler:\n\n"<li>"Google hesabınız"</li>\n<li>"Sistem ve uygulama verileri ile ayarları"</li>\n<li>"İndirilen uygulamalar"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Bu işlem, telefonunuzun "<b>"dahili depolama alanından"</b>" şu verilerin tümünü siler:\n\n"<li>"Google hesabınız"</li>\n<li>"Sistem ve uygulama verileri ile ayarları"</li>\n<li>"İndirilen uygulamalar"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Şu anda aşağıdaki hesaplarda oturum açmış durumdasınız:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Bu cihazda başka kullanıcılar da var.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Müzik"</li>\n<li>"Fotoğraflar"</li>\n<li>"Diğer kullanıcı verileri"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM\'ler"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Bu işlem mobil hizmet planınızı iptal etmeyecektir."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Müzik, resimler ve diğer kullanıcı verilerinin temizlenmesi için "<b>"USB belleğin"</b>" silinmesi gerekir."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Müzik, resimler ve diğer kullanıcı verilerinin temizlenmesi için "<b>"SD kartın"</b>" silinmesi gerekir."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USB belleği sil"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SD kartı sil"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Dahili USB bellekteki müzik veya fotoğraf gibi tüm verileri sil"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"SD kartındaki müzik ve fotoğraf gibi tüm verileri sil"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Tüm verileri sil"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Tüm verileri sil"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Tüm kişisel bilgileriniz ve indirilen uygulamalar silinir. Bu işlemi geri alamazsınız."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"İndirilen uygulamalar ve SIM\'ler dahil olmak üzere tüm kişisel bilgileriniz silinecek. Bu işlemi geri alamazsınız."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Her şeyi sil"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Sistem Temizleme hizmeti kullanılamadığından sıfırlama yapılmadı."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Tüm veriler silinsin mi?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Bu kullanıcı için fabrika ayarlarına sıfırlama işlevi kullanılamıyor"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Siliniyor"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Lütfen bekleyin..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Tüm verileri sil"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Tüm verileri sil"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Tüm kişisel bilgileriniz ve indirilen uygulamalar silinir. Bu işlemi geri alamazsınız."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"İndirilen uygulamalar ve SIM\'ler dahil olmak üzere tüm kişisel bilgileriniz silinecek. Bu işlemi geri alamazsınız."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Tüm veriler silinsin mi?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Bu kullanıcı için fabrika ayarlarına sıfırlama işlevi kullanılamıyor"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Siliniyor"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Lütfen bekleyin…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Çağrı ayarları"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Sesli mesaj, çağrı yönlendirme ve bekletme, arayan kimliğini ayarla"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB tethering"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"En çok <xliff:g id="MAXCONNECTION">%1$d</xliff:g> cihaz için tethering yapılabilir."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> internet paylaşımı kesilecek."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ethernet tethering"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Telefonun internet bağlantısını USB üzerinden paylaşın"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Telefonun internet bağlantısını Ethernet üzerinden paylaşın"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Mobil veri bağlantınızdan başka cihazlara internet bağlantısı sağlamak için hotspot ve tethering\'i kullanın. Yakınlardaki cihazlarla içerik paylaşmak için uygulamalar da hotspot oluşturabilir."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Kablosuz veya mobil veri bağlantınızdan başka cihazlara internet bağlantısı sağlamak için hotspot ve tethering\'i kullanın. Yakınlardaki cihazlarla içerik paylaşmak için uygulamalar da hotspot oluşturabilir."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Yardım"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Altyazı tercihleri"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Büyütme"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Büyütme alanı"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Büyütmeyi etkinleştirme"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Ekranı büyütürken kullanmak istediğiniz büyütme alanlarını seçin"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Tam ekran"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Ekranın bir parçası"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Tam ekran ve ekranın bir parçası"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Ekranın tamamını büyütün"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Ekranın bir parçasını büyütün"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Erişilebilirlik düğmesine geçilsin mi?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Ekranın bir bölümünü büyütmek için üç kez dokunma kullanılması yazma ve diğer işlemlerin gecikmesine neden olur.\n\nBüyütmek için erişilebilirlik düğmesini kullanmaya geçmek ister misiniz?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Erişilebilirlik düğmesine geç"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Büyütmek için üç kez dokunmaya devam et"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Büyütme ayarları"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Üç kez dokunarak büyütme"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Kısayolla büyütme"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Güç düğmesi çağrıyı sonlandırır"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Geniş fare işaretçisi"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Animasyonları kaldır"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Mono ses"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Ses çalınırken kanalları birleştir"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Ses dengesi"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Sol"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Sağ"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Mono ses"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Ses çalınırken kanalları birleştir"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Ses dengesi"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Sol"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Sağ"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Varsayılan"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 saniye"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 saniye"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Bildirim titreşimi"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Zili çaldırma titreşimi"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Dokunma geri bildirimi"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> uygulamasını kullan"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> uygulamasını aç"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Renk düzeltme işlevini kullan"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Altyazıları göster"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Yalnızca desteklenen uygulamalar için"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> özelliğini kullan"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> sayfasını aç"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Renk düzeltme işlevini kullan"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Altyazıları göster"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Yalnızca desteklenen uygulamalar için"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Altyazı boyutu ve stili"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> metin boyutu"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Diğer seçenekler"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Döteranomali"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomali"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomali"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Gri tonlama"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Kırmızı-yeşil"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Kırmızı-yeşil"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Mavi-sarı"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Arka plan kısıtlaması"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Uygulamanın arka planda çalışmasına izin verin"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Uygulamanın arka planda çalıştırılmasına izin verilmiyor"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Arka plan kullanımı kısıtlanamıyor"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Arka plan kullanımı kısıtlanamıyor"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Arka plan etkinliği sınırlansın mı?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Uygulama için arka plan etkinliğini sınırlarsanız hatalı davranabilir"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Uygulama, pili optimize etmek için ayarlanmadığından kısıtlanamaz.\n\nUygulamayı kısıtlamak için önce pil optimizasyonunu açın."</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Bir plan belirleyin"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Pil ömrünü uzatın"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Şarj olduğunda kapat"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Pil Tasarrufu, telefonunuzun gücü <xliff:g id="PERCENT">%1$s</xliff:g> olduğunda kapanır"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Tabletinizin şarjı <xliff:g id="PERCENT">%1$s</xliff:g> olduğunda Pil Tasarrufu kapanır"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Pil Tasarrufu, cihazınızın gücü <xliff:g id="PERCENT">%1$s</xliff:g> olduğunda kapanır"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Pil Tasarrufu, telefonunuz <xliff:g id="PERCENT">%1$s</xliff:g> seviyesinin üzerinde şarj olduğunda kapanır"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Pil Tasarrufu, tabletiniz <xliff:g id="PERCENT">%1$s</xliff:g> seviyesinin üzerinde şarj olduğunda kapanır"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Pil Tasarrufu, cihazınız <xliff:g id="PERCENT">%1$s</xliff:g> seviyesinin üzerinde şarj olduğunda kapanır"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Aç"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Sıfırla"</string>
     <string name="tts_play" msgid="2945513377250757221">"Çal"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Adaptif bağlantı"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Ağ bağlantılarınızı otomatik olarak yöneterek pil ömrünü uzatır ve cihaz performansını iyileştirir"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Kimlik bilgileri deposu"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Sertifika yükleme"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Sertifikaları depolama biriminden yükleyin"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Kullanıcı kimlik bilgileri"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Depolanmış kimlik bilgilerini görüntüleyin ve değiştirin"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Gelişmiş"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Depolama türü"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Donanım destekli"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Yalnızca yazılım"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Bu kullanıcı için kimlik bilgileri kullanılamıyor"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN ve uygulamalar için yüklendi"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Kablosuz bağlantı için yüklendi"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Kasada ödeme"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Ödeme uygulaması kurun. Ardından, telefonunuzun arka tarafını temassız işlem sembolünün olduğu herhangi bir ödeme noktasına doğru tutmanız yeterli olacaktır."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Anladım"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Diğer..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Diğer…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Varsayılan ödeme uygulamasını ayarla"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Varsayılan ödeme uygulamasını güncelle"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Temassız bir terminalde <xliff:g id="APP">%1$s</xliff:g> uygulamasıyla ödeyin"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Çağrılar için her zaman bunu kullan"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Veri için bir SIM kart seçin"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"SMS için bir SIM kart seçin"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Veri için kullanılan SIM kart değiştiriliyor. Bu işlem bir dakika kadar sürebilir..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Veri için kullanılan SIM kart değiştiriliyor. Bu işlem bir dakika kadar sürebilir…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Telefon etmek için şu SIM kartı kullan:"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Bir SIM kart seçin"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM: <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"rutin, program, pil tasarrufu, güç tasarrufu, pil, otomatik, yüzde"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"VoLTE, Gelişmiş Arama, 4G Arama"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"dil ekle, bir dil ekle"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"metin boyutu"</string>
     <string name="default_sound" msgid="6604374495015245195">"Varsayılan ses"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Zil ve bildirim sesi <xliff:g id="PERCENTAGE">%1$s</xliff:g> düzeyinde"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Ses düzeyi, titreşim, Rahatsız Etmeyin"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Açılış sesleri"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Canlı Altyazı"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Otomatik medya altyazısı"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Yok"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> program ayarlandı</item>
-      <item quantity="one">1 program ayarlandı</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Yok}=1{1 program ayarlandı}other{# program ayarlandı}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Rahatsız Etmeyin"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Yalnızca önemli kişiler ve uygulamalardan gelen bildirimleri alın"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Kesintileri sınırlayın"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Yalnızca öncelikliler"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Açık / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Kapalı / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Kapalı"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Aç"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Her zaman sor"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Siz kapatana kadar"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> saat</item>
-      <item quantity="one">1 saat</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> dakika"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> program otomatik olarak açılabilir</item>
-      <item quantity="one">1 program otomatik olarak açılabilir</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 saat}other{# saat}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 dakika}other{# dakika}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Kapalı}=1{Kapalı / 1 program otomatik olarak açılabilir}other{Kapalı / # program otomatik olarak açılabilir}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Rahatsız Etmeyin modunda neler kesintiye neden olabilir?"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Kişiler"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Uygulamalar"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Düşük öncelikli bildirimleri otomatik olarak Sessiz moda ayarla"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Uyarlamalı bildirim sıralama"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Bildirimleri alaka düzeyine göre otomatik olarak sırala"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Uyarlamalı bildirimlerle ilgili geri bildirim"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Bildirimlerde yapılan düzenlemeleri belirtin ve sisteme geri bildirim sağlama seçeneğini gösterin"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Önerilen işlemler ve yanıtlar"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Önerilen işlemleri ve yanıtları otomatik olarak göster"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Son ve ertelenen bildirimleri göster"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Rahatsız Etmeyin erişimi"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Rahatsız Etmeyin\'e izin ver"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Yüklü hiçbir uygulama Rahatsız Etmeyin erişimi isteğinde bulunmadı"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Uygulamalar yükleniyor..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Uygulamalar yükleniyor…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"İsteğiniz üzerine Android, bu uygulamanın bildirimlerinin bu cihazda görünmesini engelliyor"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"İsteğiniz üzerine Android, bu kategorideki bildirimlerin bu cihazda görünmesini engelliyor"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"İsteğiniz üzerine Android, bu bildirim grubunun bu cihazda görünmesini engelliyor"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Tüm görüşmeler"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Öncelikli görüşmeler"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Yok"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> görüşme</item>
-      <item quantity="one">1 görüşme</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Yok"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Yok}=1{1 görüşme}other{# görüşme}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Kimler kesintiye neden olabilir?"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Aramalar"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Çağrılar"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"İzin verilen aramaların ses çıkardığından emin olmak için cihazınızın çalmaya ayarlı olduğundan emin olun"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"\"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" boyunca gelen aramalar engelleniyor. Arkadaşlarınız, aileniz veya diğer kişilerinizin size ulaşmasına izin vermek için ayarlarınızı düzenleyebilirsiniz."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Yıldızlı kişiler"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> kişi daha</item>
-      <item quantity="one">1 kişi daha</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Yok"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Yok}=1{{contact_1}}=2{{contact_1} ve {contact_2}}=3{{contact_1}, {contact_2} ve {contact_3}}other{{contact_1}, {contact_2} ve # kişi daha}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"İletiler"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"mesajlar"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Mesajlar"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"\"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" için gelen mesajlar engelleniyor. Arkadaşlarınız, aileniz veya diğer kişilerin size ulaşmasına izin vermek için ayarları düzenleyebilirsiniz."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Tüm mesajlar size ulaşabilir"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Tüm aramalar size ulaşabilir"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Yok"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kişi</item>
-      <item quantity="one">1 kişi</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Yok}=1{1 kişi}other{# kişi}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Herkes"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Kişiler"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Yıldızlı kişiler"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Tüm bildirimler"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Bazı bildirimler"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Uygulamaların kesintiye neden olmasına izin vermeseniz bile seçtiğiniz kişiler size ulaşmaya devam edebilir."</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> kesintiye neden olabilir</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> kesintiye neden olabilir</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> tane daha"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Hiçbir uygulama kesintiye neden olamaz}=1{{app_1} kesintiye neden olabilir}=2{{app_1} ve {app_2} kesintiye neden olabilir}=3{{app_1}, {app_2} ve {app_3} kesintiye neden olabilir}other{{app_1}, {app_2} ve # uygulama daha kesintiye neden olabilir}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Uygulamalar"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Tüm bildirimler"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Bazı bildirimler"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Kesintiye neden olabilecek bildirimler"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Tüm bildirimlere izin ver"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> kesintiye neden olabilir</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> kesintiye neden olabilir</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Hiçbir şey kesintiye neden olamaz"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> tane daha"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Hiçbir şey kesintiye neden olamaz}=1{{sound_category_1} kesintiye neden olabilir}=2{{sound_category_1} ve {sound_category_2} kesintiye neden olabilir}=3{{sound_category_1}, {sound_category_2} ve {sound_category_3} kesintiye neden olabilir}other{{sound_category_1}, {sound_category_2} ve # uygulama daha kesintiye neden olabilir}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Hiçbir şey kesintiye neden olamaz"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Hiç kimse kesintiye neden olamaz"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Bazı kişiler kesintiye neden olabilir"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Tüm kişiler kesintiye neden olabilir"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB\'yi kontrol eden:"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Bağlı cihaz"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Bu cihaz"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Geçiş yapılıyor..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Geçiş yapılıyor…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Geçiş yapılamadı"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Bu cihazı şarj ediyor"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Bağlı cihazı şarj etme"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Ayrıntıları göster"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Veri Tasarrufu"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Kısıtlanmamış veri"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Arka plan verisi kapalı"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Arka plan verisi kapalı"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Açık"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Kapalı"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Veri Tasarrufu\'nu kullan"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Cihaz kilitliyse, bildirimlerde yanıt yazmayı veya diğer metin girişlerini önle"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Varsayılan yazım denetleyici"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Yazım denetleyiciyi seçin"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Yazım denetleyici kullan"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Yazım denetleyiciyi kullan"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Seçili değil"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(yok)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Depolama alanında yer açmaya yardımcı olmak için depolama yöneticisi, yedeklenen fotoğrafları ve videoları cihazınızdan kaldırır."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Fotoğrafları ve videoları kaldır"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Depolama yöneticisi"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Depolama yöneticisini kullan"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Depolama yöneticisini kullan"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Otomatik"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Manuel"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Şimdi yer boşalt"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Bakmak için telefona iki kez dokun"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Tableti kontrol etmek için iki kez dokunun"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Cihazı kontrol etmek için iki kez dokunun"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Bildirimler için kaydırın"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Bildirimlerinizi görüntülemek için ekranın alt kenarında aşağı doğru kaydırın"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Tek El modu"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Tek el modunu kullan"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Uygulama değiştirirken çık"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Zaman aşımı"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 saniye"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 saniye"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 saniye"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"erişilebilirlik"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Saati, bildirimleri ve diğer bilgileri kontrol etmek için ekranınıza iki kez dokunun."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Bakmak için telefonu kaldır"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Tableti kontrol etmek için kaldırın"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Tableti kontrol etmek için dokunun"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Cihazı kontrol etmek için dokunun"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Saati, bildirimleri ve diğer bilgileri kontrol etmek için ekranınıza dokunun."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Panik düğmesi"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Güç düğmesine hızlı bir şekilde 5 kez basarak acil durum yardım isteme işlemlerini başlatın."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Uyarı sesi"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"İşlemleri başlatmadan önce uyar"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Acil durumda iletişim"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Bildirimler için parmak izini kaydırın"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Parmak izini kaydırın"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Bildirimlerinizi kontrol etmek için telefonunuzun arkasındaki parmak izi sensöründe parmağınızı hızlıca aşağı kaydırın."</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Tüm uygulamalar için etkinleştir"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Grafik Sürücüsünü Seçin"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Varsayılan"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Oyun Sürücüsü"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Oyun Sürücüsü"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Geliştirici Sürücüsü"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Sistem Grafik Sürücüsü"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Ağ bulunamadı. Tekrar deneyin."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(yasak)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"SIM kart yok"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"SIM kart yok"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Yok"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Bağlanmak için SIM gerektirir"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Bağlanmak için <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> operatörünün SIM\'ini gerektirir"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Tercih edilen ağ modu: WCDMA tercih edilir"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Tercih edilen ağ modu: Yalnızca GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Tercih edilen ağ modu: Yalnızca WCDMA"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobil veri"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Verilere mobil ağ üzerinden erişim"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Telefon, kapsama alanında olduğunda otomatik olarak bu operatöre geçer"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"SIM kart yok"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Çağrı tercihi"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS tercihi"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Her zaman sor"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Ayarların üzerinde ekran yer paylaşımına izin ver"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Diğer uygulamaların üzerinde görüntülenebilecek uygulamaların Ayarlar ekranlarıyla yer paylaşımlı olarak gösterilmesine izin verir"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Medya"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Medya oturumu sona erdiğinde oynatıcıyı gizle"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Oynatıcı, genişletilmiş Hızl Ayarlar panelinden bir oturumu devam ettirmenize olanak sağlar."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Hızlı Ayarlar\'da Medya oynatıcı"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Oynatmayı kolayca devam ettirmek için medya oynatıcıyı uzun süre göster"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Oynatıcıyı gizle"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Oynatıcıyı göster"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Kullanılabilir oynatıcı yok"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"İzin verilen uygulamalar"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"medya"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth açılacak"</string>
 </resources>
diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml
index ae6d1cf..50cf751 100644
--- a/res/values-uk/arrays.xml
+++ b/res/values-uk/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Середня"</item>
     <item msgid="6740026006576843477">"Довга"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Короткий"</item>
+    <item msgid="7397961711906421599">"Середній"</item>
+    <item msgid="4079132024502041928">"Довгий"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"За умовчанням"</item>
     <item msgid="4234707448428002595">"Sans-Serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Загальний"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Лише TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Загальні"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 71b50b8..51078e8 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -300,7 +300,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Показувати інформацію профілю на заблокованому екрані"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Облікові записи"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Місцезнаходження"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Використовувати геодані"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Використовувати геодані"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Вимкнено"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">Увімкнено: <xliff:g id="COUNT_1">%1$d</xliff:g> додаток має доступ до геоданих</item>
@@ -335,6 +335,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Використовуйте обличчя для автентифікації"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Почати"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Якщо спеціальні можливості функції \"Фейсконтроль\" вимкнено, деякі налаштування можуть працювати з TalkBack неналежним чином."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Назад"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Продовжити налаштування"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Показати параметри доступності"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -635,7 +638,6 @@
       <item quantity="other">Може містити до <xliff:g id="NUMBER_1">%d</xliff:g> цифри</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Адміністратор пристрою не дозволяє використовувати останній PIN-код"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"IT-адміністратор заблокував загальні PIN-коди. Введіть інший PIN-код."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Не може містити недійсних символів"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Має містити принаймні одну літеру"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Має містити принаймні одну цифру"</string>
@@ -683,7 +685,6 @@
       <item quantity="other">Має містити принаймні <xliff:g id="COUNT">%d</xliff:g> символу, які не є цифрами</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Адміністратор пристрою не дозволяє використовувати останній пароль"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"IT-адміністратор заблокував загальні паролі. Введіть інший пароль."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Цифри в порядку зростання чи спадання та повторювані цифри заборонені"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Підтвердити"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Скасувати"</string>
@@ -829,7 +830,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Увімкнути Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Використовувати Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Використовувати Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Налаштування Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Налашт. і керуйте бездрот. точками доступу"</string>
@@ -937,7 +938,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Щоб підключитися до мережі \"<xliff:g id="SSID">%1$s</xliff:g>\", наведіть камеру на QR-код нижче"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Щоб під’єднатися до мережі Wi‑Fi, відскануйте QR-код"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Поділитися мережею Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Відскануйте QR-код, щоб підключитися до мережі \"<xliff:g id="SSID">%1$s</xliff:g>\" і поділитися паролем"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Відскануйте цей QR-код за допомогою іншого пристрою, щоб підключитися до мережі \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Відскануйте QR-код, щоб підключитися до мережі \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Повторіть спробу. Якщо проблема не зникне, зверніться до виробника пристрою"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Сталася помилка"</string>
@@ -963,8 +964,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Пароль Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Пароль точки доступу: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Автоматичне підключення"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Надати телефону дозвіл на автоматичне з\'єднання з цією мережею"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Надайте планшету дозвіл на автоматичне з\'єднання з цією мережею"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Дозволити підключатися до цієї мережі в зоні її покриття"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Додати пристрій"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Зіскануйте QR-код, щоб додати пристрій до цієї мережі"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"Недійсний формат QR-коду"</string>
@@ -976,7 +976,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Використовувати сертифікати системи"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Не надавати"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Не перевіряти"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Сертифікат не вказано. З’єднання не буде конфіденційним."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Назва мережі задовга."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Укажіть домен."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Потрібен сертифікат."</string>
@@ -1003,6 +1002,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Підключити"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi увімкнено"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Підключено до мережі \"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>\""</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Підключення до мережі \"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>\""</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Підключення…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Помилка під’єднання до мережі."</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Ви знаходитеся поза зоною покриття мережі"</string>
@@ -1080,7 +1080,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Додаток ділиться вмістом. Щоб надати доступ до Інтернету, вимкніть і знову ввімкніть точку доступу"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Пароль не налаштовано"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Назва точки доступу"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Увімкнення точки доступу \"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>\"…"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Увімкнення точки доступу \"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>\"…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Інші пристрої можуть підключитися до точки доступу \"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>\""</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Пароль точки доступу"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Діапазон частот точки доступу"</string>
@@ -1230,7 +1230,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Плавне відображення"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Автоматично збільшує частоту оновлення певного вмісту з 60 до 90 Гц. Підвищує використання заряду акумулятора."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Плавне відображення"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Примусова частота оновлення: 90 Гц"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Найвища частота оновлення для кращого реагування на дотики й вищої якості анімації. Підвищує використання заряду акумулятора."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Адаптивний сплячий режим"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Ввімкнено: екран не вимикатиметься, доки ви на нього дивитесь"</string>
@@ -1371,7 +1371,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Версія Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Оновлення системи безпеки Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Модель"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Модель: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Модель і апаратне забезпечення"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Версія апаратного забезпечення"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Ідентифікатор обладнання"</string>
@@ -1646,31 +1645,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Налаштування мереж скинуто"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Не вдалося видалити SIM-карти"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Під час видалення завантажених SIM-карт сталася помилка.\n\nПерезапустіть пристрій і повторіть спробу."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Стерти всі дані (відновити заводські налаштування)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Стерти всі дані (скинути налаштування)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Буде видалено всі дані з "<b>"внутрішньої пам’яті"</b>" вашого планшета, зокрема:\n\n"<li>"обліковий запис Google;"</li>\n<li>"дані й налаштування системи та додатків;"</li>\n<li>"завантажені додатки."</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Буде видалено всі дані з "<b>"внутрішньої пам\'яті"</b>" вашого телефона, зокрема:\n\n"<li>"обліковий запис Google"</li>\n<li>"дані й налаштування системи та додатків"</li>\n<li>"завантажені додатки"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Наразі ви ввійшли в такі облікові записи:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"На цьому пристрої є інші користувачі.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"музику"</li>\n<li>"фото"</li>\n<li>"інші дані користувача"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM-карти"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Ваш тарифний план не буде скасовано."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Щоб видалити музику, зображення й інші дані користувача, треба стерти "<b>"носій USB"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Щоб видалити музику, зображення й інші дані користувача, треба стерти "<b>"карту SD"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Стерти всі дані (скинути налаштування)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Стерти всі дані (скинути налаштування)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Буде видалено всі дані з "<b>"внутрішньої пам\'яті"</b>" вашого планшета, зокрема:\n\n"<li>"обліковий запис Google;"</li>\n<li>"дані й налаштування системи та додатків;"</li>\n<li>"завантажені додатки."</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Буде видалено всі дані з "<b>"внутрішньої пам\'яті"</b>" вашого телефона, зокрема:\n\n"<li>"обліковий запис Google;"</li>\n<li>"дані й налаштування системи та додатків;"</li>\n<li>"завантажені додатки."</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Наразі ви ввійшли в такі облікові записи:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"На цьому пристрої є інші користувачі.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"музику"</li>\n<li>"фото"</li>\n<li>"інші дані користувача"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM-карти"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Ваш тарифний план не буде скасовано."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Щоб видалити музику, зображення й інші дані користувача, треба стерти "<b>"носій USB"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Щоб видалити музику, зображення й інші дані користувача, треба стерти "<b>"карту SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Очистити носій USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Очистити карту SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Стерти всі дані на внутрішньому носії USB, як-от музику чи фото"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Стерти всі дані на карті SD, такі як музика чи фото."</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Стерти всі дані"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Стерти всі дані"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Усю особисту інформацію та завантажені додатки буде видалено. Цю дію неможливо відмінити."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Усю особисту інформацію, зокрема завантажені додатки й SIM-карти, буде видалено. Цю дію неможливо відмінити."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Видалити все"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Скидання не виконано, оскільки служба очищення системи не доступна."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Стерти всі дані?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Цей користувач не може відновити заводські налаштування"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Стирання"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Зачекайте…"</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Стерти всі дані"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Стерти всі дані"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Усю особисту інформацію та завантажені додатки буде видалено. Цю дію неможливо відмінити."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Усю особисту інформацію, зокрема завантажені додатки й SIM-карти, буде видалено. Цю дію неможливо відмінити."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Стерти всі дані?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Цей користувач не може скинути налаштування"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Стирання"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Зачекайте…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Виклики"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Налашт. гол.пошту, переадр.викл., парал.викл., ідент.абонента"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB-модем"</string>
@@ -1718,7 +1715,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Режим модема можливий для макс. стількох пристр.: <xliff:g id="MAXCONNECTION">%1$d</xliff:g>"</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Прив\'язку <xliff:g id="DEVICE_NAME">%1$s</xliff:g> буде скасовано."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Телефон як модем Ethernet"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Надавати доступ до Інтернету через телефон за допомогою USB Ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Надавати доступ до Інтернету через телефон за допомогою Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Надавайте іншим пристроям доступ до Інтернету через мобільне передавання даних за допомогою точки доступу та телефона в режимі модема. Додатки також можуть створювати точку доступу, щоб ділитися вмістом із пристроями поруч."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Надавайте іншим пристроям доступ до Інтернету через Wi-Fi або мобільне передавання даних за допомогою точки доступу й режиму модема. Додатки також можуть створювати точку доступу, щоб ділитися контентом із пристроями поруч."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Довідка"</string>
@@ -2165,13 +2162,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Налаштування субтитрів"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Збільшення"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Область збільшення"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Збільшення ввімкнено"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Виберіть області для збільшення масштабу екрана"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"На весь екран"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Частина екрана"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Повноекранний і напівекранний режим"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Збільшити весь екран"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Збільшити частину екрана"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Назначити на кнопку спеціальних можливостей?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Збільшення частини екрана потрійним дотиком спричинить затримки під час введення тексту й виконання інших дій.\n\nВикористовувати кнопку спеціальних можливостей для збільшення?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Назначити на кнопку спеціальних можливостей"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Збільшувати потрійним дотиком"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Налаштування збільшення"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Збільшувати потрійним торканням"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Збільшувати кнопкою/жестом"</string>
@@ -2225,11 +2225,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Кнопка живлення закінчує виклик"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Великий курсор"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Вимкнути анімацію"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Монофонічне аудіо"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Об’єднувати канали під час відтворення аудіо"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Баланс аудіо"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Зліва"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Справа"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Монофонічне аудіо"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Об\'єднувати канали під час відтворення аудіо"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Баланс аудіо"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Лівий"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Правий"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"За умовчанням"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 секунд"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 секунд"</string>
@@ -2259,11 +2259,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Вібрація під час сповіщень"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Вібрація під час дзвінків"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Реакція на дотик"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Використовувати <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Відкрити додаток <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Використовувати корекцію кольорів"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Показувати субтитри"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Лише для підтримуваних додатків"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Використовувати <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Відкрити додаток <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Використовувати корекцію кольорів"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Показувати субтитри"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Лише для підтримуваних додатків"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Розмір і стиль субтитрів"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Розмір шрифту: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Інші параметри"</string>
@@ -2295,6 +2295,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Дейтераномалія"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Протаномалія"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Тританомалія"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Відтінки сірого"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Червоний – зелений"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Червоний – зелений"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Синій – жовтий"</string>
@@ -2436,7 +2437,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Обмеження у фоновому режимі"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Дозволити додаткам працювати у фоновому режимі"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Додатку заборонено працювати у фоновому режимі"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Не можна обмежити споживання заряду у фоновому режимі"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Не можна обмежити споживання заряду у фоновому режимі"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Обмежити фонову активність?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Якщо обмежити фонову активність, додаток може працювати неналежним чином"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Оскільки в додатку не передбачено економію заряду акумулятора, його не можна обмежити.\n\nУвімкніть оптимізацію споживання заряду."</string>
@@ -2667,9 +2668,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Налаштувати розклад"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Подовжте час роботи акумулятора"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Вимикати, коли заряджено"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Режим економії заряду акумулятора вимкнеться, коли рівень заряду телефона досягне <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Режим енергозбереження буде вимкнено, коли рівень заряду планшета досягне <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Режим енергозбереження буде вимкнено, коли рівень заряду пристрою досягне <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Режим енергозбереження вимкнеться, коли ваш телефон досягне <xliff:g id="PERCENT">%1$s</xliff:g> заряду"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Режим енергозбереження вимкнеться, коли ваш планшет досягне <xliff:g id="PERCENT">%1$s</xliff:g> заряду"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Режим енергозбереження вимкнеться, коли ваш пристрій досягне <xliff:g id="PERCENT">%1$s</xliff:g> заряду"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Увімкнути"</string>
@@ -2734,6 +2735,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Скинути"</string>
     <string name="tts_play" msgid="2945513377250757221">"Відтворити"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Адаптивне з\'єднання"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Подовжує час роботи акумулятора й покращує продуктивність пристрою завдяки автоматичному керуванню з\'єднанням із мережею"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Сховище облікових даних"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Установити сертифікат"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Установити сертифікати з носія"</string>
@@ -2745,9 +2748,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Облікові дані користувача"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Переглянути та змінити збережені облікові дані"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Додатково"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Тип сховища"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Апаратне забезпечення"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Лише програмне забезпечення"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Облікові дані недоступні для цього користувача"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Установлено для мережі VPN і додатків"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Установлено для мережі Wi-Fi"</string>
@@ -3146,7 +3146,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Оплата через термінал"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Виберіть додаток для платежів. Тоді просто прикладіть телефон тильною стороною до будь-якого термінала зі значком безконтактної оплати."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"OK"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Більше…"</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Більше…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Установити платіжний додаток за умовчанням"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Змінити платіжний додаток за умовчанням"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"У терміналі для безконтактного платежу використовувати додаток <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3230,7 +3230,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Завжди телефонувати через цю SIM-карту"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"SIM-карта для Інтернету"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Виберіть SIM-карту для SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Змінення SIM-карти для мобільного Інтернету. Це може зайняти до хвилини…"</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Змінення SIM-карти для мобільного Інтернету. Це може зайняти до хвилини…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Телефонувати за допомогою"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Виберіть SIM-карту"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM-карта <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3375,6 +3375,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"послідовність дій, розклад, режим енергозбереження, економія заряду, акумулятор, автоматично, відсоток"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, виклики з розширеними можливостями, виклики в режимі 4G"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"додати мову, додавання мови"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"розмір шрифту"</string>
     <string name="default_sound" msgid="6604374495015245195">"Звук за умовчанням"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Гучність дзвінків і сповіщень: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Гучність, вібросигнал і режим \"Не турбувати\""</string>
@@ -3414,13 +3415,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Увімкнути звуки"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Живі субтитри"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Автоматичні субтитри (медіа)"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Немає"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one">Налаштовано <xliff:g id="ON_COUNT">%d</xliff:g> розклад</item>
-      <item quantity="few">Налаштовано <xliff:g id="ON_COUNT">%d</xliff:g> розклади</item>
-      <item quantity="many">Налаштовано <xliff:g id="ON_COUNT">%d</xliff:g> розкладів</item>
-      <item quantity="other">Налаштовано <xliff:g id="ON_COUNT">%d</xliff:g> розкладу</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Немає}=1{Налаштовано 1 розклад}one{Налаштовано # розклад}few{Налаштовано # розклади}many{Налаштовано # розкладів}other{Налаштовано # розкладу}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Не турбувати"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Отримуйте сповіщення лише від важливих людей і додатків"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Обмеження сповіщень"</string>
@@ -3488,24 +3483,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Лише пріоритетні"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Увімкнено / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Вимкнено / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Вимкнено"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Увімкнено"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Запитувати щоразу"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Доки не вимкнути"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> година</item>
-      <item quantity="few"><xliff:g id="NUM_HOURS">%d</xliff:g> години</item>
-      <item quantity="many"><xliff:g id="NUM_HOURS">%d</xliff:g> годин</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> години</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> хв"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> розклад може вмикатись автоматично</item>
-      <item quantity="few"><xliff:g id="ON_COUNT">%d</xliff:g> розклади можуть вмикатись автоматично</item>
-      <item quantity="many"><xliff:g id="ON_COUNT">%d</xliff:g> розкладів можуть вмикатись автоматично</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> розкладу можуть вмикатись автоматично</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 година}one{# година}few{# години}many{# годин}other{# години}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 хвилина}one{# хвилина}few{# хвилини}many{# хвилин}other{# хвилини}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Вимкнено}=1{Вимкнено / 1 розклад може вмикатись автоматично}one{Вимкнено / # розклад може вмикатись автоматично}few{Вимкнено / # розклади можуть вмикатись автоматично}many{Вимкнено / # розкладів можуть вмикатись автоматично}other{Вимкнено / # розкладу може вмикатись автоматично}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Що може переривати режим \"Не турбувати\""</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Люди"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Додатки"</string>
@@ -3551,6 +3534,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Автоматично робити тихими сповіщення з низьким пріоритетом"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Адаптивне сортування сповіщень"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Автоматичне сортування сповіщень за релевантністю"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Відгук про адаптивні сповіщення"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Указує зміни, внесені в сповіщення, і показує опцію для надсилання відгуку в систему"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Пропоновані дії та відповіді"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Автоматично показувати пропоновані дії та відповіді"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Показувати нещодавні й відкладені сповіщення"</string>
@@ -3757,7 +3742,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Доступ у режимі \"Не турбувати\""</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Дозволити доступ у режимі \"Не турбувати\""</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Установлені додатки не запитували доступу до функції \"Не турбувати\""</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Завантаження додатків…"</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Завантаження додатків…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Android блокує сповіщення з цього додатка на цьому пристрої"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"На ваш запит Android блокує цю категорію сповіщень на пристрої"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"На ваш запит Android блокує цю групу сповіщень на пристрої"</string>
@@ -3855,13 +3840,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Усі розмови"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Важливі розмови"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Не дозволено"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> розмова</item>
-      <item quantity="few"><xliff:g id="CONVERSATIONS">%d</xliff:g> розмови</item>
-      <item quantity="many"><xliff:g id="CONVERSATIONS">%d</xliff:g> розмов</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> розмови</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Не дозволено"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Немає}=1{1 чат}one{# чат}few{# чати}many{# чатів}other{# чату}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Хто може переривати"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Дзвінки"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Дзвінки"</string>
@@ -3870,13 +3849,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Щоб напевне дізнаватися про дозволені виклики, переконайтеся, що на телефоні налаштовано режим дзвінка"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Вхідні виклики блокуються, коли активовано розклад \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\". Ви можете змінити налаштування, щоб потрібні люди могли зв’язатися з вами."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Позначені контакти"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one">Ще <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="few">Ще <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="many">Ще <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="other">Ще <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Немає"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Немає}=1{{contact_1}}=2{{contact_1} і {contact_2}}=3{{contact_1}, {contact_2} і {contact_3}}one{{contact_1}, {contact_2} і ще #}few{{contact_1}, {contact_2} і ще #}many{{contact_1}, {contact_2} і ще #}other{{contact_1}, {contact_2} і ще #}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Повідомлення"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"повідомлення"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Повідомлення"</string>
@@ -3885,13 +3858,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>: вхідні повідомлення блокуються. Ви можете змінити налаштування, щоб друзі, члени сім’ї й інші контакти зв’язувалися з вами."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Отримувати всі повідомлення"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Отримувати всі виклики"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Немає"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> контакт</item>
-      <item quantity="few"><xliff:g id="NUM_CONTACTS">%d</xliff:g> контакти</item>
-      <item quantity="many"><xliff:g id="NUM_CONTACTS">%d</xliff:g> контактів</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> контакта</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Немає}=1{1 контакт}one{# контакт}few{# контакти}many{# контактів}other{# контакта}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Усі"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Контакти"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Контакти із зірочками"</string>
@@ -3929,26 +3896,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Усі сповіщення"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Деякі сповіщення"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Вибрані користувачі й надалі зможуть зв\'язуватися з вами, навіть якщо ви ввімкнете для додатків режим \"Не турбувати\""</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one">Додатки <xliff:g id="APP_NAMES">%s</xliff:g> можуть переривати</item>
-      <item quantity="few">Додатки <xliff:g id="APP_NAMES">%s</xliff:g> можуть переривати</item>
-      <item quantity="many">Додатки <xliff:g id="APP_NAMES">%s</xliff:g> можуть переривати</item>
-      <item quantity="other">Додатки <xliff:g id="APP_NAMES">%s</xliff:g> можуть переривати</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"Ще <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Додатки не можуть переривати}=1{Додаток {app_1} може переривати}=2{Додатки {app_1} і {app_2} можуть переривати}=3{Додатки {app_1}, {app_2} і {app_3} можуть переривати}one{Додатки {app_1}, {app_2} і ще # можуть переривати}few{Додатки {app_1}, {app_2} і ще # можуть переривати}many{Додатки {app_1}, {app_2} і ще # можуть переривати}other{Додатки {app_1}, {app_2} і ще # можуть переривати}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Додатки"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Усі сповіщення"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Деякі сповіщення"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Сповіщення, які можуть переривати"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Дозволити всі сповіщення"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> можуть переривати</item>
-      <item quantity="few"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> можуть переривати</item>
-      <item quantity="many"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> можуть переривати</item>
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> можуть переривати</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Ніщо не може переривати"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"Ще <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Ніщо не може переривати}=1{Звук \"{sound_category_1}\" може переривати}=2{Звуки \"{sound_category_1}\" і \"{sound_category_2}\" можуть переривати}=3{Звуки \"{sound_category_1}\", \"{sound_category_2}\" і \"{sound_category_3}\" можуть переривати}one{Звуки \"{sound_category_1}\", \"{sound_category_2}\" і ще # можуть переривати}few{Звуки \"{sound_category_1}\", \"{sound_category_2}\" і ще # можуть переривати}many{Звуки \"{sound_category_1}\", \"{sound_category_2}\" і ще # можуть переривати}other{Звуки \"{sound_category_1}\", \"{sound_category_2}\" і ще # можуть переривати}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Ніщо не може переривати"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Ніхто не може переривати"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Деякі люди можуть переривати"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Усі люди можуть переривати"</string>
@@ -4212,7 +4167,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB керує"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Підключений пристрій"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Цей пристрій"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Змінюється…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Переключення…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Не вдалося змінити"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Заряджання пристрою"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Заряджання під’єднаного пристрою"</string>
@@ -4473,7 +4428,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Докладніше"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Заощадження трафіку"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Необмежені дані"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Фоновий режим вимкнено"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Фоновий режим вимкнено"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Увімкнено"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Вимкнено"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Увімкнути Заощадження трафіку"</string>
@@ -4496,7 +4451,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Заборонити введення відповідей чи іншого тексту в сповіщеннях, якщо пристрій заблоковано"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Стандартна перевірка правопису"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Вибрати перевірку правопису"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Використовувати перевірку правопису"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Використовувати перевірку правопису"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Не вибрано"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(немає)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4594,7 +4549,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Щоб звільнити місце, менеджер сховища видаляє з пристрою фото й відео, для яких є резервні копії."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Видалити фото й відео"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Менеджер сховища"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Використовувати менеджер сховища"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Використовувати менеджер сховища"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Автоматично"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Вручну"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Звільнити місце"</string>
@@ -4632,6 +4587,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Двічі торкнутися, щоб перевірити сповіщення"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Двічі торкніться, щоб перевірити планшет"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Двічі торкніться, щоб перевірити пристрій"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Як переглянути сповіщення"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Щоб переглянути сповіщення, проведіть пальцем до нижнього краю екрана"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Режим керування однією рукою"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Використовувати режим керування однією рукою"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Вимикати після зміни додатка"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Час очікування"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 секунди"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 секунд"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 секунд"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"доступність"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Щоб перевірити час, сповіщення та іншу інформацію, двічі торкніться екрана."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Підняти, щоб перевірити телефон"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Підніміть планшет, щоб перевірити його"</string>
@@ -4644,6 +4609,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Торкніться, щоб перевірити планшет"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Торкніться, щоб перевірити пристрій"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Щоб перевірити час, сповіщення та іншу інформацію, торкніться екрана."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Кнопка тривоги"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Щоб розпочати екстрені дії, швидко натисніть кнопку живлення 5 разів."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Попереджувальний звуковий сигнал"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Сповіщати, перш ніж розпочинати дії"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Контакти для екстрених випадків"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Використовувати відбиток пальця для перегляду сповіщень"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Сканер відбитків"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Щоб переглянути сповіщення, проведіть пальцем униз по сканеру відбитків на задній панелі телефона."</string>
@@ -4812,7 +4782,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Увімкнути для всіх додатків"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Вибрати графічний драйвер"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"За умовчанням"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Ігровий драйвер"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Графічний драйвер для ігор"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Драйвер для розробників"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Системний графічний драйвер"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4881,6 +4851,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Не вдалося знайти мережу. Повторіть спробу."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(заборонено)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Немає SIM-карти"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM-карта"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Немає SIM-карти"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Не вказано"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Щоб підключитись, вставте SIM-карту"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Щоб підключитись, вставте SIM-карту <xliff:g id="WIRELESS_CARRIER">%s</xliff:g>"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Рекомендований режим мережі: бажано WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Рекомендований режим мережі: лише GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Рекомендований режим мережі: лише WCDMA"</string>
@@ -4934,6 +4909,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Мобільне передавання даних"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Доступ до Інтернету через мобільну мережу"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Телефон автоматично перемикатиметься на цього оператора в зоні його покриття"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Немає SIM-карти"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Параметри викликів"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Налаштування SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Запитувати щоразу"</string>
@@ -5122,10 +5098,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Дозволити показ поверх інших вікон у налаштуваннях"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Дозволити додаткам, що можуть показуватися поверх інших додатків, накладатися на екрани налаштувань"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Медіа"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Приховати програвач після завершення медіасеансу"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Програвач дає змогу відновлювати сеанси з розгорнутої панелі Швидких налаштувань."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Медіапрогравач в \"Швидких налаштуваннях\""</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Показувати медіапрогравач протягом тривалого часу, щоб швидко відновлювати відтворення"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Приховати програвач"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Показати програвач"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Немає доступних програвачів"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Дозволені додатки"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"медіа"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Увімкнеться Bluetooth"</string>
 </resources>
diff --git a/res/values-ur/arrays.xml b/res/values-ur/arrays.xml
index cee2d51..b793f63 100644
--- a/res/values-ur/arrays.xml
+++ b/res/values-ur/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"متوسط"</item>
     <item msgid="6740026006576843477">"طویل"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"مختصر"</item>
+    <item msgid="7397961711906421599">"متوسط"</item>
+    <item msgid="4079132024502041928">"طویل"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"ڈیفالٹ"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"عالمی"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"‏صرف TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"عالمی"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 7de531d..18c35ed 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"مقفل سکرین پر پروفائل کی معلومات دکھائیں"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"اکاؤنٹس"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"مقام"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"مقام استعمال کریں"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"مقام استعمال کریں"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"آف ہے"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other"> - <xliff:g id="COUNT_1">%1$d</xliff:g> ایپس کو مقام تک رسائی حاصل ہے</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"تصدیق کرنے کے لیے اپنا چہرہ استعمال کریں"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"شروع کریں"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"‏اگر ایکسیسبیلٹی چہرے کے ذریعے غیر مقفل آف ہو، تو ہو سکتا ہے کہ کچھ سیٹ اپ اقدامات TalkBack کے ساتھ صحیح طریقے سے کام نہ کرے۔"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"واپس جائیں"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"سیٹ اپ جاری رکھیں"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"ایکسیسبیلٹی سیٹ اپ استعمال کریں"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="one"><xliff:g id="NUMBER_0">%d</xliff:g> ہندسے سے کم ہونا چاہیے</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"‏آلہ کا منتظم ایک حالیہ PIN استعمال کرنے کی اجازت نہیں دیتا ہے"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"‏آپ کے IT منتظم نے عمومی PINs کو مسدود کر دیا ہے۔ کوئی دوسرا PIN آزمائیں۔"</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"اس میں غلط کریکٹر شامل نہیں ہو سکتا"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"کم از کم ایک حرف پر مشتمل ہونا چاہیئے"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"کم از کم ایک ہندسہ پر مشتمل ہونا چاہیے"</string>
@@ -653,7 +655,6 @@
       <item quantity="one">کم از کم 1 غیر عددی حرف ہونا چاہیے</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"آلے کا منتظم ایک حالیہ پاس ورڈ کا استعمال کرنے کی اجازت نہیں دیتا ہے"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"‏آپ کے IT منتظم نے عمومی پاس ورڈز کو مسدود کر دیا ہے۔ کوئی دوسرا پاس ورڈ آزمائیں۔"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"ہندسوں کی صعودی، نزولی یا مکرر ترتیب کی اجازت نہیں ہے"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"تصدیق کریں"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"منسوخ کریں"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"‏Wi‑Fi آن کریں"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"‏Wi-Fi استعمال کریں"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"‏Wi-Fi کا استعمال کریں"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"‏Wi‑Fi ترتیبات"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"وائرلیس رسائی پوائنٹس کو ترتیب دیں اور ان کا نظم کریں"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"‏\"<xliff:g id="SSID">%1$s</xliff:g>\" سے منسلک کرنے کے لیے مندرجہ ذیل QR کوڈ کو مرکز میں رکھیں"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"‏QR کوڈ اسکین کر کے Wi-Fi میں شامل ہوں"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"‏Wi-Fi کا اشتراک کریں"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"‏”<xliff:g id="SSID">%1$s</xliff:g>“ سے منسلک ہونے کے لیے اس QR کوڈ کو اسکین کریں اور پاس ورڈ کا اشتراک کریں"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"‏“<xliff:g id="SSID">%1$s</xliff:g>” میں شامل ہونے کے لیے QR کوڈ کو دوسرے آلہ کے ذریعے اسکین کریں"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"‏”<xliff:g id="SSID">%1$s</xliff:g>“ سے منسلک ہونے کے لیے یہ QR کوڈ اسکین کریں"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"دوبارہ کوشش کریں۔ اگر مسئلہ جاری رہتا ہے تو آلہ کے صنعت کار سے رابطہ کریں"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"کچھ غلط ہو گیا"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"‏Wi-Fi کا پاس ورڈ: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"ہاٹ اسپاٹ کا پاس ورڈ: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"خود کار طور پر منسلک کریں"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"فون کو خود کار طور پر اس نیٹ ورک کے قریب منسلک ہونے کی اجازت دیں"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"ٹیبلیٹ کو خود کار طور پر اس نیٹ ورک کے قریب منسلک ہونے کی اجازت دیں"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"رینج میں ہونے پر اس نیٹ ورک سے کنکشن کی اجازت دیں"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"آلہ شامل کریں"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"‏اس نیٹ ورک میں کوئی آلہ شامل کرنے کے لیے QR کوڈ استعمال کریں"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"‏QR کوڈ درست فارمیٹ نہیں ہے"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"سسٹم سرٹیفکیٹس استعمال کریں"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"فراہم نہ کریں"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"توثیق نہ کریں"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"کوئی سرٹیفیکیٹ متعین نہیں کیا گیا۔ آپ کا کنکشن نجی نہیں ہو گا۔"</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"نیٹ ورک کا نام کافی بڑا ہے۔"</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"کوئی ڈومین مختص کرنا لازمی ہے۔"</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"سرٹیفکیٹ درکار ہے۔"</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"مربوط کریں"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"‏Wi‑Fi کو آن کر دیا گیا"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> سے منسلک کردہ"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> سے منسلک ہو رہا ہے"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"منسلک ہو رہا ہے…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"نیٹ ورک سے مربوط ہونے میں ناکام رہا"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"نیٹ ورک رینج میں نہیں ہے"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"ایپ مواد کا اشتراک کر رہی ہے۔ انٹرنیٹ کنکشن کا اشتراک کرنے کیلئے، ہاٹ اسپاٹ آف کر کے پھر آن کریں"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"کوئی پاس ورڈ سیٹ نہیں ہے"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"ہاٹ اسپاٹ کا نام"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> آن ہو رہا ہے..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> آن ہو رہا ہے…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"دیگر آلات <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> سے منسلک ہو سکتی ہیں"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"ہاٹ اسپاٹ کا پاس ورڈ"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"‏AP بینڈ"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"ہموار ڈسپلے"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"‏کچھ مواد کے لیے 60 سے 90 Hz تک ریفریش کی شرح خودکار طور پر بڑھ جاتی ہے۔ بیٹری کے استعمال میں اضافہ کرتا ہے۔"</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"ہموار ڈسپلے"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"‏زبردستی 90 Hz ریفریش کی شرح"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"اعلی ترین ریفریش کرنے کی بہتر شرح کے ليے ٹچ کی کارکردگی اور اینیمیشن کوالٹی۔ بیٹری کے استعمال میں اضافہ کرتا ہے۔"</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"اسکرین پر توجہ"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"اگر آپ آن اسکرین دیکھ رہے ہیں تو یہ آف نہیں ہوگی"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"‏Android ورژن"</string>
     <string name="security_patch" msgid="4071756145347865382">"‏Android سیکیورٹی اپ ڈیٹ"</string>
     <string name="model_info" msgid="8997566254717810904">"ماڈل"</string>
-    <string name="model_summary" msgid="2246651782442466213">"‏ماڈل: ‎%1$s‎‎"</string>
     <string name="hardware_info" msgid="7035211991066637019">"ماڈل اور ہارڈ ویئر"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"ہارڈ ویئر کا ورژن"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"‏آلہ ID"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"نیٹ ورک کی ترتیبات کو دوبارہ ترتیب دیا گیا ہے"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"‏SIMs کو نہیں مٹا سکتے"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"‏کسی خرابی کی وجہ سے ڈاؤن لوڈ کردہ SIMs کو مٹایا نہیں جا سکتا ہے۔\n\nاپنا آلہ دوبارہ شروع کریں اور دوبارہ کوشش کریں۔"</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"تمام ڈیٹا حذف کریں (فیکٹری ری سیٹ)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"سبھی ڈیٹا کو حذف کریں (فیکٹری ری سیٹ)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"‏یہ آپ کے ٹیبلیٹ کے "<b>"داخلی اسٹوریج"</b>" سے سبھی ڈیٹا کو صاف کر دے گا، بشمول:\n\n"<li>"آپ کا Google اکاؤنٹ"</li>\n<li>"سسٹم اور ایپ ڈیٹا اور ترتیبات"</li>\n<li>"ڈاؤن لوڈ کردہ ایپس"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"‏یہ آپ کے فون کے "<b>"داخلی اسٹوریج"</b>" سے سبھی ڈیٹا کو صاف کر دے گا، بشمول:\n\n"<li>"آپ کا Google اکاؤنٹ"</li>\n<li>"سسٹم اور ایپ ڈیٹا اور ترتیبات"</li>\n<li>"ڈاؤن لوڈ کردہ ایپس"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"آپ فی الحال مندرجہ ذیل اکاؤنٹس میں سائن ان ہیں:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"اس آلہ پر دوسرے صارفین موجود ہیں۔\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"موسیقی"</li>\n<li>"تصاویر"</li>\n<li>"صارف کا دیگر ڈیٹا"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIMs"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"اس سے آپ کے موبائل سروس کا پلان منسوخ نہیں ہوگا۔"</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">"‏\n\nموسیقی، تصاویر اور صارف کا دیگر ڈیٹا، "<b>"USB اسٹوریج"</b>" کو حذف کیے جانے کی ضرورت ہے۔"</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">"‏\n\nموسیقی، تصاویر اور صارف کا دیگر ڈیٹا صاف کرنے کیلئے، "<b>"SD کارڈ"</b>" کو حذف کیے جانے کی ضرورت ہے۔"</string>
+    <string name="main_clear_title" msgid="277664302144837723">"سبھی ڈیٹا کو حذف کریں (فیکٹری ری سیٹ)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"سبھی ڈیٹا کو حذف کریں (فیکٹری ری سیٹ)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"‏یہ آپ کے ٹیبلیٹ کے "<b>"داخلی اسٹوریج"</b>" سے سبھی ڈیٹا کو صاف کر دے گا، بشمول:\n\n"<li>"آپ کا Google اکاؤنٹ"</li>\n<li>"سسٹم اور ایپ ڈیٹا اور ترتیبات"</li>\n<li>"ڈاؤن لوڈ کردہ ایپس"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"‏یہ آپ کے فون کے "<b>"داخلی اسٹوریج"</b>" سے سبھی ڈیٹا کو صاف کر دے گا، بشمول:\n\n"<li>"آپ کا Google اکاؤنٹ"</li>\n<li>"سسٹم اور ایپ ڈیٹا اور ترتیبات"</li>\n<li>"ڈاؤن لوڈ کردہ ایپس"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"آپ فی الحال مندرجہ ذیل اکاؤنٹس میں سائن ان ہیں:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"اس آلہ پر دوسرے صارفین موجود ہیں۔\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"موسیقی"</li>\n<li>"تصاویر"</li>\n<li>"صارف کا دیگر ڈیٹا"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIMs"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"اس سے آپ کے موبائل سروس کا پلان منسوخ نہیں ہوگا۔"</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">"‏\n\nموسیقی، تصاویر اور صارف کا دیگر ڈیٹا، "<b>"USB اسٹوریج"</b>" کو حذف کیے جانے کی ضرورت ہے۔"</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">"‏\n\nموسیقی، تصاویر اور صارف کا دیگر ڈیٹا صاف کرنے کیلئے، "<b>"SD کارڈ"</b>" کو حذف کیے جانے کی ضرورت ہے۔"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"‏USB اسٹوریج کو حذف کریں"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"‏SD کارڈ حذف کریں"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"‏داخلی USB اسٹوریج پر موجود سبھی ڈیٹا، جیسے موسیقی یا تصاویر کو حذف کریں"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"‏SD کارڈ پر موجود سبھی ڈیٹا حذف کریں، جیسے موسیقی یا تصاویر"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"سبھی ڈیٹا صاف کریں"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"سبھی ڈیٹا صاف کریں"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"آپ کی سبھی ذاتی معلومات اور ڈاؤن لوڈ کردہ ایپس کو حذف کر دیا جائے گا۔ آپ اس کارروائی کو کالعدم نہیں کر سکتے ہیں۔"</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"‏ڈاؤن لوڈ کردہ ایپس اور SIMs سمیت آپ کی سبھی ذاتی معلومات کو حذف کر دیا جائے گا۔ آپ اس کارروائی کو کالعدم نہیں کر سکتے ہیں۔"</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"ہر چیز کو حذف کریں"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"کوئی ری سیٹ انجام نہیں دیا گیا کیونکہ سسٹم صاف کریں سروس دستیاب نہیں ہے۔"</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"سبھی ڈیٹا صاف کریں؟"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"اس صارف کیلئے فیکٹری ری سیٹ دستیاب نہیں ہے"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"صاف کیا جا رہا ہے"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"براہ کرم انتظار کریں…"</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"سبھی ڈیٹا صاف کریں"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"سبھی ڈیٹا صاف کریں"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"آپ کی سبھی ذاتی معلومات اور ڈاؤن لوڈ کردہ ایپس کو حذف کر دیا جائے گا۔ آپ اس کاروائی کو کالعدم نہیں کر سکتے ہیں۔"</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"‏ڈاؤن لوڈ کردہ ایپس اور SIMs سمیت آپ کی سبھی ذاتی معلومات کو حذف کر دیا جائے گا۔ آپ اس کاروائی کو کالعدم نہیں کر سکتے ہیں۔"</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"سبھی ڈیٹا صاف کریں؟"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"اس صارف کیلئے فیکٹری ری سیٹ دستیاب نہیں ہے"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"صاف ہو رہا ہے"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"براہ کرم انتظار کریں…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"کال کی ترتیبات"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"‏صوتی میل، کال فاورڈنگ، کال ویٹنگ، کالر ID کو ترتیب دیں"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"‏USB ٹیدرنگ"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> سے زیادہ آلات کو مربوط نہیں کر سکتے۔"</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> کا ربط ختم کر دیا جائے گا۔"</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"ایتھرنیٹ ٹیدرنگ"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"‏USB ایتھرنیٹ کے ذریعے فون کے انٹرنیٹ کنیکشن کا اشتراک کریں"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"‏Ethernet ایتھرنیٹ کے ذریعے فون کے انٹرنیٹ کنیکشن کا اشتراک کریں"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"اپنے موبائل ڈیٹا کنکشن کے ذریعے دیگر آلات کو انٹرنیٹ فراہم کرنے کیلئے ہاٹ اسپاٹ اور ٹیدرنگ کا استعمال کریں۔ ایپس بھی قریبی آلات کے ساتھ مواد کا اشتراک کرنے کیلئے ایک ہاٹ اسپاٹ تخلیق کر سکتی ہیں۔"</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"‏اپنے Wi‑Fi یا موبائل ڈیٹا کنکشن کے ذریعے دیگر آلات کو انٹرنیٹ فراہم کرنے کے لیے ہاٹ اسپاٹ اور ٹیدرنگ کا استعمال کریں۔ ایپس بھی قریبی آلات کے ساتھ مواد کا اشتراک کرنے کے لیے ایک ہاٹ اسپاٹ تخلیق کر سکتی ہیں۔"</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"مدد"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"کیپشن کی ترجیحات"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"میگنیفکیشن"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"میگنیفکیشن کی جگہ"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"میگنیفکیشن انیبل"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"اسکرین بڑا کرتے وقت آپ جس میگنیفکیشن جگہ(جگہیں) استعمال کرنا چاہتے ہیں وہ منتخب کریں"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"پوری اسکرین"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"اسکرین کا حصہ"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"مکمل اسکرین اور اسکرین کا حصہ"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"پوری اسکرین کو بڑا کریں"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"اسکرین کا حصہ بڑا کریں"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"ایکسیسبیلٹی بٹن پر سوئچ کریں؟"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"اسکرین کے حصے کو بڑا کرنے کیلئے تین بار تھپتھپائیں کے استعمال سے ٹائپنگ اور دیگر کارروائیاں میں تاخیر ہوگی\n\nکیا آپ بڑا کرنے کیلئے ایکسیسبیلٹی بٹن کا استعمال کرتے ہوئے سوئچ کرنا چاہتے ہیں؟"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"ایکسیسبیلٹی بٹن پر سوئچ کریں"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"بڑا کرنے ليے تین بار تھپتھپاتے رہیں"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"میگنیفکیشن کی ترتیبات"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"تین بار تھپتھپا کر بڑا کریں"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"شارٹ کٹ سے بڑا کریں"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"پاور بٹن سے کال ختم ہو جاتی ہے"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"بڑا ماؤس پوائنٹر"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"اینیمیشنز ہٹائیں"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"مونو آڈیو"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"آڈیو چلاتے وقت چینلز یکجا کریں"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"آڈیو بیلنس"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"بائیں"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"دائیں"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"مونو آڈیو"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"آڈیو چلاتے وقت چینلز یکجا کریں"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"آڈیو بیلنس"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"بائیں"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"دائیں"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"ڈیفالٹ"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 سیکنڈ"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 سیکنڈ"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"اطلاع وائبریشن"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"رنگ وائبریشن"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"ٹچ تاثرات"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> استعمال کریں"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> کھوليں"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"رنگ کی اصلاح استعمال کریں"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"کیپشنز دکھائیں"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"صرف تعاون یافتہ ایپ کے لیے"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> استعمال کریں"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> کھولیں"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"رنگ کی اصلاح استعمال کریں"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"کیپشنز دکھائیں"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"صرف تعاون یافتہ ایپ کے لیے"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"کیپشن کا سائز اور طرز"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> ٹیکسٹ کا سائز"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"مزید اختیارات"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"سرخ اور سبز رنگ دیکھنے کی صلاحیت میں کمی"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"سرخ اور سبز کی بے قاعدہ رنگ بینی"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"نیلے پیلے رنگ کی شناخت کرنے میں دشواری"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"خاکستری"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"سرخ-سبز"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"سرخ-سبز"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"نیلا-پیلا"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"پس منظر کی پابندی"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"ایپ کو پس منظر میں چلنے کی اجازت دیں"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"ایپ کو پس منظر میں چلنے کی اجازت نہیں ہے"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"پس منظر کے استعمال کو محدود نہیں کیا جا سکتا"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"پس منظر کے استعمال کو محدود نہیں کیا جا سکتا"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"پس منظر کی سرگرمی کو محدود کریں؟"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"اگر آپ کسی ایپ کی پس منظر کی سرگرمی کو محدود کرتے ہیں تو یہ غلط برتاؤ کر سکتی ہے"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"چونکہ یہ ایپ بیٹری کی کارکردگی کو بہتر بنانے کیلئے نہیں ہے، لہذا آپ اسے محدود نہیں کر سکتے ہیں۔\n\nایپ کو محدود کرنے کیلئے، پہلے بیٹری کی کارکردگی کو بہتر بنانے کو آن کریں۔"</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"شیڈیول سیٹ کریں"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"بیٹری لائف میں توسیع کریں"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"چارج ہونے پر آف کریں"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"جب آپ کا فون <xliff:g id="PERCENT">%1$s</xliff:g> ہو جاتا ہے تو بیٹری سیور آف ہو جاتی ہے"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"جب آپ کا ٹیبلیٹ <xliff:g id="PERCENT">%1$s</xliff:g> پر ہوتا ہے تو بیٹری سیور آف ہو جاتی ہے"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"جب آپ کا آلہ <xliff:g id="PERCENT">%1$s</xliff:g> پر ہوتا ہے تو بیٹری سیور آف جاتی ہے"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"فون <xliff:g id="PERCENT">%1$s</xliff:g> سے اوپر چارج ہونے پر بیٹری سیور آف ہو جاتا ہے"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"ٹیبلیٹ <xliff:g id="PERCENT">%1$s</xliff:g> سے اوپر چارج ہونے پر بیٹری سیور آف ہو جاتا ہے"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"آلہ <xliff:g id="PERCENT">%1$s</xliff:g> سے اوپر چارج ہونے پر بیٹری سیور آف ہو جاتا ہے"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"آن کریں"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"ری سیٹ کریں"</string>
     <string name="tts_play" msgid="2945513377250757221">"چلائیں"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"اڈاپٹیو کنیکٹوٹی"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"خودکار طور پر آپ کے نیٹ ورک کنکشنز کا نظم کر کے کارکردگی میں بہتری اور بیٹری لائف میں اضافہ کرتا ہے"</string>
     <string name="credentials_title" msgid="7535942196886123656">"اسناد کی اسٹوریج"</string>
     <string name="credentials_install" msgid="3933218407598415827">"ایک سرٹیفکیٹ انسٹال کریں"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"اسٹوریج سے سرٹیفیکیٹس انسٹال کریں"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"صارف کی اسناد"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"اسٹور کردہ اسناد دیکھیں اور ان میں ترمیم کریں"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"جدید ترین"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"اسٹوریج کی قسم"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"ہارڈ ویئر کے ذریعے تعاون یافتہ"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"صرف سافٹ ویئر"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"اس صارف کیلئے اسنادات دستیاب نہیں ہیں"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"‏VPN اور ایپس کیلئے انسٹال کردہ"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"‏Wi-Fi کیلئے انسٹال کردہ"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"ٹرمینل پر ادا کرنا"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"ادائیگی کی ایپ سیٹ اپ کریں۔ پھر بس اپنے فون کے پچھلے حصے کو کسی بھی بغیر رابطے والی علامت کے ٹرمینل کے پاس پکڑ کر رکھیں۔"</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"سمجھ آ گئی"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"مزید…"</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"مزید…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"ادائیگی کی ڈیفالٹ ایپ سیٹ کریں"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"ادائیگی کی ڈیفالٹ ایپ اپ ڈیٹ کریں"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"کنٹیکٹ لیس ٹرمینل پر، <xliff:g id="APP">%1$s</xliff:g> کے ساتھ ادائیگی کریں"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"کالز کیلئے ہمیشہ اس کا استعمال کریں"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"‏ڈیٹا کیلئے ایک SIM منتخب کریں"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"‏SMS کے لیے SIM منتخب کریں"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"‏ڈیٹا SIM کو سوئچ کیا جا رہا ہے، اس میں ایک منٹ تک کا وقت لگ سکتا ہے…"</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"‏ڈیٹا SIM کو سوئچ کیا جا رہا ہے، اس میں ایک منٹ تک کا وقت لگ سکتا ہے…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"کال کریں مع"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"‏ایک SIM کارڈ منتخب کریں"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"روٹین، شیڈول، بیٹری سیور، پاور سیور، بیٹری، خودکار طور پر، فیصد"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"‏volte، اعلی درجے کی کالنگ، 4G کالنگ"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"زبان شامل کریں، ایک زبان شامل کریں"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"متن کا سائز"</string>
     <string name="default_sound" msgid="6604374495015245195">"ڈیفالٹ ساؤنڈ"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"گھنٹی بجنے اور اطلاعات کا والیوم <xliff:g id="PERCENTAGE">%1$s</xliff:g> پر ہے"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"والیوم، ارتعاش، ڈسٹرب نہ کریں"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"آوازیں آن کریں"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"لائیو کیپشن"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"خودکار طور پر میڈیا پر کیپشن لگائیں"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"کوئی نہیں"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> شیڈول سیٹ کریں</item>
-      <item quantity="one">1 شیڈول سیٹ کریں</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{کوئی نہیں}=1{1 شیڈول سیٹ کریں}other{# شیڈول سیٹ کریں}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"ڈسٹرب نہ کریں"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"صرف اہم لوگوں اور ایپس کی جانب سے اطلاعات حاصل کریں"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"مداخلتوں کی حد مقرر کریں"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"صرف ترجیحی"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"آن / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"آف / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"آف"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"آن"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"ہر بار پوچھیں"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"یہاں تک کہ آپ آف کر دیں"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> گھنٹے</item>
-      <item quantity="one">1 گھنٹہ</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> منٹس"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> شیڈولز خود بخود آن ہو سکتے ہیں</item>
-      <item quantity="one">1 شیڈول خود بخود آن ہو سکتا ہے</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 گھنٹہ}other{# گھنٹے}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 منٹ}other{# منٹ}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{آف}=1{آف / 1 شیڈول خودکار طور پر آن ہو سکتا ہے}other{بند / # شیڈولز خودکار طور پر آن ہو سکتے ہیں}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"کیا \'ڈسٹرب نہ کریں\' میں رکاوٹ کا باعث بن سکتا ہے"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"لوگ"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"ایپس"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"کم ترجیحی اطلاعات کو لطیف پر خودکار طور پر سیٹ کریں"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"تغیر پذیر اطلاع کی درجہ بندی"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"مطابقت کے لحاظ سے خودکار طور پر درجہ کی اطلاعات"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"تغیر پذیر اطلاع کے تاثرات"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"اطلاعات میں کی جانے والی ایڈجسٹمنٹس کی نشاندہی کریں اور سسٹم کو تاثرات فراہم کرنے کا اختیار دکھائیں"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"تجویز کردہ کارروائیاں اور جوابات"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"تجویز کردہ کارروائیوں اور جوابات کو خودکار طور پر دکھائیں"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"حالیہ اور اسنوز کردہ اطلاعات دکھائیں"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"ڈسٹرب نہ کریں تک رسائی"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"\'ڈسٹرب نہ کریں\' کو اجازت دیں"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"کسی انسٹال کردہ ایپس نے ڈسٹرب نہ کریں تک رسائی کی درخواست نہیں کی ہے"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"ایپس لوڈ ہو رہی ہیں…"</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"ایپس لوڈ کی جا رہی ہیں…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"‏آپ کی درخواست پر، Android اس ایپ کی اطلاعات کو اس آلہ پر ظاہر ہونے سے مسدود کررہا ہے"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"‏آپ کی درخواست پر، Android اطلاعات کے اس زمرے کو اس آلہ پر ظاہر ہونے سے مسدود کررہا ہے"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"‏آپ کی درخواست پر، Android اطلاعات کے اس گروپ کو اس آلہ پر ظاہر ہونے سے مسدود کر رہا ہے"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"سبھی گفتگوئيں"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"ترجیحی گفتگوئیں"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"کوئی نہیں"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> گفتگوئیں</item>
-      <item quantity="one">1 گفتگو</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"کوئی نہیں"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{کوئی نہیں}=1{1 گفتگو}other{# گفتگوئیں}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"کون رکاوٹ ڈال سکتا ہے"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"کالز"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"کالز"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"اجازت یافتہ کالز کے آواز کرنے کو یقینی بنانے کیلئے، چیک کریں کہ آلہ رِنگ پر سیٹ ہے"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ کے لیے موصول ہونے والی کالز کو مسدود کر دیا جاتا ہے۔ اپنے دوستوں، فیملی اور دیگر رابطوں کو آپ سے رابطہ کرنے کی اجازت دینے کے لیے، آپ ترتیبات کو ایڈجسٹ کر سکتے ہیں۔"</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"ستارہ کا نشان لگے ہوئے رابطے"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> دیگر</item>
-      <item quantity="one">1 دیگر</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"کوئی نہیں"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{کوئی نہیں}=1{{contact_1}}=2{{contact_1} اور {contact_2}}=3{{contact_1}، {contact_2}، اور {contact_3}}other{{contact_1}، {contact_2} اور # دیگر}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"پیغامات"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"پیغامات"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"پیغامات"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ کے لیے آنے والے پیغامات مسدود ہیں۔ اپنے دوستوں، فیملی اور دیگر رابطوں کو آپ سے رابطہ کرنے کی اجازت دینے کے لیے، آپ ترتیبات کو ایڈجسٹ کر سکتے ہیں۔"</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"سبھی پیغامات آپ سے رابطہ کر سکتے ہیں"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"سبھی کالز آپ سے رابطہ کر سکتی ہیں"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"کوئی نہیں"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> رابطے</item>
-      <item quantity="one">1 رابطہ</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{کوئی نہیں}=1{1 رابطہ}other{# رابطے}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"کوئی بھی"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"رابطے"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"ستارہ کا نشان لگے ہوئے رابطے"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"سبھی اطلاعات"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"کچھ اطلاعات"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"منتخب کردہ لوگ اب بھی آپ تک پہنچ سکتے ہیں ، یہاں تک کہ اگر آپ ایپس کو مداخلت کرنے کی اجازت نہیں دیتے ہیں"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> رکاوٹ ڈال سکتی ہے</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> رکاوٹ ڈال سکتی ہے</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> مزید"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{کوئی ایپ رکاوٹ نہیں ڈال سکتی}=1{{app_1} رکاوٹ ڈال سکتی ہے}=2{{app_1} او {app_2} رکاوٹ ڈال سکتی ہیں}=3{{app_1}، {app_2} اور {app_3} رکاوٹ ڈال سکتی ہیں}other{{app_1}، {app_2} اور # مزید رکاوٹ ڈال سکتی ہیں}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"ایپس"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"سبھی اطلاعات"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"کچھ اطلاعات"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"اطلاعات جو رکاوٹ ڈال سکتی ہیں"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"سبھی اطلاعات کو اجازت دیں"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> رکاوٹ ڈال سکتی ہے</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> رکاوٹ ڈال سکتی ہے</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"کوئی چیز رکاوٹ نہیں ڈال سکتی"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> مزید"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{کوئی چیز رکاوٹ نہیں ڈال سکتی}=1{{sound_category_1} رکاوٹ ڈال سکتی ہے}=2{{sound_category_1} اور{sound_category_2} رکاوٹ ڈال سکتی ہیں}=3{{sound_category_1}، {sound_category_2}، اور{sound_category_3} رکاوٹ ڈال سکتی ہیں}other{{sound_category_1}، {sound_category_2} اور # مزید رکاوٹ ڈال سکتی ہیں}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"کوئی چیز رکاوٹ نہیں ڈال سکتی"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"کوئی بھی رکاوٹ نہیں ڈال سکتا"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"کچھ لوگ رکاوٹ ڈال سکتے ہیں"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"سبھی لوگ رکاوٹ ڈال سکتے ہیں"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"‏USB کنٹرول کردہ بذریعہ"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"منسلک آلہ"</string>
     <string name="usb_control_device" msgid="527916783743021577">"یہ آلہ"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"سوئچ کیا جا رہا ہے..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"سوئچ کیا جا رہا ہے…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"سوئچ نہیں کیا جا سکا"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"اس آلہ کو چارج کر رہی ہے"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"منسلک آلہ چارج ہو رہا ہے"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"تفاصیل دیکھیں"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"ڈیٹا سیور"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"غیر محدود ڈیٹا"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"پس منظر کا ڈیٹا آف ہے"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"پس منظر کا ڈیٹا آف ہے"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"آن"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"آف"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"ڈیٹا سیور استعمال کریں"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"اگر آلہ مقفل ہو تو اطلاعات میں جوابات یا دیگر متن ٹائپ کرنا ممنوع کریں"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"ڈیفالٹ سپیل چیکر"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"سپیل چیکر چنیں"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"سپیل چیکر استعمال کریں"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"سپیل چیکر استعمال کریں"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"غیر منتخب کردہ"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(کوئی نہیں)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"اسٹوریج کی جگہ خالی کرنے میں مدد کیلئے، اسٹوریج مینیجر آپ کے آلہ سے بیک اپ شدہ تصاویر اور ویڈیوز ہٹا دیتا ہے۔"</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"تصاویر اور ویڈیوز ہٹائیں"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"اسٹوریج مینیجر"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"اسٹوریج مینیجر استعمال کریں"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"اسٹوریج مینیجر استعمال کریں"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"خودکار"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"مینوئل"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"اب جگہ خالی کریں"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"فون کو چیک کرنے کیلئے دو بار تھپتھپائیں"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"ٹیبلیٹ کو چیک کرنے کیلئے دو بار تھپتھپائیں"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"آلہ کو چیک کرنے کیلئے دو بار تھپتھپائیں"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"اطلاعات کیلئے سوائپ کریں"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"اپنی اطلاعات ظاہر کرنے کیلئے اسکرین کے نچلے کنارے پر سوائپ کریں"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"ایک ہاتھ کی وضع"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"ایک ہاتھ کی وضع استعمال کریں"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"ایپس کو سوئچ کرتے وقت باہر نکلیں"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"ٹائم آؤٹ"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 سیکنڈز"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 سیکنڈز"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 سیکنڈز"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"رسائی"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"وقت، اطلاعات، اور دیگر معلومات چیک کرنے کے لیے اپنی اسکرین کو دو بار تھپتھپائیں۔"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"چیک کرنے کیلئے فون کو اٹھائیں"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"چیک کرنے کیلئے ٹیبلیٹ کو اٹھائیں"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"ٹیبلیٹ چیک کرنے کے لیے تھپتھپائیں"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"آلہ چیک کرنے کے لیے تھپتھپائیں"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"وقت، اطلاعات، اور دیگر معلومات چیک کرنے کے لیے اپنی اسکرین کو دو بار تھپتھپائیں۔"</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"ڈرانے کا بٹن"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"‏5 بار پاور بٹن کو تیزی سے دبا کر کے ہنگامی SOS کاروائیوں کو شروع کریں۔"</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"وارننگ کی آواز"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"کارروائیاں شروع کرنے سے پہلے الرٹ"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"ہنگامی رابطے"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"اطلاعات کیلئے فنگر پرنٹ سوائپ"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"فنگر پرنٹ سوائپ کریں"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"اپنی اطلاعات چیک کرنے کیلئے اپنے فون کی پشت پر فنگر پرنٹ سینسر پر نیچے سوائپ کریں۔"</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"سبھی ایپس کے لیے فعال کریں"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"گرافکس ڈرائیور منتخب کریں"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"ڈیفالٹ"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"گیم ڈرائیور"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"گیم ڈرائیور"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"ڈیولپر ڈرائیور"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"سسٹم کا گرافکس ڈرائیور"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"نیٹ ورکس نہیں مل سکے۔ دوبارہ کوشش کریں۔"</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(ممنوع)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"‏کوئی SIM کارڈ نہیں ہے"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"‏کوئی SIM نہیں ہے"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"کوئی نہیں"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"‏منسلک کرنے کے لیے SIM درکار ہے"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"‏منسلک کرنے کے لیے SIM <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> درکار ہے"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"‏ترجیحی نیٹ ورک کی وضع: WCDMA ترجیحی"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"‏ترجیحی نیٹ ورک کی وضع: صرف GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"‏ترجیحی نیٹ ورک کی وضع: صرف WCDMA"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"موبائل ڈیٹا"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"موبائل نیٹ ورک استعمال کر کے ڈیٹا تک رسائی حاصل کریں"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"رینج میں ہونے پر فون خودکار طور پر اس کیریئر پر سوئچ ہو جائے گا"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"‏کوئی SIM کارڈ دستیاب نہيں ہے"</string>
     <string name="calls_preference" msgid="2166481296066890129">"کالز کی ترجیح"</string>
     <string name="sms_preference" msgid="7742964962568219351">"‏SMS کی ترجیح"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"ہر بار پوچھیں"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"ترتیبات پر اسکرین اوورلیز کو اجازت دیتا ہے"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"ایسی ایپس کو اجازت دیں جو ترتیبات کی اسکرینز کو ایک دوسرے پر چڑھانے کے لیے دوسرے ایپس پر ڈسپلے کر سکتی ہیں"</string>
     <string name="media_controls_title" msgid="403271085636252597">"میڈیا"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"میڈیا سیشن کے ختم ہونے پر کھلاڑی کو چھپائیں"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"کھلاڑی آپ کو پھیلانے کی فوری ترتیبات پینل سے سیشن کو دوبارہ شروع کرنے دیتا ہے۔"</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"فوری ترتیبات میں میڈیا پلیئر"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"پلے بیک کو آسانی سے دوبارہ شروع کرنے کے لئے توسیعی مدت کے لئے میڈیا پلیئر دکھائیں"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"کھلاڑی کو چھپائیں"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"کھلاڑی کو دکھائیں"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"کوئی کھلاڑی دستیاب نہیں"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"اجازت یافتہ ایپس"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"میڈیا"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"بلوٹوتھ آن ہو جائے گا"</string>
 </resources>
diff --git a/res/values-uz/arrays.xml b/res/values-uz/arrays.xml
index 7b0af94..146e67b 100644
--- a/res/values-uz/arrays.xml
+++ b/res/values-uz/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"O‘rtacha"</item>
     <item msgid="6740026006576843477">"Uzoq"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Qisqa"</item>
+    <item msgid="7397961711906421599">"Oʻrtacha"</item>
+    <item msgid="4079132024502041928">"Uzun"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Standart"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA va LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Faqat TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Global"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index d5bb866..08377ae 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Profil ma‘lumotini qulflangan ekranda ko‘rsatish"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Hisoblar"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Joylashuv"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Joylashuv axborotidan foydalanish"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Joylashuv axborotidan foydalanish"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Yoqilmagan"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ta ilovada joylashuvga ruxsat bor</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Qurilma qulfini yuzingiz bilan oching"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Boshlash"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Yuz bilan ochish funksiyasi faolsizlantirilgan boʻlsa, ayrim sozlash bosqichlari TalkBack bilan yaxshi ishlamasligi mumkin."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Orqaga"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Sozlashda davom etish"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Maxsus imkoniyatlarni sozlash"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="one">Maksimum <xliff:g id="NUMBER_0">%d</xliff:g> ta raqam</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Qurilma administratori oxirgi PIN koddan yana foydalanishga ruxsat bermaydi"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Oddiy PIN kodlar AT admini tomonidan bloklangan. Murakkabroq PIN kod tanlang."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Parol yaroqsiz belgidan iborat bo‘lmasligi lozim"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Parol kamida bitta harfdan iborat bo‘lishi lozim"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Parol kamida bitta raqamdan iborat bo‘lishi lozim"</string>
@@ -653,7 +655,6 @@
       <item quantity="one">Kamida 1 ta raqamsiz belgi boʻlishi lozim</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Qurilma administratori yaqinda foydalanilgan paroldan yana foydalanishga ruxsat bermaydi"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Oddiy parollar AT admini tomonidan bloklangan. Murakkabroq parol tanlang."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Oshib boruvchi, kamayib boruvchi yoki qaytarilgan ketma-ket raqamlarga ruxsat berilmaydi"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Tasdiqlash"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Bekor qilish"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Wi‑Fi‘ni yoqish"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Wi-Fi ishlatish"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Wi-Fi orqali"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wi‑Fi sozlamalari"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Ulanish nuqtalarini sozlash &amp; boshqarish"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Qurilmani “<xliff:g id="SSID">%1$s</xliff:g>” nomli tarmoqqa ulash uchun quyidagi QR kodni kameraga qarating"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Wi-Fi tarmoqqa QR kodni skanerlab ulanish"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Wi‑Fi tarmoqni ulashish"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"“<xliff:g id="SSID">%1$s</xliff:g>” nomli tarmoqqa ulanish va parolni ulashish uchun mazkur QR kodni skanerlang"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"“<xliff:g id="SSID">%1$s</xliff:g>” nomli tarmoqqa ulanish uchun boshqa qurilmada bu QR kodni skanerlang"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"“<xliff:g id="SSID">%1$s</xliff:g>” nomli tarmoqqa ulanish uchun mazkur QR kodni skanerlang"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Qayta urining. Muammo qaytarilsa, qurilma ishlab chiqaruvchisiga murojaat qiling"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Xatolik yuz berdi"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi-Fi paroli: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Hotspot paroli: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Avtoulanish"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Bu tarmoq doirasida avtomatik ulanishga ruxsat berish"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Bu tarmoq doirasida avtomatik ulanishga ruxsat berish"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Xizmat doirasida bu tarmoqqa ulanishga ruxsat bering"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Qurilma kiritish"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Qurilmani bu tarmoqqa kiritish uchun QR kodni skanlang"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR xato formatda"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Tizim sertifikatlaridan foydalanish"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Taklif etilmasin"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Tasdiqlanmasin"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Birorta ham sertifikat ko‘rsatilmagan. Aloqangiz ochiq bo‘ladi."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Tarmoq nomi juda uzun."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Domenni kiriting."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Sertifikat talab etiladi."</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Ulanish"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi yoqildi"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ilovasiga ulandi"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Ulanmoqda: <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Ulanmoqda…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Tarmoqqa ulanmadi"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Tarmoq xizmat doirasidan tashqarida"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Ilova kontent ulashmoqda. Internet tarqatish uchun hotspotni o‘chirib, keyin qayta yoqing."</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Parollanmagan"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Hotspot nomi"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> yoqilmoqda…"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> yoqilmoqda…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Boshqa qurilmalar <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> tarmog‘iga ulanishi mumkin"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Hotspot paroli"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Wi-Fi diapazoni"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Ayrim kontent uchun ekranning yangilanish chastotasi 60-90 Gs orasida almashib turadi. Batareya tezroq sarflanadi."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Majburiy yangilanish chastotasi: 90 Gs"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Ekran sensorining javob qaytarishi va animatsiyalar sifati uchun eng yuqori yangilanish chastotasi Batareya tezroq sarflanadi."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Moslashuvchan kutish rejimi"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Yoniq / Ekranga qarab turganingizda u yoniq holatda qoladi"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android versiyasi"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android xavfsizlik yangilanishi"</string>
     <string name="model_info" msgid="8997566254717810904">"Model"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Model: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Model va qurilma"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Apparat versiyasi"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Jihozning nomi"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Tarmoq sozlamalari qayta tiklandi"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"SIM kartalar axboroti tozalanmadi"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Xato sababli yuklab olingan SIM kartalar axboroti tozalanmadi.\n\nQurilmani qayta ishga tushirib, qaytadan urining."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Hamma narsani tozalash (zavod sozlamalarini tiklash)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Hamma narsani tozalash (zavod sozlamalarini tiklash)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Bu planshetning "<b>"ichki xotirasidagi"</b>" barcha maʼlumotlarni tozalab tashlaydi, jumladan:\n\n"<li>"Sizning Google hisobingiz"</li>\n<li>"Tizim va ilovalar axborotlari va sozlamalari"</li>\n<li>"Yuklab olingan olingan ilovalar"</li>"ni."</string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Telefonning "<b>"ichki xotirasidagi"</b>" hamma narsa tozalab tashlanadi, jumladan:\n\n"<li>"Google hisobingiz"</li>\n<li>"Tizim va ilovalar sozlamalari"</li>\n<li>"Yuklab olingan ilovalar"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Siz hozir tizimga quyidagi hisoblardan kirgansiz:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Bu qurilmada boshqa foydalanuvchilar ham bor.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Musiqa"</li>\n<li>"Rasmlar"</li>\n<li>"Foydalanuvchining boshqa ma\'lumotlari"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM kartalar"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Bunda, mobil aloqa xizmatiga hech narsa qilinmaydi."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Musiqa, rasm va boshqa ma’lumotlarni o\'chirish uchun "<b>"USB xotirani"</b>" ham tozalash kerak."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Musiqa, rasm va boshqa ma’lumotlarni o‘chirish uchun "<b>"SD kartani"</b>" ham tozalash kerak."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Barcha maʼlumotlarni tozalash (zavod sozlamalarini tiklash)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Barcha maʼlumotlarni tozalash (zavod sozlamalarini tiklash)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Planshetning "<b>"ichki xotirasidagi"</b>" hamma narsa tozalab tashlanadi, jumladan:\n\n"<li>"Google hisobingiz"</li>\n<li>"Tizim va ilovalar sozlamalari"</li>\n<li>"Yuklab olingan ilovalar"</li>"."</string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Telefonning "<b>"ichki xotirasidagi"</b>" hamma narsa tozalab tashlanadi, jumladan:\n\n"<li>"Google hisobingiz"</li>\n<li>"Tizim va ilovalar sozlamalari"</li>\n<li>"Yuklab olingan ilovalar"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Siz hozir tizimga quyidagi hisoblardan kirgansiz:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Bu qurilmada boshqa foydalanuvchilar ham bor.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Musiqalar"</li>\n<li>"Rasmlar"</li>\n<li>"Foydalanuvchining boshqa ma\'lumotlari"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM kartalar"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Bunda, mobil aloqa xizmatiga hech narsa qilinmaydi."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Musiqa, rasm va boshqa maʼlumotlarni tozalash uchun "<b>"USB xotirani"</b>" tozalash kerak."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Musiqa, rasm va boshqa maʼlumotlarni tozalash uchun "<b>"SD kartani"</b>" tozalash kerak."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USB xotirani tozalash"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SD-kartani tozalash"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Ichki USB xotiradan musiqa va rasmlar kabi barcha ma‘lumotlarni tozalash"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"SD-kartadagi barcha ma’lumotlar, jumladan, musiqa va rasmlarni o‘chirib tashlash"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Hamma narsani tozalash"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Hamma narsani tozalash"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Barcha shaxsiy maʼlumotlaringiz va yuklab olingan ilovalar tozalab tashlanadi. Bu amalni ortga qaytara olmaysiz."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Barcha shaxsiy maʼlumotlaringiz, jumladan, yuklab olingan ilovalar va SIM kartalar axboroti tozalab tashlanadi. Bu amalni ortga qaytara olmaysiz."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Hammasini tozalash"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Dastlabki sozlamalarni qaytarib bo\'lmadi, chunki Tizimni tozalash xizmati javob bermayapti."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Hamma narsa tozalansinmi?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Ushbu foydalanuvchiga sozlamalarni zavod holatiga qaytarishga ruxsat berilmagan"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"O‘chirilmoqda"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Iltimos, kuting…"</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Hamma narsani tozalash"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Hamma narsani tozalash"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Barcha shaxsiy maʼlumotlaringiz va yuklab olingan ilovalar tozalab tashlanadi. Bu amalni ortga qaytara olmaysiz."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Barcha shaxsiy maʼlumotlaringiz, jumladan, yuklab olingan ilovalar va SIM kartalar axboroti tozalab tashlanadi. Bu amalni ortga qaytara olmaysiz."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Hamma narsa tozalansinmi?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Bu foydalanuvchiga sozlamalarni zavod holatiga qaytarishga ruxsat berilmagan"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Tozalanmoqda"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Kutib turing…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Chaqiruv sozlamalari"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Ovozli pochta, qo‘ng‘iroqni yo‘naltirish, qo‘ng‘roqni kutish va chaqiruvchi IDsi sozlamalari"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB modem"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g>dan ortiq qurilmalarga bog‘lanib bo‘lmaydi."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ulashilmaydi."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ethernet modem rejimi"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Telefondagi internetni USB Ethernet orqali tarqatish"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Telefondagi internetni Ethernet orqali tarqatish"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Boshqa qurilmalarga mobil internetni tarqatish uchun hotspot va modem rejimidan foydalaning. Ilovalar ham yaqin-atrofdagi qurilmalarga kontent ulashish uchun hotspot yarata oladi."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Boshqa qurilmalarga Wi-Fi yoki mobil internet orqali internetni tarqatish uchun hotspot va modem rejimlaridan foydalaning. Ilovalar ham yaqin-atrofdagi qurilmalarga kontent ulashish uchun hotspot yarata oladi."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Yordam"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Taglavha sozlamalari"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Kattalashtirish"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Kattalashtiriladigan hudud"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Kattalashtirish sozlamasini yoqish"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Kattalashtiriladigan ekran hududini tanlang"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Butun ekran"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Ekran qismi"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Butun ekran va ekran qismi"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Butun ekranni kattalashtirish"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Ekran qismini kattalashtirish"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Maxsus imkoniyatlar tugmasidan foydalanasizmi?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Ekranning ayrim qismini kattalashtirish uchun uch marta bosishdan foydalansangiz, yozish va boshqa amallar kechikishi mumkin.\n\nKattalashtirish uchun Maxsus imkoniyatlar tugmasidan foydalanishni istaysizmi?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Maxsus imkoniyatlar tugmasidan foydalanaman"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Kattalashtirish uchun uch marta bosishdan foydalanaman"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Kattalashtirish sozlamalari"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Uch marta bosib kattalashtirish"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Tugma yordamida kattalashtirish"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Quvvat tugmasi chaqiruvni tugatadi"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Yirik sichqoncha kursori"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Animatsiyalarni olib tashlash"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Mono audio"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Ovoz ijro qilinayotganda kanallarni birlashtirish"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Tovush muvozanati"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Chap"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Oʻng"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Mono audio"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Audio ijro qilinayotganda kanallarni birlashtirish"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Audio muvozanati"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Chap"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Oʻng"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Asosiy"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 soniya"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 soniya"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Bildirishnomada tebranish"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Jiringlaganda tebranish"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Teginganda tebranish"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ishlatish"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ilovasini ochish"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Rangni tuzatishdan foydalanish"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Taglavhalarni chiqarish"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Faqat bu funksiya ishlaydigan ilova uchun"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ishlatish"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Ochish: <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Rangni tuzatish funksiyasidan foydalanish"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Taglavhalarni chiqarish"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Faqat bu funksiya ishlaydigan ilova uchun"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Taglavha hajmi va uslubi"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Matn hajmi: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Boshqa parametrlar"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deyteranomaliya"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomaliya"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomaliya"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Kulrang tus"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Qizil va yashil"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Qizil va yashil"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Koʻk va sariq"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Fonda ishlashini cheklash"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Ilovaga fonda ishlashiga ruxsat berish"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Ilovaga fonda ishlashiga ruxsat berilmagan"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Fonda ishlashini cheklash imkonsiz"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Fonda ishlashini cheklash imkonsiz"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Fonda ishlashi cheklansinmi?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Bu ilovaning ishlashiga ta’sir ko‘rsatishi mumkin"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Bu ilova batareya sarfini optimallashtirish uchun sozlanmagani sababli uni cheklash imkonsiz.\n\nIlovani cheklash uchun avval batareya sarfini optimallashtirish funksiyasini yoqing."</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Jadval tuzish"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Batareya quvvati sarfini uzaytirish"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Quvvatlanayotganda faolsizlantirish"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Telefon quvvati <xliff:g id="PERCENT">%1$s</xliff:g> ga yetganda Quvvat tejash rejimi faolsizlantiriladi"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Planshet quvvati <xliff:g id="PERCENT">%1$s</xliff:g> ga yetganda Quvvat tejash rejimi faolsizlantiriladi"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Qurilma quvvati <xliff:g id="PERCENT">%1$s</xliff:g> ga yetganda Quvvat tejash rejimi faolsizlantiriladi"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Telefon quvvati <xliff:g id="PERCENT">%1$s</xliff:g> dan oshganda Quvvat tejash rejimi faolsizlantiriladi"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Planshet quvvati <xliff:g id="PERCENT">%1$s</xliff:g> dan oshganda Quvvat tejash rejimi faolsizlantiriladi"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Qurilma quvvati <xliff:g id="PERCENT">%1$s</xliff:g> dan oshganda Quvvat tejash rejimi faolsizlantiriladi"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Yoqish"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Asliga qaytarish"</string>
     <string name="tts_play" msgid="2945513377250757221">"Ijro"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Moslashuvchan ulanish"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Tarmoq ulanishlarini avtomatik boshqarish orqali batareya quvvatini uzoq saqlaydi va qurilma unumdorligini oshiradi"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Hisob axboroti ombori"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Sertifikat oʻrnatish"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Sertifikatlarni xotira kartasidan o‘rnatish"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Foydalanuvchining hisob axboroti"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Saqlab olingan hisob ma’lumotlarini ko‘rish va o‘zgartirish"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Kengaytirilgan sozlamalar"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Ombor turi"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Apparatli"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Faqat dasturiy"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Ushbu foydalanuvchi uchun hisob ma’lumotlari mavjud emas"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN va ilovalar uchun o‘rnatilgan"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi uchun o‘rnatilgan"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Qanday toʻlanadi"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Avval to‘lov ilovasini sozlang. Keyin telefoningiz orqa tomonini kontaktsiz to‘lov belgisi tushirilgan terminalga yaqinlashtiring."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"OK"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Yana…"</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Yana…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Birlamchi toʻlov ilovasini belgilash"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Birlamchi toʻlov ilovasini yangilash"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Kontaktsiz terminalda <xliff:g id="APP">%1$s</xliff:g> bilan toʻlansin"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Bundan doim qo‘ng‘iroqlar uchun foyd-sin"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Internet uchun SIM kartani tanlang"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"SMS lar uchun SIM kartani tanlang"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Mobil internet uchun SIM karta almashtirilmoqda. Bu bir necha daqiqa vaqt olishi mumkin..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Mobil internet uchun SIM karta almashtirilmoqda. Bu bir necha daqiqa vaqt olishi mumkin…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Quyidagi bilan qo‘ng‘iroq qilish"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"SIM kartani tanlang"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"<xliff:g id="CARD_NUMBER">%1$d</xliff:g>-SIM"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"amallar ketma-ketligi, jadval, batareya tejagich, quvvat tejagich, batareya, avtomatik, foiz"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, kengaytirilgan chaqiruv, 4g chaqiruv"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"til kiritish, tilni kiritish"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"shrift hajmi"</string>
     <string name="default_sound" msgid="6604374495015245195">"Birlamchi ovoz"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Rington va bildirishnoma balandligi: 80<xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Tovush balandligi, tebranish, Bezovta qilinmasin rejimi"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Ovozni yoqish"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Jonli izoh"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Avtomatik taglavha yaratish"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Qoida berilmagan"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ta reja sozlandi</item>
-      <item quantity="one">1 ta reja sozlandi</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Hech qanday}=1{1 ta reja sozlandi}other{# ta reja sozlandi}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Bezovta qilinmasin"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Faqat ishonchli odamlar va ilovalardan bildirishnoma kelsin"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Bildirishnomalarni kamaytirish"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Faqat muhimlari"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Yoniq / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Yoqilmagan / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Yoqilmagan"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Yoniq"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Har safar soʻralsin"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Rejimdan chiqilgunicha"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> soat</item>
-      <item quantity="one">1 soat</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> daqiqa"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ta rejani avtomatik tarzda yoqish mumkin</item>
-      <item quantity="one">1 ta rejani avtomatik tarzda yoqish mumkin</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 soat}other{# soat}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 daqiqa}other{# daqiqa}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Yoqilmagan}=1{Yoqilmagan / 1 ta rejani avtomatik tarzda yoqish mumkin}other{Yoqilmagan / # ta rejani avtomatik tarzda yoqish mumkin}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Bezovta qilinmasin rejimi uchun istisno"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Odamlar"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Ilovalar"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Muhimligi past bildirishnomalar avtomatik ravishda tovushsiz qilinsin"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Moslashuvchan bildirishnomalar tartiblanishi"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Bildirishnomalarni moslik asosida avtomatik tartiblash"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Moslashuvchan bildirishnoma amalini tanlash"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Bildirishnomalarga kiritilgan oʻzgartirishlar va tizim amalini tanlash oynasi"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Tavsiya etiladigan amallar va javoblar"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Tavsiya etiladigan amallar va javoblarni avtomatik chiqarish"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Oxirgi va keyinga qoldirilgan bildirishnomalar"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Bezovta qilinmasin rejimi"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Bezovta qilinmasin ruxsatini berish"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Hech qanday ilova “Bezovta qilinmasin” funksiyasiga ruxsat so‘ramagan"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Ilovalar yuklanmoqda…"</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Ilovalar yuklanmoqda…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Android ushbu ilova bildirishnomalarini ekranga chiqarmaydi"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Android bu turkumdagi bildirishnomalarni bloklamoqda"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Android bunday bildirishnomalar guruhini bloklaydi"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Barcha suhbatlar"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Muhim suhbatlar"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Hech qanday"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> ta suhbat</item>
-      <item quantity="one">1 ta suhbat</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Hech qanday"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Hech qanday}=1{1 ta suhbat}other{# ta suhbat}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Bezovta qilinmasin rejimi kimlarda ishlamaydi"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Chaqiruvlar"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Chaqiruvlar"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Muhim chaqiruvlarni oʻtkazib yubormaslik uchun qurilmangizda tovushli signal yoqilganini tekshiring."</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Kiruvchi chaqiruvlar “<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>” qoidasi bilan bloklangan. Bezovta qilinmasin rejimida kiruvchi chaqiruvlar bloklanadi. Tanishlar, qarindoshlaringizdan chaqiruvlarni qabul qila olishingiz uchun sozlamalarni tahrirlang."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Yulduzchali kontaktlar"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other">Yana <xliff:g id="NUM_PEOPLE">%d</xliff:g> ta kontakt</item>
-      <item quantity="one">Yana 1 ta kontakt</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Hech qanday"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Hech qanday}=1{{contact_1}}=2{{contact_1} va {contact_2}}=3{{contact_1}, {contact_2} va {contact_3}}other{{contact_1}, {contact_2} va yana # kishi}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Xabarlar"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"xabarlar"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Xabarlar"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"“<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>” uchun kiruvchi xabarlar bloklandi. Tanishlar, qarindoshlaringizdan SMS xabarlarni tovushli signal bilan qabul qila olishingiz uchun sozlamalarni tahrirlang."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Barcha xabarlar yetkaziladi"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Barcha chaqiruvlar chalinadi"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Hech qanday"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> ta kontakt</item>
-      <item quantity="one">1 ta kontakt</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Hech qanday}=1{1 ta kontakt}other{# ta kontakt}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Har kim"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Kontaktlar"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Yulduzchali kontaktlar"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Barcha bildirishnomalar"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Ayrim bildirishnomalar"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Tanlangan odamlar xabarlari hatto bezovta qilinmasin rejimida ham keladi"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other">Bezovta qilinmasin rejimi <xliff:g id="APP_NAMES">%s</xliff:g> uchun ishlamaydi</item>
-      <item quantity="one">Bezovta qilinmasin rejimi <xliff:g id="APP_NAME_0">%s</xliff:g> uchun ishlamaydi</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"Yana <xliff:g id="NUMBER">%d</xliff:g> ta"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Bezovta qilinmasin rejimi barcha ilovalar uchun ishlaydi}=1{Bezovta qilinmasin rejimi {app_1} uchun ishlamaydi}=2{Bezovta qilinmasin rejimi {app_1} va {app_2} uchun ishlamaydi}=3{Bezovta qilinmasin rejimi {app_1}, {app_2} va {app_3} uchun ishlamaydi}other{Bezovta qilinmasin rejimi {app_1}, {app_2} va yana # ta ilova uchun ishlamaydi}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Ilovalar"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Barcha bildirishnomalar"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Ayrim bildirishnomalar"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Bezovta qila oladigan bildirishnomalar"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Barcha bildirishnomalarga ruxsat berish"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other">Bezovta qilinmasin rejimi <xliff:g id="SOUND_CATEGORIES">%s</xliff:g> turkumidagi tovushlar uchun ishlamaydi</item>
-      <item quantity="one">Bezovta qilinmasin rejimi <xliff:g id="SOUND_CATEGORY">%s</xliff:g> turkumidagi tovushlar uchun ishlamaydi</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Bezovta qilinmasin rejimi barcha tovushlar uchun ishlaydi"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"Yana <xliff:g id="NUMBER">%d</xliff:g> ta"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Bezovta qilinmasin rejimi barcha tovushlar uchun ishlaydi}=1{Bezovta qilinmasin rejimi {sound_category_1} uchun ishlamaydi}=2{Bezovta qilinmasin rejimi {sound_category_1} va {sound_category_2} uchun ishlamaydi}=3{Bezovta qilinmasin rejimi {sound_category_1}, {sound_category_2} va {sound_category_3} uchun ishlamaydi}other{Bezovta qilinmasin rejimi {sound_category_1}, {sound_category_2} va yana # ta tovushlar uchun ishlamaydi}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Bezovta qilinmasin rejimi barcha tovushlar uchun ishlaydi"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Bezovta qilinmasin rejimi barcha xabar va chaqiruvlar uchun ishlaydi"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Bezovta qilinmasin rejimi ayrim foydalanuvchilardan keladigan xabar va chaqiruvlar uchun ishlamaydi"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Bezovta qilinmasin rejimi foydalanuvchilardan keladigan xabar va chaqiruvlar uchun ishlamaydi"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB nazoratchisi"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Ulangan qurilma"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Shu qurilma"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Almashtirilmoqda…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Almashtirilmoqda…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Almashtirilmadi"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Shu qurilmani quvvatlash"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Ulangan qurilma quvvatlanmoqda"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Tafsilotlar"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Trafik tejash"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Cheklanmagan mobil internet"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Fondagi internet o‘chiq"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Fondagi internet yoqilmagan"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Yoniq"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Yoqilmagan"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Trafik tejash funksiyasini yoqish"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Qurilma qulflangan bo‘lsa, bildirishnomalarda matn kiritish taqiqlansin"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Birlamchi imlo tekshiruvi vositasi"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Imlo tekshiruvi"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Imlo tekshiruvini yoqish"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Imlo tekshiruvini yoqish"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Tanlanmagan"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(hech qanday)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Xotiradan joy bo‘shatishga yordamlashish uchun xotira boshqaruvi qurilmangizdan zaxiralangan rasm va videolarni o‘chirib tashlaydi."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Rasm va videolarni o‘chirib tashlash"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Xotira boshqaruvi"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Xotira boshqaruvidan foydalanish"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Xotira boshqaruvidan foydalanish"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Avtomatik"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Qo‘llanma"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Joy ochish"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Ekranga ikki marta bosib tekshirish"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Ekranga ikki marta bosib tekshirish"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Ekranga ikki marta bosib tekshirish"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Bild-shnomalar u-n suring"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Bildirishnomalarni ochish uchun ekranning pastki qismidan pastga suring"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Ixcham rejim"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Ixcham rejimni yoqish"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Ilovalarni almashtirish vaqtida chiqish"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Vaqt tugadi"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 soniya"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 soniya"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 soniya"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"ixchamlik"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Vaqt, bildirishnoma va boshqa axborotlarni tekshirish uchun ekranga ikki marta bosing."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Telefonni olib tekshirish"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Planshetni olib tekshirish"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Planshetni tekshirish uchun bosing"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Qurilmani tekshirish uchun bosing"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Vaqt, bildirishnoma va boshqa axborotni tekshirish uchun ekranni bosing."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Vahima tugmasi"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Favqulodda SOS chaqiruvlarini amalga oshirish uchun oʻchirib-yoqish tugmasini tez-tez 5 marta bosing."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Ogohlantiruvchi signal"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Favqulodda xizmatlarga telefon qilishdan oldin ogohlantiruvchi signalni yoqish"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Favqulodda holatlar uchun kontaktlar"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Bildirishnomalarni barmoq izi bilan ochish"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Barmoq izi skaneri"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Bildirishnomalarni tekshirish uchun telefon orqasidagi barmoq izi skaneri ustida pastga suring"</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Barcha ilovalar uchun yoqish"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Grafik drayverni tanlang"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Asosiy"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Game Driver"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Game Driver"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Ishlab chiquvchilar uchun drayver versiyasi"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Tizim grafik drayveri"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Hech qanday tarmoq topilmadi. Qaytadan urining."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(taqiqlangan)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"SIM karta solinmagan"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"SIM kartasiz"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Yoʻq"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Ulanish uchun SIM karta kerak"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Ulanish uchun <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> SIM kartasi kerak"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Tanlangan tarmoq rejimi: WCDMA tanlangan"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Tanlangan tarmoq rejimi: faqat GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Tanlangan tarmoq rejimi: faqat WCDMA"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobil internet"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Mobil tarmoq orqali internetdan foydalanish"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Telefon xizmat doirasida avtomatik ravishda bu aloqa operatoriga almashtiriladi"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Hech qanday SIM karta mavjud emas"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Chaqiruv parametrlari"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS parametrlari"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Har safar soʻralsin"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Sozlamalar orqali ustki ilovalarga ruxsat berish"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Boshqa ilovalar ustidan ochiladigan ilovalarga ruxsat berish"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Media"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Media seansi tamomlanganda pleyer berkitilsin"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Pleyer ochiq turgan Tezkor sozlamalar paneli orqali seansni davom ettirish imkonini beradi."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Tezkor sozlamalardagi multimedia pleyeri"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Ijroni osongina davom ettirish maqsadida kengaytirilgan davr uchun multimedia pleyerini chiqarish"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Pleyerni berkitish"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Pleyerni chiqarish"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Hech qanday pleyer mavjud emas"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Ruxsat berilgan ilovalar"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"media"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth yoqiladi"</string>
 </resources>
diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
index ced3b5a..8ac7b7d 100644
--- a/res/values-vi/arrays.xml
+++ b/res/values-vi/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Trung bình"</item>
     <item msgid="6740026006576843477">"Dài"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Ngắn"</item>
+    <item msgid="7397961711906421599">"Trung bình"</item>
+    <item msgid="4079132024502041928">"Dài"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Mặc định"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Toàn cầu"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Chỉ TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Toàn cầu"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 9c14ef1..0c2122a 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Hiển thị thông tin tiểu sử trên màn hình khóa"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Tài khoản"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Vị trí"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Sử dụng vị trí"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Sử dụng vị trí"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Đang tắt"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">Đang bật - <xliff:g id="COUNT_1">%1$d</xliff:g> ứng dụng có quyền truy cập vào vị trí</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Sử dụng khuôn mặt của bạn để xác thực"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Bắt đầu"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Nếu tính năng mở khóa bằng khuôn mặt qua dịch vụ hỗ trợ tiếp cận đang tắt, thì một số bước thiết lập có thể hoạt động không đúng cách với TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Quay lại"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Tiếp tục thiết lập"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Sử dụng thiết lập hỗ trợ tiếp cận"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="one">Phải có ít hơn <xliff:g id="NUMBER_0">%d</xliff:g> chữ số</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Quản trị viên thiết bị không cho phép dùng mã PIN gần đây"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Quản vị viên CNTT đã chặn những mã PIN phổ biến. Hãy thử mã PIN khác."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Mật khẩu này không được bao gồm ký tự không hợp lệ"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Phải chứa ít nhất 1 chữ cái"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Phải chứa ít nhất 1 chữ số"</string>
@@ -653,7 +655,6 @@
       <item quantity="one">Phải có ít nhất 1 ký tự không phải là số</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Quản trị viên thiết bị không cho phép sử dụng mật khẩu gần đây"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Quản vị viên CNTT đã chặn những mật khẩu phổ biến. Hãy thử mật khẩu khác."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Không cho phép thứ tự chữ số tăng dần, giảm dần hoặc lặp lại"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Xác nhận"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Hủy"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Bật Wi‑Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Sử dụng Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Sử dụng Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Cài đặt Wi‑Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Thiết lập &amp; quản lý điểm truy cập mạng"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Căn giữa mã QR dưới đây để kết nối với “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Kết nối với Wi‑Fi bằng cách quét mã QR"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Chia sẻ Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Quét mã QR này để kết nối với “<xliff:g id="SSID">%1$s</xliff:g>” và chia sẻ mật khẩu"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Quét mã QR này bằng thiết bị khác để kết nối với “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Quét mã QR này để kết nối với “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Hãy thử lại. Nếu sự cố vẫn tiếp diễn, hãy liên hệ với nhà sản xuất thiết bị"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Đã xảy ra lỗi"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Mật khẩu Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Mật khẩu điểm phát sóng: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Tự động kết nối"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Cho phép điện thoại tự động kết nối khi ở gần mạng này"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Cho phép máy tính bảng tự động kết nối khi ở gần mạng này"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Cho phép kết nối với mạng này khi nằm trong vùng phủ sóng"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Thêm thiết bị"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Sử dụng mã QR để thêm thiết bị vào mạng này"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"Mã QR không phải là định dạng hợp lệ"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Sử dụng chứng chỉ hệ thống"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Không cung cấp"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Không xác thực"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Không có chứng chỉ nào được chỉ định. Kết nối của bạn sẽ không phải là riêng tư."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Tên mạng quá dài."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Phải chỉ định một miền."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Bạn cần có chứng chỉ."</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Kết nối"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Đã bật Wi-Fi"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Đã kết nối với <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Đang kết nối với <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Đang kết nối…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Không thể kết nối với mạng"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Đang nằm ngoài vùng phủ sóng của mạng"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Ứng dụng đang chia sẻ nội dung. Để chia sẻ kết nối Internet, hãy tắt điểm phát sóng, sau đó bật lại"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Chưa đặt mật khẩu"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Tên điểm phát sóng"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Đang bật <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Đang bật <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Các thiết bị khác có thể kết nối với <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Mật khẩu điểm phát sóng"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Băng tần AP"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Hình ảnh mượt"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Tự động tăng tốc độ làm mới từ 60 lên 90 Hz đối với một số nội dung. Làm tăng mức sử dụng pin."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Hình ảnh mượt"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Buộc làm mới ở tốc độ 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Tốc độ làm mới cao nhất giúp cải thiện khả năng phản hồi khi chạm và chất lượng ảnh động. Làm tăng mức sử dụng pin."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Chú ý đến màn hình"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Bật / Màn hình sẽ không tắt nếu bạn đang nhìn vào màn hình"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Phiên bản Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Bản cập nhật bảo mật Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Kiểu máy"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Kiểu máy: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Kiểu máy và phần cứng"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Phiên bản phần cứng"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ID thiết bị"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Cài đặt mạng đã được đặt lại"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Không thể xóa SIM"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Không thể xóa SIM đã tải xuống do lỗi.\n\nHãy khởi động lại thiết bị của bạn rồi thử lại."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Xóa mọi dữ liệu (đặt lại thiết bị)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Xóa mọi dữ liệu (đặt lại thiết bị)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Thao tác này sẽ xóa tất cả dữ liệu trong "<b>"bộ nhớ trong"</b>" của máy tính bảng, bao gồm:\n\n"<li>"Tài khoản Google của bạn"</li>\n<li>"Dữ liệu cũng như các tùy chọn cài đặt của hệ thống và ứng dụng"</li>\n<li>"Ứng dụng đã tải xuống"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Thao tác này sẽ xóa tất cả dữ liệu trong "<b>"bộ nhớ trong"</b>" của điện thoại, bao gồm:\n\n"<li>"Tài khoản Google của bạn"</li>\n<li>"Dữ liệu cũng như các tùy chọn cài đặt của hệ thống và ứng dụng"</li>\n<li>"Ứng dụng đã tải xuống"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Bạn hiện đã đăng nhập vào các tài khoản sau đây:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Có người dùng khác trên thiết bị này.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Nhạc"</li>\n<li>"Ảnh"</li>\n<li>"Dữ liệu người dùng khác"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Việc này sẽ không hủy gói dịch vụ di động của bạn."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Để xóa nhạc, hình ảnh và dữ liệu người dùng khác, cần xóa "<b>"bộ lưu trữ USB"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Đồng thời, để xóa nhạc, hình ảnh và dữ liệu người dùng khác, cần xóa "<b>"thẻ SD"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Xóa mọi dữ liệu (đặt lại về trạng thái ban đầu)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Xóa mọi dữ liệu (đặt lại về trạng thái ban đầu)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Thao tác này sẽ xóa mọi dữ liệu khỏi "<b>"bộ nhớ trong"</b>" của máy tính bảng, bao gồm:\n\n"<li>"Tài khoản Google của bạn"</li>\n<li>"Dữ liệu cũng như các tùy chọn cài đặt của hệ thống và ứng dụng"</li>\n<li>"Các ứng dụng đã tải xuống"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Thao tác này sẽ xóa mọi dữ liệu khỏi "<b>"bộ nhớ trong"</b>" của điện thoại, bao gồm:\n\n"<li>"Tài khoản Google của bạn"</li>\n<li>"Dữ liệu cũng như các tùy chọn cài đặt của hệ thống và ứng dụng"</li>\n<li>"Các ứng dụng đã tải xuống"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Bạn hiện đã đăng nhập vào các tài khoản sau đây:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Có người dùng khác trên thiết bị này.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Nhạc"</li>\n<li>"Ảnh"</li>\n<li>"Dữ liệu khác của người dùng"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Thao tác này sẽ không hủy gói dịch vụ di động của bạn."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Để xóa nhạc, ảnh và dữ liệu khác của người dùng, thì cần phải xóa "<b>"bộ lưu trữ USB"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Để xóa nhạc, ảnh và dữ liệu khác của người dùng, thì cần phải xóa "<b>"thẻ SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Xóa bộ nhớ USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Xóa thẻ SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Xóa tất cả dữ liệu trên bộ nhớ trong USB, chẳng hạn như nhạc hoặc ảnh"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Xóa tất cả dữ liệu trên thẻ SD, chẳng hạn như nhạc hoặc ảnh"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Xóa tất cả dữ liệu"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Xóa tất cả dữ liệu"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Tất cả thông tin cá nhân và ứng dụng đã tải xuống của bạn sẽ bị xóa. Bạn không thể hủy hành động này."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Tất cả thông tin cá nhân của bạn, kể cả ứng dụng và SIM đã tải xuống, đều sẽ bị xóa. Bạn không thể hủy hành động này."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Xóa mọi thứ"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Không có tác vụ đặt lại nào được thực hiện vì dịch vụ Xóa hệ thống không khả dụng."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Xóa tất cả dữ liệu?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Khôi phục cài đặt gốc không khả dụng cho người dùng này"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Đang xóa"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Vui lòng chờ..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Xóa mọi dữ liệu"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Xóa mọi dữ liệu"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Tất cả thông tin cá nhân và ứng dụng đã tải xuống của bạn đều bị xóa. Bạn không thể hủy thao tác này."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Tất cả thông tin cá nhân của bạn, kể cả SIM và ứng dụng đã tải xuống, đều bị xóa. Bạn không thể hủy thao tác này."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Xóa mọi dữ liệu?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Người dùng này không thể thực hiện thao tác đặt lại về trạng thái ban đầu"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Đang xóa"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Vui lòng chờ…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Cài đặt cuộc gọi"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Thiết lập thư thoại, chuyển tiếp cuộc gọi, chờ cuộc gọi, Số gọi đến"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Chia sẻ Internet qua USB"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Không thể dùng làm điểm truy cập Internet cho hơn <xliff:g id="MAXCONNECTION">%1$d</xliff:g> thiết bị."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sẽ được tháo."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Chia sẻ Internet qua Ethernet"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Chia sẻ kết nối Internet của điện thoại qua USB Ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Chia sẻ kết nối Internet của điện thoại qua Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Sử dụng tính năng điểm phát sóng và chia sẻ Internet để cho phép các thiết bị khác kết nối với Internet thông qua dữ liệu di động của bạn. Các ứng dụng cũng có thể tạo điểm phát sóng để chia sẻ nội dung với thiết bị ở gần."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Dùng tính năng điểm phát sóng và chia sẻ Internet để cho phép các thiết bị khác kết nối với Internet thông qua dữ liệu di động hoặc Wi-Fi của bạn. Các ứng dụng cũng có thể tạo điểm phát sóng để chia sẻ nội dung với thiết bị ở gần."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Trợ giúp"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Tùy chọn phụ đề"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Phóng to"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Khu vực phóng to"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Bật tính năng phóng to"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Chọn (các) khu vực phóng to mà bạn muốn dùng khi phóng to màn hình"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Toàn màn hình"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Một phần màn hình"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Toàn màn hình và một phần màn hình"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Phóng to toàn bộ màn hình"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Phóng to một phần màn hình"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Chuyển sang dùng nút hỗ trợ tiếp cận?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Nếu bạn phóng to một phần màn hình bằng cách nhấn 3 lần, thì thao tác nhập và các hành động khác sẽ bị trễ.\n\nBạn có muốn phóng to bằng nút hỗ trợ tiếp cận không?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Chuyển sang dùng nút hỗ trợ tiếp cận"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Vẫn phóng to bằng cách nhấn 3 lần"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Cài đặt phóng to"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Phóng to bằng cách nhấn 3 lần"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Phóng to bằng phím tắt"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Kết thúc cuộc gọi bằng nút nguồn"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Con trỏ chuột lớn"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Xóa hiệu ứng động"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Âm thanh đơn âm"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Kết hợp các kênh khi phát âm thanh"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Cân bằng âm thanh"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Trái"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Phải"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Âm thanh đơn âm"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Kết hợp các kênh khi phát âm thanh"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Cân bằng âm thanh"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Trái"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Phải"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Mặc định"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 giây"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 giây"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Rung khi có thông báo"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Rung khi đổ chuông"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Phản hồi chạm"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Sử dụng <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Mở <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Sử dụng tính năng chỉnh màu"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Hiển thị phụ đề"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Chỉ dành cho ứng dụng được hỗ trợ"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Sử dụng <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Mở <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Sử dụng tính năng chỉnh màu"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Hiển thị phụ đề"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Chỉ dành cho ứng dụng được hỗ trợ"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Kích thước và kiểu phụ đề"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Kích thước văn bản <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Tùy chọn khác"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Mù màu xanh lục nhẹ"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Mù màu đỏ nhẹ"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Mù màu lam vàng"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Thang màu xám"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Đỏ – xanh lục"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Đỏ – xanh lục"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Xanh lam – vàng"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Hạn chế chạy trong nền"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Cho phép ứng dụng chạy trong nền"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Ứng dụng không được phép chạy trong nền"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Không thể hạn chế sử dụng trong nền"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Không thể hạn chế sử dụng trong nền"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Giới hạn hoạt động nền?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Nếu bạn giới hạn hoạt động nền cho một ứng dụng, ứng dụng đó có thể hoạt động sai"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Không thể hạn chế ứng dụng này vì bạn chưa đặt để tối ưu hóa pin.\n\nĐể hạn chế ứng dụng, trước tiên hãy bật tối ưu hóa pin."</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Đặt lịch biểu"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Kéo dài thời lượng pin"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Tắt khi sạc đầy"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Trình tiết kiệm pin sẽ tắt khi pin của điện thoại ở mức <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Trình tiết kiệm pin sẽ tắt khi pin của máy tính bảng ở mức <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Trình tiết kiệm pin sẽ tắt khi pin của thiết bị ở mức <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Trình tiết kiệm pin sẽ tắt khi điện thoại sạc được hơn <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Trình tiết kiệm pin sẽ tắt khi máy tính bảng sạc được hơn <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Trình tiết kiệm pin sẽ tắt khi thiết bị sạc được hơn <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Bật"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Đặt lại"</string>
     <string name="tts_play" msgid="2945513377250757221">"Phát"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Kết nối thích ứng"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Tăng thời lượng pin và cải thiện hiệu suất thiết bị bằng cách tự động quản lý các kết nối mạng"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Lưu thông tin xác thực"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Cài đặt chứng chỉ"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Cài đặt chứng chỉ từ bộ nhớ"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Thông tin xác thực người dùng"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Xem và sửa đổi thông tin xác thực đã lưu trữ"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Nâng cao"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Loại lưu trữ"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Dựa trên phần cứng"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Chỉ phần mềm"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Không có thông tin đăng nhập cho người dùng này"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Đã cài đặt cho VPN và ứng dụng"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Đã cài đặt cho Wi-Fi"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Thanh toán trên thiết bị thanh toán"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Thiết lập ứng dụng thanh toán. Sau đó chỉ cần hướng mặt sau của điện thoại vào thiết bị thanh toán có biểu tượng không tiếp xúc."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Đã hiểu"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Thêm..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Thêm…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Đặt ứng dụng thanh toán mặc định"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Cập nhật ứng dụng thanh toán mặc định"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Sử dụng <xliff:g id="APP">%1$s</xliff:g> để thanh toán trên thiết bị thanh toán không tiếp xúc"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Luôn sử dụng SIM này để gọi"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Chọn SIM cho dữ liệu"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Chọn thẻ SIM cho tin nhắn SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Đang chuyển SIM dữ liệu, quá trình này có thể mất tới một phút..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Đang chuyển đổi SIM dữ liệu, quá trình này có thể mất tối đa một phút…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Gọi bằng"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Chọn thẻ SIM"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"quy trình, lịch biểu, trình tiết kiệm pin, trình tiết kiệm điện, pin, tự động, phần trăm"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, gọi nâng cao, gọi qua mạng 4G"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"thêm ngôn ngữ, thêm một ngôn ngữ"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"cỡ chữ"</string>
     <string name="default_sound" msgid="6604374495015245195">"Âm thanh mặc định"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Âm lượng chuông và thông báo ở mức <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Âm lượng, rung, Không làm phiền"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Âm thanh bật nguồn"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Phụ đề trực tiếp"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Tự động tạo phụ đề cho nội dung nghe nhìn"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Không có"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other">Đã đặt <xliff:g id="ON_COUNT">%d</xliff:g> lịch biểu</item>
-      <item quantity="one">Đã đặt 1 lịch biểu</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Không có}=1{Đã đặt 1 lịch biểu}other{Đã đặt # lịch biểu}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Không làm phiền"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Chỉ nhận thông báo về những người và ứng dụng quan trọng"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Hạn chế bị gián đoạn"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Chỉ cho các mục ưu tiên"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Đang bật / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Đang tắt / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Đang tắt"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Đang bật"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Luôn hỏi"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Cho đến khi bạn tắt"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> giờ</item>
-      <item quantity="one">1 giờ</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> phút"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> lịch biểu có thể tự động bật</item>
-      <item quantity="one">1 lịch biểu có thể tự động bật</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 giờ}other{# giờ}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 phút}other{# phút}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Đang tắt}=1{Đang tắt/1 lịch biểu có thể tự động bật}other{Đang tắt/# lịch biểu có thể tự động bật}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Những điều có thể làm gián đoạn chế độ Không làm phiền"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Người"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Ứng dụng"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Tự động đặt thông báo có mức ưu tiên thấp thành Nhẹ nhàng"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Thứ tự thông báo thích ứng"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Tự động sắp xếp các thông báo theo mức độ liên quan"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Phản hồi về tính năng thông báo thích ứng"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Cho biết những điều chỉnh được thực hiện đối với thông báo và hiển thị tùy chọn gửi ý kiến phản hồi cho hệ thống"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Câu trả lời và hành động đề xuất"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Tự động hiển thị câu trả lời và hành động đề xuất"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Hiển thị các thông báo gần đây và thông báo đã tạm ẩn"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Truy cập Không làm phiền"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Cho phép tính năng Không làm phiền"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Không có ứng dụng được cài đặt nào yêu cầu quyền truy cập Không làm phiền"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Đang tải ứng dụng..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Đang tải ứng dụng…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Theo yêu cầu của bạn, Android đang chặn hiển thị thông báo của ứng dụng này trên thiết bị này"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Theo yêu cầu của bạn, Android đang chặn hiển thị danh mục thông báo này trên thiết bị này"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Theo yêu cầu của bạn, Android đang chặn hiển thị nhóm thông báo này trên thiết bị này"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Tất cả các cuộc trò chuyện"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Cuộc trò chuyện ưu tiên"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Không có"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> cuộc trò chuyện</item>
-      <item quantity="one">1 cuộc trò chuyện</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Không có"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Không có}=1{1 cuộc trò chuyện}other{# cuộc trò chuyện}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Những người liên hệ bạn vẫn liên lạc được"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Cuộc gọi"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Cuộc gọi"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Để các cuộc gọi đã cho phép phát ra âm thanh, hãy đặt thiết bị ở chế độ đổ chuông"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Đối với ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’, các cuộc gọi đến đều bị chặn. Bạn có thể điều chỉnh các tùy chọn cài đặt để cho phép bạn bè, gia đình hoặc những người liên hệ khác liên lạc với bạn."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Người liên hệ có gắn dấu sao"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> người khác</item>
-      <item quantity="one">1 người khác</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Không có"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Không có}=1{{contact_1}}=2{{contact_1} và {contact_2}}=3{{contact_1}, {contact_2} và {contact_3}}other{{contact_1}, {contact_2} và # người liên hệ khác}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Tin nhắn"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"tin nhắn"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Tin nhắn"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Các tin nhắn đến sẽ bị chặn khi áp dụng ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’. Bạn có thể điều chỉnh các tùy chọn cài đặt để cho phép bạn bè, gia đình hoặc những người liên hệ khác liên lạc với bạn."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Bạn sẽ được thông báo về tất cả tin nhắn"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Bạn sẽ được thông báo về tất cả cuộc gọi"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Không có"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> người liên hệ</item>
-      <item quantity="one">1 người liên hệ</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Không có}=1{1 người liên hệ}other{# người liên hệ}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Bất kỳ ai"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Danh bạ"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Người liên hệ có gắn dấu sao"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Tất cả thông báo"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Một số thông báo"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Những người được chọn vẫn có thể liên hệ với bạn, ngay cả khi bạn không cho phép các ứng dụng làm phiền"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other">Ứng dụng <xliff:g id="APP_NAMES">%s</xliff:g> có thể gián đoạn</item>
-      <item quantity="one">Ứng dụng <xliff:g id="APP_NAME_0">%s</xliff:g> có thể gián đoạn</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> ứng dụng khác"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Không ứng dụng nào có thể gây gián đoạn}=1{{app_1} có thể gây gián đoạn}=2{{app_1} và {app_2} có thể gây gián đoạn}=3{{app_1}, {app_2} và {app_3} có thể gây gián đoạn}other{{app_1}, {app_2} và # ứng dụng khác có thể gây gián đoạn}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Ứng dụng"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Tất cả thông báo"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Một số thông báo"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Các thông báo bạn vẫn nhận được"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Cho phép tất cả thông báo"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> có thể gián đoạn</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> có thể gián đoạn</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Không âm thanh nào có thể gián đoạn"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> âm thanh khác"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Không âm thanh nào có thể gây gián đoạn}=1{{sound_category_1} có thể gây gián đoạn}=2{{sound_category_1} và {sound_category_2} có thể gây gián đoạn}=3{{sound_category_1}, {sound_category_2} và {sound_category_3} có thể gây gián đoạn}other{{sound_category_1}, {sound_category_2} và # âm thanh khác có thể gây gián đoạn}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Không âm thanh nào có thể gây gián đoạn"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Không ai có thể gián đoạn"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Một số người có thể gián đoạn"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Tất cả mọi người có thể gián đoạn"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"Thiết bị kiểm soát USB"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Thiết bị đã kết nối"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Thiết bị này"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Đang chuyển đổi..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Đang chuyển đổi…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Không thể chuyển đổi"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Đang sạc thiết bị này"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Sạc thiết bị được kết nối"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Xem chi tiết"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Trình tiết kiệm dữ liệu"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Dữ liệu không hạn chế"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Dữ liệu nền bị tắt"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Dữ liệu nền đang tắt"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Đang bật"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Đang tắt"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Sử dụng Trình tiết kiệm dữ liệu"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Nếu thiết bị bị khóa, ngăn nhập câu trả lời hoặc văn bản khác trong thông báo"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Trình kiểm tra chính tả mặc định"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Chọn trình kiểm tra chính tả"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Sử dụng trình kiểm tra chính tả"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Sử dụng trình kiểm tra chính tả"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Chưa được chọn"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(không có)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Để giúp giải phóng dung lượng lưu trữ, trình quản lý bộ nhớ sẽ xóa ảnh và video đã sao lưu khỏi thiết bị của bạn."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Xóa ảnh và video"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Trình quản lý bộ nhớ"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Sử dụng Trình quản lý bộ nhớ"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Sử dụng Trình quản lý bộ nhớ"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Tự động"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Hướng dẫn sử dụng"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Giải phóng dung lượng ngay"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Nhấn đúp để kiểm tra điện thoại"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Nhấn đúp để kiểm tra máy tính bảng"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Nhấn đúp để kiểm tra thiết bị"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Vuốt để xem thông báo"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Để hiển thị thông báo, hãy vuốt xuống cuối màn hình"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Chế độ một tay"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Sử dụng chế độ một tay"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Thoát khi chuyển đổi ứng dụng"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Thời gian chờ"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 giây"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 giây"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 giây"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"tầm với"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Để xem thời gian, thông báo và thông tin khác, hãy nhấn đúp vào màn hình."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Nhấc để kiểm tra điện thoại"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Nhấc để kiểm tra máy tính bảng"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Nhấn để kiểm tra máy tính bảng"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Nhấn để kiểm tra thiết bị"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Để xem thời gian, thông báo và thông tin khác, hãy nhấn vào màn hình."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Nút hoảng loạn"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Bật tính năng SOS khẩn cấp bằng cách nhấn nhanh nút nguồn 5 lần."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Âm cảnh báo"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Cảnh báo trước khi bắt đầu các thao tác"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Người liên hệ lúc khẩn cấp"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Vuốt cảm biến vân tay để xem thông báo"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Vuốt vân tay"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Để kiểm tra thông báo, hãy vuốt xuống trên cảm biến vân tay ở mặt sau điện thoại."</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Bật cho tất cả các ứng dụng"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Chọn trình điều khiển đồ họa"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Mặc định"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Trình điều khiển trò chơi"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Trình điều khiển trò chơi"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Trình điều khiển dành cho nhà phát triển"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Trình điều khiển đồ họa hệ thống"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Không tìm thấy mạng. Hãy thử lại."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(cấm)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Không có thẻ SIM"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Không có SIM"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Không có"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Cần có SIM để kết nối"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Cần có SIM <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> để kết nối"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Chế độ mạng ưa thích: ưu tiên WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Chế độ mạng ưa thích: chỉ GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Chế độ mạng ưa thích: chỉ WCDMA"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Dữ liệu di động"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Sử dụng dữ liệu qua mạng di động"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Điện thoại sẽ tự động chuyển sang nhà mạng này khi nằm trong vùng phủ sóng"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Không có thẻ SIM nào"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Tùy chọn cuộc gọi"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Tùy chọn SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Luôn hỏi"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Cho phép phủ lên màn hình Cài đặt"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Những ứng dụng có thể hiển thị bên trên các ứng dụng khác sẽ được phép phủ lên màn hình Cài đặt"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Nội dung nghe nhìn"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Ẩn trình phát khi phiên phát nội dung nghe nhìn đã kết thúc"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Trình phát cho phép bạn tiếp tục một phiên từ bảng Cài đặt nhanh mở rộng."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Trình phát nội dung nghe nhìn trong phần Cài đặt nhanh"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Hiển thị trình phát nội dung nghe nhìn trong thời gian dài để dễ dàng tiếp tục phát"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Ẩn trình phát"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Hiện trình phát"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Không có trình phát nào"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Ứng dụng được phép"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"nội dung nghe nhìn"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth sẽ bật"</string>
 </resources>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index bb96438..0538159 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"中"</item>
     <item msgid="6740026006576843477">"长"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"短"</item>
+    <item msgid="7397961711906421599">"中"</item>
+    <item msgid="4079132024502041928">"长"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"默认"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"通用"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"仅限 TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"全球"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 2c5d432..319b2b4 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"在锁定屏幕上显示个人资料信息"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"帐号"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"位置信息"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"使用位置信息"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"使用位置信息"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"关闭"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">已开启 - <xliff:g id="COUNT_1">%1$d</xliff:g> 个应用有权使用位置信息</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"使用您的面孔进行身份验证"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"开始"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"如果人脸解锁无障碍功能处于关闭状态，某些设置步骤可能无法与 TalkBack 正常搭配运行。"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"返回"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"继续设置"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"使用无障碍设置"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="one">必须少于 <xliff:g id="NUMBER_0">%d</xliff:g> 位数</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"设备管理员不允许使用最近用过的 PIN 码"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"常用 PIN 码已被您的 IT 管理员屏蔽。请尝试一个不同的 PIN 码。"</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"密码不得包含无效字符"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"必须包含至少 1 个字母"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"必须包含至少 1 个数字"</string>
@@ -653,7 +655,6 @@
       <item quantity="one">必须包含至少 1 个非数字字符</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"设备管理员不允许使用最近用过的密码"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"常用密码已被您的 IT 管理员屏蔽。请尝试一个不同的密码。"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"不允许使用以升序、降序或重复序列进行排列的一串数字"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"确认"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"取消"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"WLAN"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"打开WLAN"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"WLAN"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"使用 WLAN"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"使用 WLAN"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"WLAN设置"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"WLAN"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"设置和管理无线接入点"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"将二维码对准下方中间位置即可连接到“<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"扫描二维码即可加入 WLAN"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"分享 WLAN"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"扫描此二维码即可连接到“<xliff:g id="SSID">%1$s</xliff:g>”并分享密码"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"使用其他设备扫描此二维码即可加入“<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"扫描此二维码即可连接到“<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"请重试。如果问题依然存在，请与设备制造商联系"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"出了点问题"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"WLAN 密码：<xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"热点密码：<xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"自动连接"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"允许手机在此网络附近时自动连接"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"允许平板电脑在此网络附近时自动连接"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"允许在进入此网络的覆盖范围时连接到此网络"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"添加设备"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"使用二维码将设备添加到此网络"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"二维码的格式无效"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"使用系统证书"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"不提供"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"不验证"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"未指定任何证书。您的网络连接将不是私密连接。"</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"网络名称太长。"</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"必须指定域名。"</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"需要指定证书。"</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"连接"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"WLAN 已开启"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"已连接到“<xliff:g id="NETWORK_NAME">%1$s</xliff:g>”"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"正在连接到“<xliff:g id="NETWORK_NAME">%1$s</xliff:g>”"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"正在连接…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"无法连接网络"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"网络不在范围内"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"应用正在共享内容。要共享互联网连接，请先关闭热点，然后重新打开"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"未设置密码"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"热点名称"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"正在打开<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"正在开启“<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>”…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"其他设备可以连接到<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"热点密码"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP 频段"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"流畅画面"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"自动将某些内容的刷新频率从 60 Hz 调高到 90 Hz。这么做会增加耗电量。"</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"流畅画面"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"强制使用 90 Hz 刷新频率"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"使用最高刷新频率可提升按触操作响应和动画质量，但会增加耗电量。"</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"屏幕感知"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"开启 / 您看着屏幕时，它将不会关闭"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android 版本"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android 安全更新"</string>
     <string name="model_info" msgid="8997566254717810904">"型号"</string>
-    <string name="model_summary" msgid="2246651782442466213">"型号：%1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"型号和硬件"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"硬件版本"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"设备 ID"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"网络设置已重置"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"无法清除 SIM 卡"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"发生错误，因此无法清除已下载的 SIM 卡。\n\n请重启设备，然后重试。"</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"清除所有数据（恢复出厂设置）"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"清除所有数据（恢复出厂设置）"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"此操作会清除您平板电脑"<b>"内部存储空间"</b>"中的所有数据，包括：\n\n"<li>"您的 Google 帐号"</li>\n<li>"系统和应用的数据和设置"</li>\n<li>"已下载的应用"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"此操作会清除您手机"<b>"内部存储空间"</b>"中的所有数据，包括：\n\n"<li>"您的 Google 帐号"</li>\n<li>"系统和应用的数据和设置"</li>\n<li>"已下载的应用"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"目前，您已登录以下帐号：\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"此设备上目前还有其他用户。\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"音乐"</li>\n<li>"照片"</li>\n<li>"其他的用户数据"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM 卡"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"这样并不会取消您的移动服务套餐。"</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"要清除音乐、照片和其他用户数据，请清空该 "<b>"USB存储设备"</b>"。"</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"要清除音乐、图片和其他用户数据，您需要清空该 "<b>"SD卡"</b>"。"</string>
+    <string name="main_clear_title" msgid="277664302144837723">"清除所有数据（恢复出厂设置）"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"清除所有数据（恢复出厂设置）"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"此操作会清除您平板电脑"<b>"内部存储空间"</b>"中的所有数据，包括：\n\n"<li>"您的 Google 帐号"</li>\n<li>"系统和应用的数据和设置"</li>\n<li>"已下载的应用"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"此操作会清除您手机"<b>"内部存储空间"</b>"中的所有数据，包括：\n\n"<li>"您的 Google 帐号"</li>\n<li>"系统和应用的数据和设置"</li>\n<li>"已下载的应用"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"您目前已登录以下帐号：\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"此设备上目前还有其他用户。\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"音乐"</li>\n<li>"照片"</li>\n<li>"其他用户数据"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM 卡"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"这样并不会取消您的移动服务套餐。"</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"如需清除音乐、照片和其他用户数据，您需要清空该 "<b>"USB 存储设备"</b>"。"</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"如需清除音乐、图片和其他用户数据，您需要清空该 "<b>"SD 卡"</b>"。"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"格式化USB存储设备"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"格式化SD卡"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"清除该内部USB存储设备中的全部数据，例如音乐或照片"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"清除SD卡中的全部数据，例如音乐或照片"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"清除所有数据"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"清除所有数据"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"系统将删除您所有的个人信息和已下载的应用。此操作无法撤消。"</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"系统将删除您所有的个人信息（包括已下载的应用和 SIM 卡）。此操作无法撤消。"</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"清除全部内容"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"“系统清除”服务不可用，因此未执行恢复出厂设置操作。"</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"要清除所有数据吗？"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"此用户无权恢复出厂设置"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"正在清除"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"请稍候…"</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"清除所有数据"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"清除所有数据"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"系统将删除您所有的个人信息和已下载的应用。此操作无法撤消。"</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"系统将删除您所有的个人信息（包括已下载的应用和 SIM 卡）。此操作无法撤消。"</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"要清除所有数据吗？"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"此用户无权恢复出厂设置"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"正在清除"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"请稍候…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"通话设置"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"设置语音信箱、来电转接、来电等待和本机号码显示"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB 网络共享"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"无法与 <xliff:g id="MAXCONNECTION">%1$d</xliff:g> 台以上的设备共享网络。"</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"即将断开与<xliff:g id="DEVICE_NAME">%1$s</xliff:g>的网络共享。"</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"以太网络共享"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"通过 USB 以太网共享手机的互联网连接"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"通过以太网共享手机的互联网连接"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"使用热点和网络共享功能，让其他设备能通过您的移动数据网络连接到互联网。应用还可以通过创建热点，与附近的设备共享内容。"</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"使用热点和网络共享功能，让其他设备能通过您的 WLAN 或移动数据网络连接到互联网。应用还可以通过创建热点，与附近的设备共享内容。"</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"帮助"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"字幕偏好设置"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"放大功能"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"放大区域"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"放大功能启用"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"选择您在放大屏幕时想要使用的放大区域"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"全屏"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"部分屏幕"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"全屏与部分屏幕"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"放大整个屏幕"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"放大部分屏幕"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"要改用“无障碍”按钮吗？"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"如果使用点按三次即可放大屏幕上部分内容的功能，输入和其他操作会出现延迟。\n\n要改用“无障碍”按钮放大画面吗？"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"改用“无障碍”按钮"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"继续使用点按三次即可放大画面功能"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"放大设置"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"点按屏幕三次进行放大"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"使用快捷手势进行放大"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"按电源按钮结束通话"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"大号鼠标指针"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"移除动画"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"单声道音频"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"播放音频时合并声道"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"音频均衡"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"左"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"右"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"单声道音频"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"播放音频时合并声道"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"音频均衡"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"左"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"右"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"默认"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 秒"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 秒"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"通知振动"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"响铃振动"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"按触反馈"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"使用<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"打开<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"使用色彩校正"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"显示字幕"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"仅限支持的应用"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"使用<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"打开 <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"使用色彩校正"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"显示字幕"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"仅限支持的应用"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"字幕文字大小和样式"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"文字大小：<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"更多选项"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"绿色弱视"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"红色弱视"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"蓝色弱视"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"灰度模式"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"红绿不分"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"红绿不分"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"蓝黄不分"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"后台限制"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"允许应用在后台运行"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"不允许应用在后台运行"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"无法限制后台使用"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"无法限制后台使用"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"要限制后台活动吗？"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"如果您限制某个应用的后台活动，可能会导致该应用出现异常"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"由于此应用未设置为优化电池用量，因此您无法对其加以限制。\n\n要限制该应用，请先开启电池优化功能。"</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"设置时间表"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"延长电池续航时间"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"充电时关闭"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"在手机电量达到 <xliff:g id="PERCENT">%1$s</xliff:g> 时关闭省电模式"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"在平板电脑电量为 <xliff:g id="PERCENT">%1$s</xliff:g> 时关闭省电模式"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"在设备电量为 <xliff:g id="PERCENT">%1$s</xliff:g> 时关闭省电模式"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"在手机电量充到 <xliff:g id="PERCENT">%1$s</xliff:g> 以上时关闭省电模式"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"在平板电脑电量充到 <xliff:g id="PERCENT">%1$s</xliff:g> 以上时关闭省电模式"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"在设备电量充到 <xliff:g id="PERCENT">%1$s</xliff:g> 以上时关闭省电模式"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"开启"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"重置"</string>
     <string name="tts_play" msgid="2945513377250757221">"播放"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"自适应网络连接"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"自动管理您的网络连接，从而延长电池续航时间并提升设备性能"</string>
     <string name="credentials_title" msgid="7535942196886123656">"凭据存储"</string>
     <string name="credentials_install" msgid="3933218407598415827">"安装证书"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"从存储设备安装证书"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"用户凭据"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"查看和修改存储的凭据"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"高级"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"存储类型"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"硬件支持"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"仅限软件"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"此用户无法查看或修改凭据"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"已安装（用于 VPN 和应用）"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"已安装（用于 WLAN）"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"通过支付终端付款"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"设置付款应用，然后只需将手机背面靠近任何带有感应式标志的终端即可。"</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"知道了"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"更多…"</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"更多…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"设置默认付款应用"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"更新默认付款应用"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"通过感应式终端进行付款时使用<xliff:g id="APP">%1$s</xliff:g>应用"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"一律使用这张卡进行通话"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"选择用于数据网络的 SIM 卡"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"选择要用于收发短信的 SIM 卡"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"正在切换用于连接数据网络的 SIM 卡，这最多可能需要 1 分钟的时间…"</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"正在切换用于连接数据网络的 SIM 卡，这最多可能需要 1 分钟的时间…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"选择用于通话的 SIM 卡"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"选择 SIM 卡"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM 卡 <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"日常安排, 日程, 省电模式, 节省电量, 电池, 自动, 百分比"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"VoLTE, 高级通话, 4G 通话"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"添加语言, 添加一种语言"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"文字大小"</string>
     <string name="default_sound" msgid="6604374495015245195">"默认铃声"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"铃声和通知音量为 <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"音量、振动、勿扰"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"开机音效"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"实时字幕"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"自动生成媒体字幕"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"无"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other">已设置 <xliff:g id="ON_COUNT">%d</xliff:g> 个时间表</item>
-      <item quantity="one">已设置 1 个时间表</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{无}=1{已设置 1 个时间表}other{已设置 # 个时间表}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"勿扰模式"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"仅接收来自重要联系人和重要应用的通知"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"限制打扰"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"仅限优先事项"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>。<xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"开启 / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"关闭 / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"关闭"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"开启"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"每次都询问"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"直到您将其关闭"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> 小时</item>
-      <item quantity="one">1 小时</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> 分钟"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> 个时间表可以自动开启</item>
-      <item quantity="one">1 个时间表可以自动开启</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 小时}other{# 小时}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 分钟}other{# 分钟}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{关闭}=1{关闭/1 个时间表可以自动开启}other{关闭/# 个时间表可以自动开启}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"不受勿扰模式限制的例外项"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"联系人"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"应用"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"自动将优先级较低的通知设为无声通知"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"自适应通知排序"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"按相关性自动排列通知"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"自适应通知反馈"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"显示对通知所做的调整以及用于向系统提供反馈的选项"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"建议的操作和回复"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"自动显示建议的操作和回复"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"显示近期通知和延后的通知"</string>
@@ -3489,7 +3480,7 @@
     <string name="notifications_bubble_setting_description" msgid="7336770088735025981">"部分对话将以浮动图标形式显示在其他应用上"</string>
     <string name="bubble_app_setting_all" msgid="312524752846978277">"所有对话都能以对话泡形式显示"</string>
     <string name="bubble_app_setting_selected" msgid="4324386074198040675">"所选对话能以对话泡形式显示"</string>
-    <string name="bubble_app_setting_none" msgid="8643594711863996418">"任何内容都不能以气泡形式显示"</string>
+    <string name="bubble_app_setting_none" msgid="8643594711863996418">"任何内容都不能以对话泡形式显示"</string>
     <string name="bubble_app_setting_selected_conversation_title" msgid="3060958976857529933">"对话"</string>
     <string name="bubble_app_setting_excluded_conversation_title" msgid="324818960338773945">"以下对话无法以对话泡形式显示"</string>
     <string name="bubble_app_setting_unbubble_conversation" msgid="1769789500566080427">"为该对话关闭对话泡功能"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"“勿扰”权限"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"允许勿扰模式"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"没有任何已安装应用申请“勿扰”权限"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"正在加载应用…"</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"正在加载应用…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"根据您的要求，Android 会阻止此应用的通知显示在此设备上"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"根据您的要求，Android 会阻止这类通知显示在此设备上"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"根据您的要求，Android 会阻止这组通知显示在此设备上"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"所有对话"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"优先对话"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"无"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> 个对话</item>
-      <item quantity="one">1 个对话</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"无"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{无}=1{1 个对话}other{# 个对话}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"例外的对象"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"通话"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"来电"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"为了让设备在允许的来电呼入时发出提示音，请检查并确保设备已设为响铃"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"系统会在“<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>”启用时屏蔽来电。您可以调整设置，方便亲朋好友或其他联系人与您联系。"</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"已加星标的联系人"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other">另外 <xliff:g id="NUM_PEOPLE">%d</xliff:g> 人</item>
-      <item quantity="one">另外 1 人</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"无"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{无}=1{{contact_1}}=2{{contact_1}和{contact_2}}=3{{contact_1}、{contact_2}和{contact_3}}other{{contact_1}、{contact_2}及另外 # 人}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"消息"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"消息"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"消息"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"系统会在“<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>”排程进行时屏蔽收到的消息。您可以调整相应设置，以便允许您的好友、家人或其他联系人与您联系。"</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"您会收到所有消息的通知"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"您会收到所有来电的通知"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"无"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> 位联系人</item>
-      <item quantity="one">1 位联系人</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{无}=1{1 位联系人}other{# 位联系人}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"任何人"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"联系人"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"已加星标的联系人"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"所有通知"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"部分通知"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"所选人员仍能联系到您，即使您屏蔽了相应的应用也是如此"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other">“<xliff:g id="APP_NAMES">%s</xliff:g>”例外</item>
-      <item quantity="one">“<xliff:g id="APP_NAME_0">%s</xliff:g>”例外</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"另外 <xliff:g id="NUMBER">%d</xliff:g> 个应用"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{任何应用均不能例外}=1{“{app_1}”例外}=2{“{app_1}”和“{app_2}”例外}=3{“{app_1}”“{app_2}”和“{app_3}”例外}other{“{app_1}”“{app_2}”及另外 # 个应用例外}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"应用"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"所有通知"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"部分通知"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"例外的通知"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"允许所有通知"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g>例外</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g>例外</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"任何音效均不能例外"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"另外 <xliff:g id="NUMBER">%d</xliff:g> 个音效"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{任何音效均不能例外}=1{{sound_category_1}例外}=2{{sound_category_1}和{sound_category_2}例外}=3{{sound_category_1}、{sound_category_2}和{sound_category_3}例外}other{{sound_category_1}、{sound_category_2}及另外 # 种音效例外}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"任何音效均不能例外"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"任何人均不能例外"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"某些人例外"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"所有人都例外"</string>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB 受控于："</string>
     <string name="usb_control_host" msgid="7404215921555021871">"连接的设备"</string>
     <string name="usb_control_device" msgid="527916783743021577">"此设备"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"正在切换…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"正在切换…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"无法切换"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"为此设备充电"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"为连接的设备充电"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"查看详情"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"流量节省程序"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"不受流量限制"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"后台数据已关闭"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"后台数据已关闭"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"开启"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"关闭"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"使用流量节省程序"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"设备处于锁定状态时，禁止在通知中输入回复内容或其他文字"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"默认拼写检查工具"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"选择拼写检查工具"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"使用拼写检查工具"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"使用拼写检查工具"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"未选择"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"（无）"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">"： "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"存储空间管理器会从您的设备中移除已备份的照片和视频，从而释放存储空间。"</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"移除照片和视频"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"存储空间管理器"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"使用存储空间管理器"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"使用存储空间管理器"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"自动"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"手动"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"立即释放空间"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"点按两次即显示"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"点按两次即可查看平板电脑"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"点按两次即可查看设备"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"滑动即可查看通知"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"在屏幕的底部边缘向下滑动，即可查看通知"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"单手模式"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"使用单手模式"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"切换应用时退出"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"超时"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 秒"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 秒"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 秒"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"可单手操作"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"点按两次屏幕即可查看时间、通知和其他信息。"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"拿起手机即显示"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"拿起平板电脑即可查看"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"点按即可查看平板电脑相关信息"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"点按即可查看设备相关信息"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"要查看时间、通知和其他信息，请点按您的屏幕。"</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"紧急按钮"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"快速按电源按钮 5 次即可启动紧急 SOS 操作。"</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"警报声"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"在触发操作前发出警报声"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"紧急情况联系人"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"滑动指纹即可查看通知"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"滑动指纹"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"要查看通知，请在手机背面的指纹传感器上向下滑动手指。"</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"针对所有应用启用"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"选择图形驱动程序"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"默认"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"游戏驱动程序"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"游戏驱动程序"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"开发者驱动程序"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"系统图形驱动程序"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"找不到网络，请重试。"</string>
     <string name="forbidden_network" msgid="7404863971282262991">"（禁止）"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"没有 SIM 卡"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM 卡"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"没有 SIM 卡"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"无"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"需要 SIM 卡才能连接"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"需要<xliff:g id="WIRELESS_CARRIER">%s</xliff:g> SIM 卡才能连接"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"首选网络模式：首选 WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"首选网络模式：仅限 GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"首选网络模式：仅限 WCDMA"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"移动数据"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"通过移动网络访问数据"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"手机会在进入有效范围时自动切换到此运营商"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"没有可用的 SIM 卡"</string>
     <string name="calls_preference" msgid="2166481296066890129">"通话偏好设置"</string>
     <string name="sms_preference" msgid="7742964962568219351">"短信偏好设置"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"每次都询问"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"允许在“设置”上重叠显示"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"允许可在其他应用上层显示的应用重叠显示在“设置”屏幕上"</string>
     <string name="media_controls_title" msgid="403271085636252597">"媒体"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"在媒体会话结束后隐藏播放器"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"播放器允许您通过展开的快捷设置面板恢复会话。"</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"快捷设置中的媒体播放器"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"延长媒体播放器在显示在屏幕上的时间，让您轻松继续播放"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"隐藏播放器"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"显示播放器"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"没有可用的播放器"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"允许的应用"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"媒体"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"蓝牙将开启"</string>
 </resources>
diff --git a/res/values-zh-rHK/arrays.xml b/res/values-zh-rHK/arrays.xml
index c4ed3db..f940c41 100644
--- a/res/values-zh-rHK/arrays.xml
+++ b/res/values-zh-rHK/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"中"</item>
     <item msgid="6740026006576843477">"長"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"短"</item>
+    <item msgid="7397961711906421599">"中"</item>
+    <item msgid="4079132024502041928">"長"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"預設"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"全球"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"只限 TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"全球"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 0c5316f..ceb260d 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"在上鎖畫面上顯示個人檔案資料"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"帳戶"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"位置"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"使用位置資訊"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"使用位置"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"關閉"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">開 - <xliff:g id="COUNT_1">%1$d</xliff:g> 個應用程式可存取位置資訊</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"使用臉孔驗證"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"開始"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"如無障礙版「臉孔解鎖」已關閉，部分設定步驟可能無法配合 TalkBack 正常執行。"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"返回"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"繼續設定"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"使用無障礙功能設定"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="one">必須少於 <xliff:g id="NUMBER_0">%d</xliff:g> 個數字</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"裝置管理員不允許使用最近用過的 PIN 碼"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"您的 IT 管理員已禁止使用常用的 PIN 碼，請嘗試輸入另一個 PIN 碼。"</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"您不可使用無效字元"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"必須包含最少 1 個字母"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"必須包含最少 1 個數字"</string>
@@ -653,7 +655,6 @@
       <item quantity="one">必須包含至少 1 個非數字字元</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"裝置管理員不允許使用最近用過的密碼"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"您的 IT 管理員已禁止使用常用的密碼，請嘗試輸入另一個密碼。"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"不可使用依遞增或遞減順序排列或重複的連續數字"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"確認"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"取消"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"開啟 Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"使用 Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"使用 Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wi-Fi 設定"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"設定和管理無線網絡接入點"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"將二維條碼置於下方中間，即可連接至「<xliff:g id="SSID">%1$s</xliff:g>」"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"掃瞄二維條碼以加入 Wi-Fi"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"分享 Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"掃瞄此二維條碼即可連線至「<xliff:g id="SSID">%1$s</xliff:g>」並分享密碼"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"使用其他裝置掃瞄此二維條碼以加入「<xliff:g id="SSID">%1$s</xliff:g>」"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"掃描此二維條碼，即可連接「<xliff:g id="SSID">%1$s</xliff:g>」"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"請再試一次。如果仍有問題，請聯絡裝置製造商"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"發生問題"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi-Fi 密碼：<xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"熱點密碼：<xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"自動連線"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"允許手機在此網絡附近時自動連線"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"允許平板電腦在此網絡附近時自動連線"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"當進入覆蓋範圍內時，允許連接此網絡"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"新增裝置"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"使用二維條碼，在此網絡中加入裝置"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"二維條碼格式無效"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"使用系統憑證"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"不提供"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"不驗證"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"您未指定任何憑證，因此將無法設定私人連線。"</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"網絡名稱太長。"</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"必須指定網域。"</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"需要認證。"</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"連線"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"已開啟 Wi-Fi"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"已連線至「<xliff:g id="NETWORK_NAME">%1$s</xliff:g>」"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"正在連接至「<xliff:g id="NETWORK_NAME">%1$s</xliff:g>」"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"連接中…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"無法連接網絡"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"網絡不在覆蓋範圍內"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"應用程式正在分享內容。如要分享互聯網連線，請關閉熱點並重新開啟"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"未設定密碼"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"熱點名稱"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"正在開啟 <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"正在開啟「<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>」…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"其他裝置可以連線至 <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"熱點密碼"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"存取點頻段"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"流暢顯示"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"自動將部分內容的重新整理頻率，從 60 Hz 提升到 90 Hz。此功能會增加耗電量。"</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"流暢畫面"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"提升重新整理頻率至 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"最高的重新整理頻率，帶來更靈敏的觸控反應和更高畫質的動畫。這會增加電池用量。"</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"螢幕感知"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"啟用 / 假如正您望向螢幕，螢幕將不會關閉"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android 版本"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android 安全性更新"</string>
     <string name="model_info" msgid="8997566254717810904">"型號"</string>
-    <string name="model_summary" msgid="2246651782442466213">"型號：%1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"型號和硬件"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"硬件版本"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"設備編號"</string>
@@ -1605,31 +1604,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"網絡設定已重設"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"無法清除 SIM 卡"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"由於發生錯誤，因此無法清除已下載的 SIM 卡。\n\n請重新開機，然後再試一次。"</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"清除所有資料 (回復原廠設定)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"清除所有資料 (回復原廠設定)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"此操作會清除平板電腦"<b>"內部儲存空間"</b>"中的所有資料，包括：\n\n"<li>"您的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"此操作會清除手機"<b>"內部儲存空間"</b>"的所有資料，包括：\n\n"<li>"您的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"您目前已登入下列帳戶：\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"這部裝置上還有其他使用者。\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"音樂"</li>\n<li>"相片"</li>\n<li>"其他使用者資料"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM 卡"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"此操作不會取消您的流動服務計劃。"</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"如要一併清除音樂、圖片及其他使用者資料，則需清除 "<b>"USB 儲存裝置"</b>"資料。"</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"如要一併清除音樂、圖片及其他使用者資料，則需清除 "<b>"SD 記憶卡"</b>"資料。"</string>
+    <string name="main_clear_title" msgid="277664302144837723">"清除所有資料 (回復原廠設定)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"清除所有資料 (回復原廠設定)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"此操作將會清除您平板電腦"<b>"內部儲存空間"</b>"中的所有資料，包括：\n\n"<li>"您的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"此操作將會清除您手機"<b>"內部儲存空間"</b>"的所有資料，包括：\n\n"<li>"您的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"您目前已登入以下帳戶：\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"這部裝置上還有其他使用者。\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"音樂"</li>\n<li>"相片"</li>\n<li>"其他使用者資料"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM 卡"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"此操作不會取消您的流動服務計劃。"</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"如要一併清除音樂、圖片及其他使用者資料，則需清除 "<b>"USB 儲存裝置"</b>"資料。"</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"如要一併清除音樂、圖片及其他使用者資料，則需清除 "<b>"SD 記憶卡"</b>"資料。"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"清除 USB 儲存裝置資料"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"清除 SD 記憶卡資料"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"清除內部 USB 儲存裝置中的所有資料，例如音樂或相片"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"清除 SD 記憶卡中的所有資料，例如音樂或相片"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"清除所有資料"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"清除所有資料"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"系統會刪除您所有的個人資料和已下載的應用程式。您無法復原這個動作。"</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"系統會刪除您所有的個人資料，包括已下載的應用程式和 SIM 卡。您無法復原這個動作。"</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"全部清除"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"System Clear 服務暫停，因此無法重設。"</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"要清除所有資料嗎？"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"這位使用者無法將裝置恢復原廠設定"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"正在清除"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"請稍候…"</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"清除所有資料"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"清除所有資料"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"系統會刪除您所有的個人資料和已下載的應用程式。您無法復原這個動作。"</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"系統會刪除您所有的個人資料，包括已下載的應用程式和 SIM 卡。您無法復原這個動作。"</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"要清除所有資料嗎？"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"這位使用者無法將裝置恢復原廠設定"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"正在清除"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"請稍候…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"通話設定"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"設定留言信箱、來電轉駁、來電等候和來電顯示"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB 網絡共享"</string>
@@ -1677,7 +1674,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"不可與超過 <xliff:g id="MAXCONNECTION">%1$d</xliff:g> 部裝置分享網絡。"</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> 的網絡共享即將中斷。"</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"以太網網絡共享"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"透過 USB 以太網分享手機的互聯網連線"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"透過以太網分享手機的互聯網連線"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"使用熱點和網絡共享功能，透過您的流動數據連線提供互聯網服務給其他裝置。應用程式可以建立熱點，與附近的裝置分享內容。"</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"使用熱點和網絡共享功能，讓其他裝置透過 Wi‑Fi 或流動數據連接到互聯網。應用程式亦可以建立熱點，與附近的裝置分享內容。"</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"說明"</string>
@@ -2118,13 +2115,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"字幕偏好設定"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"放大"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"放大範圍"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"放大啟用"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"選擇在放大螢幕時要使用的放大範圍"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"全螢幕"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"部分螢幕畫面"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"全螢幕及部分螢幕"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"放大整個螢幕畫面"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"放大部分螢幕畫面"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"要改用無障礙功能按鈕嗎？"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"使用「輕按三下放大」功能放大部分畫面，輸入內容及執行其他操作時會出現延遲。\n\n要改用無障礙功能按鈕放大畫面嗎？"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"改用無障礙功能按鈕"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"繼續使用「輕按三下放大」功能"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"放大設定"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"輕按三下來放大"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"使用快速鍵來放大"</string>
@@ -2178,11 +2178,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"按開關按鈕結束通話"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"大型滑鼠游標"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"移除動畫"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"單聲道音訊"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"播放音訊時合併聲道"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"音效平衡"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"左"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"右"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"單聲道音訊"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"播放音訊時合併聲道"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"音訊平衡"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"左"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"右"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"預設"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 秒"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 秒"</string>
@@ -2212,11 +2212,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"通知震動"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"鈴聲震動"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"輕觸反應"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"使用「<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>」"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"開啟「<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>」"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"使用色彩校正"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"顯示字幕"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"僅限支援的應用程式"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"使用「<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>」"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"開 <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"使用色彩校正"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"顯示字幕"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"僅限支援的應用程式"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"字幕大小和樣式"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>文字尺寸"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"更多選項"</string>
@@ -2246,6 +2246,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"綠色弱視"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"紅色弱視"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"藍色弱視"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"灰階螢幕"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"紅綠不分"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"紅綠不分"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"藍黃不分"</string>
@@ -2375,7 +2376,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"背景限制"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"允許應用程式在背景中執行"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"不允許應用程式在背景中執行"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"無法限制背景使用方式"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"無法限制背景使用方式"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"要限制背景活動嗎？"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"如果您限制應用程式的背景活動，應用程式可能無法正常運作"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"由於此應用程式並未設定為優化電池，您無法限制其使用。\n\n如要限制應用程式，請先開啟電池優化功能。"</string>
@@ -2592,9 +2593,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"設定時間表"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"延長電池壽命"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"充電時關閉"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"當您的手機電量達到 <xliff:g id="PERCENT">%1$s</xliff:g> 時，省電模式會關閉"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"當您的平板電腦電量達到 <xliff:g id="PERCENT">%1$s</xliff:g> 時，省電模式會關閉"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"當您的裝置電量達到 <xliff:g id="PERCENT">%1$s</xliff:g> 時，省電模式會關閉"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"當裝置電量達 <xliff:g id="PERCENT">%1$s</xliff:g> 時關閉「省電模式」"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"當平板電腦電量達 <xliff:g id="PERCENT">%1$s</xliff:g> 時關閉「省電模式」"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"當裝置電量達 <xliff:g id="PERCENT">%1$s</xliff:g> 時關閉「省電模式」"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"開啟"</string>
@@ -2659,6 +2660,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"重設"</string>
     <string name="tts_play" msgid="2945513377250757221">"播放"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"自動調節連線"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"自動管理網路連線，藉此延長電池壽命並提升裝置效能"</string>
     <string name="credentials_title" msgid="7535942196886123656">"憑證儲存空間"</string>
     <string name="credentials_install" msgid="3933218407598415827">"安裝憑證"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"從儲存裝置安裝憑證"</string>
@@ -2670,9 +2673,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"使用者憑證"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"查看和修改已儲存的憑證"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"進階"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"儲存空間類型"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"硬件支援"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"只限軟件"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"這位使用者無法存取憑證"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"已針對 VPN 和應用程式安裝憑證"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"已針對 Wi-Fi 安裝憑證"</string>
@@ -3061,7 +3061,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"在收款機付款"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"設定付款應用程式，然後將機背對準任何終端機的非接觸式符號。"</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"知道了"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"更多…"</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"更多…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"設定預設付款應用程式"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"更新預設付款應用程式"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"於感應式終端機使用「<xliff:g id="APP">%1$s</xliff:g>」付款"</string>
@@ -3145,7 +3145,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"永遠使用這張 SIM 卡通話"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"選取用於流動數據的 SIM 卡"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"選取用於短訊的 SIM 卡"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"正在切換數據 SIM，過程最多可能需要 1 分鐘…"</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"正在切換數據 SIM，這可能需時一分鐘…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"選取用於撥號的 SIM 卡："</string>
     <string name="sim_select_card" msgid="1226182454109919045">"選取 SIM 卡"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3288,6 +3288,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"日常用電情況, 用電安排, 省電模式, 節能模式, 電池, 自動, 百分比"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"VoLTE、進階通話、4G 通話"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"新增語言、加入語言"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"文字大小"</string>
     <string name="default_sound" msgid="6604374495015245195">"預設音效"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"鈴聲和通知音量已設為 <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"音量、震動、請勿騷擾"</string>
@@ -3327,11 +3328,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"開機聲音"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"即時字幕"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"自動為媒體加入字幕"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"無"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other">已設定 <xliff:g id="ON_COUNT">%d</xliff:g> 個時間表</item>
-      <item quantity="one">已設定 1 個時間表</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{無}=1{已設定 1 個時間表}other{已設定 # 個時間表}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"請勿騷擾"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"只接收重要聯絡人和應用程式的通知"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"減少干擾"</string>
@@ -3399,20 +3396,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"只限優先"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>。<xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"開啟/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"關閉/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"關閉"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"開啟"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"每次都詢問"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"直至您關閉為止"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> 小時</item>
-      <item quantity="one">1 小時</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> 分鐘"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other">系統已自動啟用 <xliff:g id="ON_COUNT">%d</xliff:g> 個日程表</item>
-      <item quantity="one">系統已自動啟用 1 個日程表</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 小時}other{# 小時}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 分鐘}other{# 分鐘}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{關閉}=1{關閉/系統可自動啟用 1 個時間表}other{關閉/系統可自動開啟 # 個時間表}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"可中斷「請勿騷擾」的項目類別"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"人物"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"應用程式"</string>
@@ -3458,6 +3447,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"自動將優先度較低的通知設為低重要性"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"自動調整通知排序"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"自動按相關性為通知排序"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"對自動調整通知的意見"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"顯示系統對通知作出的調整和提供意見的選項"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"建議操作和回覆"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"自動顯示建議操作和回覆"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"顯示近期和已延後的通知"</string>
@@ -3654,7 +3645,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"「請勿騷擾」權限"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"允許請勿騷擾權限"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"沒有已安裝的應用程式要求存取「請勿騷擾」。"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"正在載入應用程式…"</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"正在載入應用程式…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Android 目前按您的要求防止這個應用程式的通知在此裝置上顯示"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Android 目前按您的要求防止這類通知在此裝置上顯示"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Android 目前按您的要求防止這類通知在此裝置上顯示"</string>
@@ -3746,11 +3737,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"所有對話"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"優先對話"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"無"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> 個對話</item>
-      <item quantity="one">1 個對話</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"無"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{無}=1{1 個對話}other{# 個對話}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"誰可以中斷"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"通話"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"通話"</string>
@@ -3759,11 +3746,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"如要讓允許的通話發出音效，請確保裝置已設定為發出鈴聲。"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"系統會封鎖「<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>」時段接收的來電。您可以調整設定，讓好友、家人或其他聯絡人聯絡您。"</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"已加星號的聯絡人"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other">另外 <xliff:g id="NUM_PEOPLE">%d</xliff:g> 人</item>
-      <item quantity="one">另外 1 人</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"無"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{無}=1{{contact_1}}=2{{contact_1}和{contact_2}}=3{{contact_1}、{contact_2}和{contact_3}}other{{contact_1}、{contact_2}和另外 # 個}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"訊息"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"訊息"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"訊息"</string>
@@ -3772,11 +3755,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"在「<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>」中，收到的訊息會被封鎖。您可以調整設定，讓好友、家人或其他聯絡人聯絡您。"</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"接收所有訊息"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"接收所有來電"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"無"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> 位聯絡人</item>
-      <item quantity="one">1 位聯絡人</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{無}=1{1 位聯絡人}other{# 位聯絡人}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"所有人"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"聯絡人"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"已加星號的聯絡人"</string>
@@ -3814,22 +3793,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"所有通知"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"部分通知"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"即使您不允許應用程式打擾，所選使用者仍可聯絡您"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other">「<xliff:g id="APP_NAMES">%s</xliff:g>」可中斷</item>
-      <item quantity="one">「<xliff:g id="APP_NAME_0">%s</xliff:g>」可中斷</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"還有 <xliff:g id="NUMBER">%d</xliff:g> 個"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{沒有應用程式可中斷}=1{「{app_1}」可中斷}=2{「{app_1}」和「{app_2}」可中斷}=3{「{app_1}」、「{app_2}」和「{app_3}」可中斷}other{「{app_1}」、「{app_2}」和另外 # 個應用程式可中斷}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"應用程式"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"所有通知"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"部分通知"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"可中斷的通知"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"允許所有通知"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other">「<xliff:g id="SOUND_CATEGORIES">%s</xliff:g>」可中斷</item>
-      <item quantity="one">「<xliff:g id="SOUND_CATEGORY">%s</xliff:g>」可中斷</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"全部均不可中斷"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"還有 <xliff:g id="NUMBER">%d</xliff:g> 個"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{全部均不可中斷}=1{「{sound_category_1}」可中斷}=2{「{sound_category_1}」和「{sound_category_2}」可中斷}=3{「{sound_category_1}」、「{sound_category_2}」和「{sound_category_3}」可中斷}other{「{sound_category_1}」、「{sound_category_2}」和另外 # 個音效可中斷}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"全部均不可中斷"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"沒有使用者可中斷"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"部分使用者可中斷"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"所有使用者均可中斷"</string>
@@ -4073,7 +4044,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB 由以下裝置控制"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"已連接的裝置"</string>
     <string name="usb_control_device" msgid="527916783743021577">"此裝置"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"正在切換…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"正在切換…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"無法切換"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"為此裝置充電"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"正在為連接的裝置充電"</string>
@@ -4320,7 +4291,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"查看詳情"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"數據節省模式"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"不限制數據用量"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"背景數據已關閉"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"背景數據已關閉"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"開啟"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"關閉"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"使用數據節省模式"</string>
@@ -4343,7 +4314,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"裝置處於上鎖狀態時，禁止在通知中輸入回覆內容或其他文字"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"預設拼字檢查工具"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"選擇「拼字檢查工具」"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"使用拼字檢查工具"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"使用拼字檢查工具"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"未選取"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(無)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">"： "</string>
@@ -4433,7 +4404,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"儲存空間管理員會從您的裝置移除備份相片和影片，以釋放儲存空間。"</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"移除相片和影片"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"存儲空間管理員"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"使用儲存空間管理員"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"使用儲存空間管理工具"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"自動"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"手動"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"立即釋放空間"</string>
@@ -4471,6 +4442,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"輕按兩下顯示畫面"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"輕按兩下即可查看平板電腦"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"輕按兩下即可查看裝置"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"滑動即可查看通知"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"在畫面底部向下滑動即可顯示通知"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"單手模式"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"使用單手模式"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"切換應用程式時退出"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"逾時"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 秒"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 秒"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 秒"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"單手操控"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"輕按螢幕兩下即可查看時間、通知和其他資訊。"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"拿起手機顯示畫面"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"拿起即可查看平板電腦"</string>
@@ -4483,6 +4464,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"輕按即可查看平板電腦"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"輕按即可查看裝置"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"輕按螢幕即可查看時間、通知和其他資訊。"</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"緊急按鈕"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"快速按下電源按鈕 5 次即可觸發緊急求救動作。"</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"警示音效"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"開始操作前響起警示"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"緊急聯絡人"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"在指紋感應器上滑動以查看通知"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"滑動指紋"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"如要查看通知，請在手機背面的指紋感應器上向下滑動。"</string>
@@ -4637,7 +4623,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"為所有應用程式啟用此設定"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"選取顯示卡驅動程式"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"預設"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"遊戲驅動程式"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"遊戲驅動程式"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"開發人員驅動程式"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"系統顯示卡驅動程式"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4706,6 +4692,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"找不到網絡，請再試一次。"</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(禁止)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"沒有 SIM 卡"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM 卡"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"沒有 SIM 卡"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"無"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"需要 SIM 卡才能連接網絡"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"需要 <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> 的 SIM 卡才能連接網絡"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"首選網絡模式：首選 WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"首選網絡模式：僅限 GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"首選網絡模式：僅限 WCDMA"</string>
@@ -4759,6 +4750,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"流動數據"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"使用流動網絡存取數據"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"當進入覆蓋範圍內時，手機便會自動切換至此流動網絡供應商"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"沒有可用的 SIM 卡"</string>
     <string name="calls_preference" msgid="2166481296066890129">"通話偏好設定"</string>
     <string name="sms_preference" msgid="7742964962568219351">"短訊偏好設定"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"每次都詢問"</string>
@@ -4941,10 +4933,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"允許在「設定」上顯示重疊式畫面"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"允許可以在其他應用程式上顯示内容的應用程式重疊「設定」畫面"</string>
     <string name="media_controls_title" msgid="403271085636252597">"媒體"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"媒體工作階段結束後隱藏播放器"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"播放器讓您在展開的「快速設定」面板中恢復工作階段。"</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"「快速設定」中的媒體播放器"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"延長媒體播放器的顯示時間，讓您輕鬆繼續播放"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"隱藏播放器"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"顯示播放器"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"沒有可用的播放器"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"允許的應用程式"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"媒體"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"系統將開啟藍牙"</string>
 </resources>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index eac14e3..e7f8f98 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"中"</item>
     <item msgid="6740026006576843477">"長"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"短"</item>
+    <item msgid="7397961711906421599">"中"</item>
+    <item msgid="4079132024502041928">"長"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"預設"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"通用"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"僅限 TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"全域"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index bb4e18e..fc821bb 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"在鎖定畫面上顯示個人資料資訊"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"帳戶"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"定位"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"使用位置資訊"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"使用位置資訊"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"關閉"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">已開啟 - <xliff:g id="COUNT_1">%1$d</xliff:g> 個應用程式已取得位置資訊存取權</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"使用你的臉孔進行驗證"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"開始"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"如果關閉人臉解鎖無障礙功能，某些設定步驟可能無法與 TalkBack 搭配運作。"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"返回"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"繼續設定"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"使用無障礙設定"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="one">長度必須少於 <xliff:g id="NUMBER_0">%d</xliff:g> 個數字</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"裝置管理員不允許使用最近用過的 PIN"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"你的 IT 管理員已封鎖常見 PIN 碼，請改用其他 PIN 碼。"</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"密碼不得包含無效字元"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"必須包含至少 1 個字母"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"必須包含至少 1 個數字"</string>
@@ -653,7 +655,6 @@
       <item quantity="one">至少必須包含 1 個非數值字元</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"裝置管理員不允許使用最近用過的密碼"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"你的 IT 管理員已封鎖常見密碼，請改用其他密碼。"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"不允許使用依遞增或遞減順序排列或是重複的一串數字"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"確認"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"取消"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"開啟 Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"使用 Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"使用 Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wi-Fi 設定"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"設定、管理無線網路存取點"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"將 QR 圖碼置於相機正下方即可連線到「<xliff:g id="SSID">%1$s</xliff:g>」"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"掃描 QR 圖碼即可加入 Wi‑Fi"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"分享 Wi-Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"掃描這個 QR 圖碼即可連線至「<xliff:g id="SSID">%1$s</xliff:g>」並分享密碼"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"使用其他裝置掃描這個 QR 圖碼即可加入「<xliff:g id="SSID">%1$s</xliff:g>」"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"掃描這個 QR 圖碼即可連線至「<xliff:g id="SSID">%1$s</xliff:g>」"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"請再試一次，如果問題持續發生，請與裝置製造商聯絡"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"發生錯誤"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi-Fi 密碼：<xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"無線基地台密碼：<xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"自動連線"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"允許手機在進入連線範圍內時自動連上這個網路"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"允許平板電腦在進入連線範圍內時自動連上這個網路"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"允許裝置在進入有效範圍時連線至這個網路"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"新增裝置"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"使用 QR 圖碼將裝置新增至這個網路"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR 圖碼格式無效"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"使用系統憑證"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"不提供"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"不進行驗證"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"你未指定任何憑證，因此無法為你設定私人連線。"</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"網路名稱太長。"</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"必須指定網域。"</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"需要憑證。"</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"連線"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi‑Fi 已開啟"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"已連線到「<xliff:g id="NETWORK_NAME">%1$s</xliff:g>」"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"正在連線到「<xliff:g id="NETWORK_NAME">%1$s</xliff:g>」"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"連線中…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"無法連線至網路"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"不在網路有效範圍內"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"應用程式正在分享內容。如要分享網際網路連線，請關閉無線基地台並重新開啟"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"未設定密碼"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"無線基地台名稱"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"正在開啟 <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"正在開啟「<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>」…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"其他裝置可連線至 <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"無線基地台密碼"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP 頻帶"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"流暢顯示"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"自動將某些內容的重新整理頻率從 60 調高到 90 赫茲 (Hz)。請注意，開啟這項設定會增加電池用量。"</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"流暢顯示"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"強制使用 90 Hz 重新整理頻率"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"強制使用最高重新整理頻率可提升觸控回應和動畫品質。請注意，開啟這項設定會增加電池用量。"</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"螢幕感知"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"啟用/螢幕不會在你注視時關閉"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android 版本"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android 安全性更新"</string>
     <string name="model_info" msgid="8997566254717810904">"型號"</string>
-    <string name="model_summary" msgid="2246651782442466213">"型號：%1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"型號與硬體"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"硬體版本"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"設備 ID"</string>
@@ -1604,31 +1603,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"已重設網路設定"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"無法清除 SIM 卡"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"發生錯誤，因此無法清除已下載的 SIM 卡。\n\n請重新啟動你的裝置，然後再試一次。"</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"清除所有資料 (恢復原廠設定)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"清除所有資料 (恢復原廠設定)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"這會清除你平板電腦"<b>"內部儲存裝置"</b>"中的所有資料，包括：\n\n"<li>"你的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"這會清除你手機"<b>"內部儲存裝置"</b>"中的所有資料，包括：\n\n"<li>"你的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"你目前已登入下列帳戶：\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"這個裝置上還有其他使用者。\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"音樂"</li>\n<li>"相片"</li>\n<li>"其他使用者資料"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM 卡"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"你目前的電信資費方案並不會因此受到任何影響。"</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"如要一併清除音樂、圖片及其他用戶資料，則需清除 "<b>"USB 儲存裝置"</b>"資料。"</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"如要清除音樂、圖片及其他使用者資料，必須先清除 "<b>"SD 卡"</b>"。"</string>
+    <string name="main_clear_title" msgid="277664302144837723">"清除所有資料 (恢復原廠設定)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"清除所有資料 (恢復原廠設定)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"這會清除平板電腦"<b>"內部儲存空間"</b>"中的所有資料，包括：\n\n"<li>"你的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"這會清除手機"<b>"內部儲存空間"</b>"中的所有資料，包括：\n\n"<li>"你的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"你目前已登入以下帳戶：\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"這部裝置上還有其他使用者。\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"音樂"</li>\n<li>"相片"</li>\n<li>"其他使用者資料"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM 卡"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"你目前的電信資費方案並不會因此受到任何影響。"</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"如要清除音樂、圖片及其他使用者資料，就必須清除 "<b>"USB 儲存空間"</b>"的資料。"</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"如要清除音樂、圖片和其他使用者資料，就必須清除 "<b>"SD 卡"</b>"的資料。"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"清除 USB 儲存裝置"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"清除 SD 卡"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"清除內部 USB 儲存裝置中的所有資料，例如音樂或相片"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"清除 SD 卡中的所有資料，例如音樂或相片。"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"清除所有資料"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"清除所有資料"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"系統將刪除你的所有個人資訊和已下載的應用程式。請注意，這個動作無法復原。"</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"系統將刪除你所有的個人資訊 (包括已下載的應用程式和 SIM 卡)。請注意，這個動作無法復原。"</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"全部清除"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"無法使用 System Clear 服務，因此未執行任何重設。"</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"要清除所有資料嗎？"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"這位使用者無法將裝置恢復原廠設定"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"清除中"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"請稍候…"</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"清除所有資料"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"清除所有資料"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"系統將刪除你的所有個人資訊和已下載的應用程式。請注意，這項操作無法復原。"</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"系統將刪除你所有的個人資訊，包括已下載的應用程式和 SIM 卡。請注意，這項操作無法復原。"</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"要清除所有資料嗎？"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"這位使用者無法將裝置恢復原廠設定"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"清除中"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"請稍候…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"通話設定"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"設定語音信箱、來電轉接、來電待接及來電顯示"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB 網路共用"</string>
@@ -1676,7 +1673,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"最多只能有 <xliff:g id="MAXCONNECTION">%1$d</xliff:g> 個裝置共用網路。"</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"將中斷 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 的網路共用。"</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"乙太網路網路共用"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"透過 USB 乙太網路分享手機的網際網路連線"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"透過乙太網路分享手機的網際網路連線"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"使用無線基地台和網路共用功能，透過你的行動數據連線提供網際網路給其他裝置。應用程式也可以建立無線基地台來和鄰近的裝置分享內容。"</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"使用無線基地台和網路共用功能，讓其他裝置能夠透過你的 Wi-Fi 或行動數據連線連上網際網路。應用程式也可以建立無線基地台，以便與鄰近的裝置分享內容。"</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"說明"</string>
@@ -2117,13 +2114,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"字幕偏好設定"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"放大"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"放大區域"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"啟用放大功能"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"選擇你要放大的螢幕區域"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"整個螢幕"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"部分螢幕區域"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"整個螢幕和部分螢幕區域"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"放大整個螢幕"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"放大部分螢幕區域"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"要改用無障礙工具按鈕嗎？"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"如果使用「輕觸三下放大」功能放大部分畫面，輸入內容及執行其他操作時會出現延遲。\n\n要改用無障礙工具按鈕放大畫面嗎？"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"改用無障礙工具按鈕"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"繼續使用「輕觸三下放大」功能"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"放大功能設定"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"輕觸螢幕三下進行放大"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"使用快速手勢放大畫面"</string>
@@ -2177,11 +2177,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"按電源鍵結束通話"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"大型滑鼠游標"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"移除動畫"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"單聲道音訊"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"播放音訊時合併聲道"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"音訊平衡"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"左"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"右"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"單聲道音訊"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"播放音訊時合併聲道"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"音訊平衡"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"左"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"右"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"預設"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 秒"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 秒"</string>
@@ -2211,11 +2211,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"通知震動"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"響鈴震動"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"觸覺回饋"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"使用「<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>」"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"開啟「<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>」"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"使用色彩校正"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"顯示字幕"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"僅限支援的應用程式"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"使用「<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>」"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"開啟「<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>」"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"使用色彩校正"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"顯示字幕"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"僅限支援的應用程式"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"字幕大小和樣式"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"文字大小：<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"更多選項"</string>
@@ -2245,6 +2245,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"綠色弱視"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"紅色弱視"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"藍色弱視"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"灰階"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"紅 - 綠"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"紅 - 綠"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"藍 - 黃"</string>
@@ -2374,7 +2375,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"背景活動限制"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"允許應用程式在背景執行"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"應用程式無法在背景執行"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"無法限制背景活動"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"無法限制背景活動"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"要限制背景活動嗎？"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"如果你限制應用程式的背景活動，應用程式可能無法正常運作"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"由於這個應用程式並未設為最佳化電池用量，因此你無法加以限制。\n\n如要限制應用程式，請先開啟電池效能最佳化功能。"</string>
@@ -2591,9 +2592,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"設定時間表"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"延長電池續航力"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"充電時關閉"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"在你手機的電池電量達 <xliff:g id="PERCENT">%1$s</xliff:g> 時關閉省電模式"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"在你平板電腦的電池電量達 <xliff:g id="PERCENT">%1$s</xliff:g> 時關閉省電模式"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"在你裝置的電池電量達 <xliff:g id="PERCENT">%1$s</xliff:g> 時關閉省電模式"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"在手機電量達 <xliff:g id="PERCENT">%1$s</xliff:g> 時關閉節約耗電量模式"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"在平板電腦電量達 <xliff:g id="PERCENT">%1$s</xliff:g> 時關閉節約耗電量模式"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"在裝置電量達 <xliff:g id="PERCENT">%1$s</xliff:g> 時關閉節約耗電量模式"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"開啟"</string>
@@ -2658,6 +2659,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"重設"</string>
     <string name="tts_play" msgid="2945513377250757221">"播放"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"自動調整連線"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"自動管理網路連線，藉此延長電池續航力並提升裝置效能"</string>
     <string name="credentials_title" msgid="7535942196886123656">"憑證儲存空間"</string>
     <string name="credentials_install" msgid="3933218407598415827">"安裝憑證"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"從裝置的儲存空間安裝憑證"</string>
@@ -2669,9 +2672,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"使用者憑證"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"查看及修改已儲存的憑證"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"進階"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"儲存空間類型"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"硬體備份"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"僅限軟體"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"這位使用者無法存取憑證"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"已為 VPN 和應用程式安裝"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"已為 Wi-Fi 安裝"</string>
@@ -3060,7 +3060,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"用感應式刷卡機付款"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"設定付款應用程式，然後將手機背面靠近標有免碰觸符號的感應式刷卡機即可。"</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"知道了"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"更多…"</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"更多…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"設定預設的付款應用程式"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"更新預設的付款應用程式"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"透過感應式刷卡機付款時使用「<xliff:g id="APP">%1$s</xliff:g>」應用程式"</string>
@@ -3144,7 +3144,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"一律使用這張 SIM 卡通話"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"選擇數據連線 SIM 卡"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"選取要用於收發簡訊的 SIM 卡"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"正在切換行動數據連線 SIM 卡，這可能需要一點時間..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"正在切換行動數據連線 SIM 卡，這項作業最多可能需要一分鐘才能完成…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"選擇通話 SIM 卡"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"選取 SIM 卡"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3287,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"日常安排, 時間表, 省電, 節約電量, 電池, 自動, 百分比"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"VoLTE, 進階通話功能, 4G 通話功能"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"新增語言, 新增一種語言"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"文字大小"</string>
     <string name="default_sound" msgid="6604374495015245195">"預設音效"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"鈴聲和通知音量為 <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"音量、震動、零打擾"</string>
@@ -3326,11 +3327,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"啟動音效"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"即時字幕"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"自動產生媒體字幕"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"無"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other">已設定 <xliff:g id="ON_COUNT">%d</xliff:g> 個排程</item>
-      <item quantity="one">已設定 1 個排程</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{無}=1{已設定 1 個時間表}other{已設定 # 個時間表}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"零打擾"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"僅接收重要聯絡人和應用程式的通知"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"降低干擾"</string>
@@ -3398,20 +3395,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"僅限優先通知"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>。<xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"開啟 / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"關閉 / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"關閉"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"開啟"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"每次都詢問"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"直到你關閉為止"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> 小時</item>
-      <item quantity="one">1 小時</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> 分"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other">系統可以自動啟用 <xliff:g id="ON_COUNT">%d</xliff:g> 項排程</item>
-      <item quantity="one">系統可以自動啟用 1 項排程</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 小時}other{# 小時}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 分鐘}other{# 分鐘}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{關閉}=1{關閉/系統可以自動啟用 1 個時間表}other{關閉/系統可以自動啟用 # 個時間表}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"「零打擾」模式的例外項目"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"聯絡人"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"應用程式"</string>
@@ -3457,6 +3446,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"自動將優先順序較低的通知設為無聲通知"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"自動調整通知排序"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"依關聯性自動將通知排序"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"提供對自動調整通知優先順序功能的意見"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"顯示對通知設定所做的調整和提供意見回饋的選項"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"建議採取的動作和回覆"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"自動顯示建議採取的動作和回覆"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"顯示近期通知和已延後的通知"</string>
@@ -3476,8 +3467,8 @@
     <string name="notification_bubbles_title" msgid="5681506665322329301">"對話框"</string>
     <string name="bubbles_feature_education" msgid="4088275802688887634">"部分通知和其他內容可能會以對話框形式顯示在畫面上。輕觸對話框即可將其開啟，將對話框向畫面下方拖曳則可將其關閉。"</string>
     <string name="bubbles_app_toggle_title" msgid="5319021259954576150">"對話框"</string>
-    <string name="bubbles_conversation_app_link" msgid="5468779786387915337">"所有泡泡設定"</string>
-    <string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"以泡泡形式顯示這個對話"</string>
+    <string name="bubbles_conversation_app_link" msgid="5468779786387915337">"所有對話框設定"</string>
+    <string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"以對話框形式顯示這個對話"</string>
     <string name="bubbles_conversation_toggle_summary" msgid="720229032254323578">"在應用程式最上層顯示浮動圖示"</string>
     <string name="bubbles_app_toggle_summary" msgid="1574515698567947948">"允許「<xliff:g id="APP_NAME">%1$s</xliff:g>」以對話框形式顯示部分通知"</string>
     <string name="bubbles_feature_disabled_dialog_title" msgid="1794193899792284007">"要為裝置啟用對話框功能嗎？"</string>
@@ -3653,7 +3644,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"零打擾存取權"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"允許「零打擾」模式"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"最近沒有已安裝的應用程式要求「零打擾」存取權"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"正在載入應用程式..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"正在載入應用程式…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Android 已根據你的要求啟用封鎖設定，不讓這個應用程式的通知顯示在這個裝置上"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Android 已根據你的要求啟用封鎖設定，不讓這個類別的通知顯示在這個裝置上"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Android 已根據你的要求啟用封鎖設定，不讓這個群組的通知顯示在這個裝置上"</string>
@@ -3745,11 +3736,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"所有對話"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"優先對話"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"無"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> 個對話</item>
-      <item quantity="one">1 個對話</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"無"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{無}=1{1 個對話}other{# 個對話}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"例外的對象"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"通話"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"來電"</string>
@@ -3758,11 +3745,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"如要確認允許的通話是否會發出音效，請檢查裝置目前是否已設為響鈴"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"系統會在「<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>」啟用時封鎖來電。你可以調整設定，讓好友、家人或其他聯絡人能聯絡你。"</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"已加星號的聯絡人"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other">另外 <xliff:g id="NUM_PEOPLE">%d</xliff:g> 人</item>
-      <item quantity="one">另外 1 人</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"無"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{無}=1{{contact_1}}=2{{contact_1}和{contact_2}}=3{{contact_1}、{contact_2}和{contact_3}}other{{contact_1}、{contact_2}和另外 # 人}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"訊息"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"訊息"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"訊息"</string>
@@ -3771,11 +3754,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"系統會在「<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>」排程進行時封鎖訊息。你可以調整設定，讓好友、家人或其他聯絡人可以聯絡你。"</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"你會收到所有訊息的通知"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"你會收到所有來電的通知"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"無"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> 位聯絡人</item>
-      <item quantity="one">1 位聯絡人</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{無}=1{1 位聯絡人}other{# 位聯絡人}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"所有人"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"聯絡人"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"已加星號的聯絡人"</string>
@@ -3813,22 +3792,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"所有通知"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"部分通知"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"即使未將應用程式設為例外，指定的使用者仍可與你聯絡"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g>例外</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g>例外</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"以及另外 <xliff:g id="NUMBER">%d</xliff:g> 個應用程式"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{沒有應用程式例外}=1{「{app_1}」例外}=2{「{app_1}」和「{app_2}」例外}=3{「{app_1}」、「{app_2}」和「{app_3}」例外}other{「{app_1}」、「{app_2}」和另外 # 個應用程式例外}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"應用程式"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"所有通知"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"部分通知"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"例外的通知"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"允許所有通知"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g>例外</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g>例外</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"沒有音效例外"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"以及另外 <xliff:g id="NUMBER">%d</xliff:g> 個音效"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{沒有音效例外}=1{{sound_category_1}例外}=2{{sound_category_1}和{sound_category_2}例外}=3{{sound_category_1}、{sound_category_2}和{sound_category_3}例外}other{{sound_category_1}、{sound_category_2}和另外 # 種類別例外}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"沒有音效例外"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"沒有人例外"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"某些人例外"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"所有人都例外"</string>
@@ -3849,7 +3820,7 @@
     <string name="zen_mode_when_weeknights" msgid="531342225633264368">"週一至週五夜間"</string>
     <string name="zen_mode_start_time" msgid="1252665038977523332">"開始時間"</string>
     <string name="zen_mode_end_time" msgid="223502560367331706">"結束時間"</string>
-    <string name="zen_mode_end_time_next_day_summary_format" msgid="419683704068360804">"隔天 <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="zen_mode_end_time_next_day_summary_format" msgid="419683704068360804">"隔天<xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
     <string name="zen_mode_summary_alarms_only_indefinite" msgid="910047326128154945">"無限期變更為僅允許鬧鐘模式"</string>
     <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="1900512966361163390">
       <item quantity="other">變更為僅允許鬧鐘模式：持續 <xliff:g id="DURATION">%1$d</xliff:g> 分鐘，結束時間為<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
@@ -4072,7 +4043,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB 由以下模式控管"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"已連接的裝置"</string>
     <string name="usb_control_device" msgid="527916783743021577">"這個裝置"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"切換中..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"切換中…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"無法切換"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"為這個裝置充電"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"正在為連接的裝置充電"</string>
@@ -4319,7 +4290,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"查看詳細資料"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"數據節省模式"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"數據用量不受限"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"背景資料功能已關閉"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"背景資料功能已關閉"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"已開啟"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"已關閉"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"使用數據節省模式"</string>
@@ -4342,7 +4313,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"裝置處於鎖定狀態時，禁止在通知中輸入回覆內容或其他文字"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"預設拼字檢查工具"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"選擇拼字檢查工具"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"使用拼字檢查工具"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"使用拼字檢查工具"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"未選取"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(無)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4403,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"儲存空間管理工具會將已備份的相片和影片從裝置中移除，藉此釋出儲存空間。"</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"移除相片和影片"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"儲存空間管理工具"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"使用儲存空間管理工具"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"使用儲存空間管理工具"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"自動"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"手動"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"立即釋出空間"</string>
@@ -4470,6 +4441,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"輕觸兩下以查看手機"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"輕觸兩下平板電腦即可查看"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"輕觸兩下裝置即可查看"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"滑動查看通知"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"在畫面底部向下滑動即可顯示通知"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"單手模式"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"使用單手模式"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"切換應用程式時結束單手模式"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"逾時"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 秒"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 秒"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 秒"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"可單手操作"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"輕觸兩下螢幕即可查看時間、通知和其他資訊。"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"拿起以查看手機"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"拿起平板電腦即可查看"</string>
@@ -4482,6 +4463,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"輕觸以查看平板電腦"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"輕觸以查看裝置"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"如要查看時間、通知和其他資訊，請輕觸螢幕。"</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"緊急按鈕"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"快速按下電源按鈕 5 次即可觸發緊急求救動作。"</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"警報聲"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"在觸發動作前發出警報聲"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"緊急聯絡人"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"滑動指紋感應器以查看通知"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"滑動手指"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"將手指放在手機背面的指紋感應器上並向下滑動，即可查看通知。"</string>
@@ -4636,7 +4622,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"為所有應用程式啟用這項設定"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"選取繪圖驅動程式"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"預設"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"遊戲驅動程式"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"遊戲驅動程式"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"開發人員驅動程式"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"系統繪圖驅動程式"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4705,6 +4691,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"找不到網路，請再試一次。"</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(已禁止)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"沒有 SIM 卡"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM 卡"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"沒有 SIM 卡"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"無"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"必須要有 SIM 卡才能連上網路"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"必須要有「<xliff:g id="WIRELESS_CARRIER">%s</xliff:g>」的 SIM 卡才能連上網路"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"首選網路模式：首選 WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"首選網路模式：僅限 GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"首選網路模式：僅限 WCDMA"</string>
@@ -4758,6 +4749,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"行動數據"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"使用行動網路存取數據"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"手機會在進入有效範圍時，自動切換至這個電信業者"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"沒有可用的 SIM 卡"</string>
     <string name="calls_preference" msgid="2166481296066890129">"通話偏好設定"</string>
     <string name="sms_preference" msgid="7742964962568219351">"簡訊偏好設定"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"每次都詢問"</string>
@@ -4940,10 +4932,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"允許應用程式可重疊顯示在「設定」畫面上"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"允許可顯示在其他應用程式上的應用程式重疊顯示在「設定」畫面上"</string>
     <string name="media_controls_title" msgid="403271085636252597">"媒體"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"在媒體工作階段結束後隱藏播放器"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"這個播放器可讓你透過展開的快速設定面板繼續執行工作階段。"</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"快速設定中的媒體播放器"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"延長媒體播放器的顯示時間，讓你輕鬆繼續播放"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"隱藏播放器"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"顯示播放器"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"沒有可用的播放器"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"允許的應用程式"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"媒體"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"系統將開啟藍牙"</string>
 </resources>
diff --git a/res/values-zu/arrays.xml b/res/values-zu/arrays.xml
index 81a602b..f6f0fcf 100644
--- a/res/values-zu/arrays.xml
+++ b/res/values-zu/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Okulingene"</item>
     <item msgid="6740026006576843477">"Kude"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Kufushane"</item>
+    <item msgid="7397961711906421599">"Okulingene"</item>
+    <item msgid="4079132024502041928">"Kude"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Okuzenzakalelayo"</item>
     <item msgid="4234707448428002595">"I-Sans Serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"I-CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"I-CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"I-GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Okomhlaba jikelele"</item>
+    <item msgid="4147872615520331421">"I-LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"I-LTE"</item>
     <item msgid="2947411877551747693">"I-LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"I-TDSCDMA kuphela"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"I-NR/LTE"</item>
     <item msgid="5237423971422723128">"I-NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"I-NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"I-NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Emhlabeni jikelele"</item>
     <item msgid="6692179237956480280">"I-NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"I-NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"I-NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 2561a8c..984da2b 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Bonisa ulwazi lwephrofayela ekukhiyeni isikrini"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Ama-akhawunti"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Indawo"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Sebenzisa indawo"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Sebenzisa indawo"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Valiwe"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">Vuliwe - <xliff:g id="COUNT_1">%1$d</xliff:g> izinhlelo zokusebenza ezinokufinyelela kundawo</item>
@@ -329,6 +329,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Sebenzisa ubuso bakho ukuze ufakazele ubuqiniso"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Qala"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Uma i-face unlock yokufinyelela ivaliwe, ezinye izinyathelo zokusetha zingase zingasebenzi kahle nge-TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Iya emuva"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Qhubeka nokusetha"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Sebenzisa ukusetha kokufinyelela"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -619,7 +622,6 @@
       <item quantity="other">Kufanele kube amadijithi angaphansi kuka-<xliff:g id="NUMBER_1">%d</xliff:g></item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Umlawuli wedivayisi akavumeli ukusebenzisa iphinikhodi yakamuva"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Ama-PIN avamile avinjelwe umlawuli wakho we-IT. Zama i-PIN ehlukile."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Lokhu akukwazi ukufana uhlamvu olungavumelekile"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Kumele iqukathe okungenani uhlamvu olulodwa"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Kumele iqukathe okungenani idijithi eyodwa"</string>
@@ -653,7 +655,6 @@
       <item quantity="other">Kumele iqukathe okungenani izinhlamvu ezingasizo izinombolo ezingu-<xliff:g id="COUNT">%d</xliff:g></item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Umlawuli wedivayisi akavumeli ukusebenzisa iphasiwedi yakamuva"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Amaphasiwedi avamile avinjelwe umlawuli wakho we-IT. Zama iphasiwedi ehlukile."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Ukwenyuka, ukwehla, noma uchungechunge olwehlayo lamadijithi alivunyewe"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Qinisekisa"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Khansela"</string>
@@ -795,7 +796,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"I-Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Vula i-Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"I-Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Sebenzisa i-Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Sebenzisa i-Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Izilungiselelo ze-Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"I-Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Hlela, uphathe izindawo zokungena ezingenantambo"</string>
@@ -903,7 +904,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Misa phakathi nendawo ikhodi ye-QR ngaphansi ukuze uxhumeke ku-“<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Joyina i-Wi‑Fi ngokuskena ikhodi ye-QR"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Yaba i-Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Skena le khodi ye-QR ukuze uxhumeke ku-“<xliff:g id="SSID">%1$s</xliff:g>” uphinde wabelane ngephasiwedi"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Skena le khodi ye-QR ngenye idivayisi ukuze ujoyine i-“<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Skena le khodi ye-QR ukuze ixhumeke ku-“<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Zama futhi. Uma inkinga iqhubeka, xhumana nomkhiqizi wedivayisi"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Okuthile akuhambanga kahle"</string>
@@ -929,8 +930,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Iphasiwedi ye-Wi‑Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Iphasiwedi ye-hotspot: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Ukuxhumeka okuzenzakalelayo"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Vumela ifoni ukuba ixhume ngokuzenzakalelayo eduze nale nethiwekhi"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Vumela ithebulethi ukuba ixhume ngokuzenzakalelayo eduze nale nethiwekhi"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Vumela ukuxhumeka kule nethiwekhi uma ikubanga"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Engeza idivayisi"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Sebenzisa ikhodi ye-QR ukuze ungeze idivayisi kule nethiwekhi"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"Ikhodi ye-QR ayiyona ifomethi evumelekile"</string>
@@ -942,7 +942,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Sebenzisa izitifiketi zesistimu"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Unganikezeli"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Ungaqinisekisi"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Asikho isitifiketi esicacisiwe. Ukuxhumeka kwakho ngeke kube yimfihlo."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Igama lenethiwekhi lide kakhulu."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Kumele icacise isizinda."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Isitifiketi siyadingeka."</string>
@@ -969,6 +968,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Xhuma kwi-inthanethi"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"I-Wi-Fi ivuliwe"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Ixhumeke ku-<xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Ixhuma ku-<xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Iyaxhuma…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Yehlulekile ukuxhuma kunethiwekhi"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Inethiwekhi ayikho kubanga"</string>
@@ -1040,7 +1040,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Uhlelo lokusebenza labelana ngokuqukethwe. Ukuze wabelane ngoxhumo lwe-inthanethi, vala i-hotspot, bese uyivule"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Ayikho iphasiwedi esethiwe"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Igama le-Hotspot"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Ivula i-<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Ivula i-<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Amanye amadivayisi angaxhuma ku-<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Iphasiwedi ye-Hotspot"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"I-AP Band"</string>
@@ -1190,7 +1190,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Isibonisi esibushelelezi"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Iphakamisa ngokuzenzakalela isilinganiso sokuvuselela kusukela kokungu-60 ukuya kokungu-90 Hz kokunye okuqukethwe. Ikhuphula ukusetshenziswa kwebhethri."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Isibonisi esibushelelezi"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Phoqa inani lokuvuselela elingu-90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Inani lokuvuselela eliphezulu kakhulu lokuphendula kokuthinta okuthuthukisiwe nekhwalithi yokugqwayiza. Ikhuphula ukusetshenziswa kwebhethri."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Ukunaka isikrini"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Kuvuliwe / Isikrini ngeke size sivaleke uma usibhekile"</string>
@@ -1329,7 +1329,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Inguqulo ye-Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Isibuyekezo sokuvikela kwe-Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Imodeli"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Imodeli: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Imodeli nezingxenyekazi zekhompuyutha"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Inguqulo yezingxenyekazi zekhompuyutha"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"I-ID yempahla"</string>
@@ -1605,31 +1604,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Izilungiselelo zenethiwekhi zisethwe kabusha"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Ayikwazi ukusula ama-SIM"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Ama-SIM alandiwe awakwazi ukusulwa ngenxa yephutha.\n\nQala kabusha idivayisi yakho uphinde uzame futhi."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Sula yonke idatha (ukusethwa kabusha kwasekuqaleni)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Sula yonke idatha (ukusethwa kabusha kwasekuqaleni)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Lokhu kuzosusa yonke idatha kusukela "<b>"kusitoreji sangaphakathi"</b>" sethebulethi yakho, okufaka:\n\n"<li>"I-akhawunti yakho ye-Google"</li>\n<li>"Idatha yesistimu neyohlelo lokusebenza neyezilungiselelo"</li>\n<li>"Izinhlelo zokusebenza ezilandiwe"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Lokhu kuzosusa yonke idatha kusukela "<b>"kusitoreji  sangaphakathi"</b>" sefoni yakho, okufaka:\n\n"<li>"I-akhawunti yakho ye-Google"</li>\n<li>"Idatha yesistimu neyohlelo lokusebenza nezilungiselelo"</li>\n<li>"Izinhlelo zokusebenza ezilandiwe"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n"Okwamanje ungene ngemvume kuma-akhawunti alandelayo:\n\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Kukhona abanye abasebenzisi abakhona kule divayisi.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Umculo"</li>\n<li>"Izithombe"</li>\n<li>"Enye idatha yomsebenzisi"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727">"Ama"<li>"eSIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Lokhu ngeke kukhansele uhlelo lwakho lwesevisi yefoni."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Ukusula futhi umculo, izithombe, nenye idatha yomsebenzisi, "<b>" indawo yokugcina ye-USB"</b>"idinga ukusulwa."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Ukusula umculo, izithombe, nenye imininingo yomsebenzisi, "<b>"ikhadi le-SD"</b>"kumele lisuswe."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Sula yonke idatha (ukusethwa kabusha njengasekuqaleni)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Sula yonke idatha (ukusethwa kabusha njengasekuqaleni)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Lokhu kuzosusa yonke idatha "<b>"ekusitoreji sangaphakathi"</b>" sethebulethi yakho, kuhlanganise:\n\n"<li>"I-Akhawunti yakho ye-Google"</li>\n<li>"Idatha yesistimu neyohlelo lokusebenza namasethingi"</li>\n<li>"Izinhlelo zokusebenza ezilandiwe"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Lokhu kuzosusa yonke idatha "<b>"ekusitoreji sangaphakathi"</b>" sefoni yakho, kuhlanganise:\n\n"<li>"I-Akhawunti yakho ye-Google"</li>\n<li>"Idatha yesistimu neyohlelo lokusebenza namasethingi"</li>\n<li>"Izinhlelo zokusebenza ezilandiwe"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n"Okwamanje ungene ngemvume kuma-akhawunti alandelayo:\n\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Kukhona abanye abasebenzisi abakhona kule divayisi.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Umculo"</li>\n<li>"Izithombe"</li>\n<li>"Idatha yomunye umsebenzisi"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729">"Ama-"<li>"eSIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Lokhu ngeke kukhansele uhlelo lwakho lwesevisi yefoni."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Ukuze usule umculo, izithombe, nedatha yomunye umsebenzisi, "<b>"isitoreji se-USB"</b>"kudingeka sisulwe."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Ukuze usule umculo, izithombe, nedatha yomunye umsebenzisi, "<b>"ikhadi le-SD"</b>"kudingeka isuswe."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Susa isitoreji se-USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Sula ikhadi le-SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Sula yonke idatha ekusitoreji se-USB , njengomculo noma izithombe."</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Sula yonke idatha ekhadini le-SD, njengomculo noma izithombe"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Sula yonke idatha"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Sula yonke idatha"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Lonke ulwazi lwakho lomuntu siqu nezinhlelo zokusebenza ezilandiwe zizosuswa. Awukwazi ukuhlehlisa lesi senzo."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Lonke ulwazi lwakho lomuntu siqu, olufaka izinhlelo zokusebenza ezilandiwe nama-SIM, luzosuswa. Awukwazi ukuhlehlisa lesi senzo."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Sula yonke into"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Akukho ukusetha kabusha okwenziwe ngoba isevisi Yokwesula Isistimu ayitholakali."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Sula yonke idatha?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Ukusetha kabusha kwasekuqaleni akutholakaleli lo msebenzisi"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Iyasula"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Sicela ulinde..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Sula yonke idatha"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Sula yonke idatha"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Lonke ulwazi lwakho lomuntu siqu nezinhlelo zokusebenza ezilandiwe zizosuswa. Awukwazi ukuhlehlisa lesi senzo."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Lonke ulwazi lwakho lomuntu siqu, kuhlanganise nezinhlelo zokusebenza ezilandiwe nama-SIM, kuzosuswa. Awukwazi ukuhlehlisa lesi senzo."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Sula yonke idatha?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Ukusetha kabusha kwasekuqaleni akutholakaleli lo msebenzisi"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Iyasula"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Sicela ulinde…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Izilungiselelo zekholi"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Hlela ivoyisimeyili, ukudlulisa ikholi, ikholi elindile, i-ID yomshayeli"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Imodemu nge-USB"</string>
@@ -1677,7 +1674,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Ayikwazi ukusebenzisa amadivaysi adlula angu-<xliff:g id="MAXCONNECTION">%1$d</xliff:g>."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ngeke kusebenziswe ifoni njengemodemu"</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ukusebenzisa ifoni njengemodemu kwe-ethernet"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Yabelana ngokuxhumeka kwe-inthanethi kwefoni nge-USB Ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Yabelana ngokuxhumeka kwe-inthanethi kwefoni nge-Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Sebenzisa i-hotspot nefoni njengemodemu ukuze unikeze i-inthanethi kumanye amadivayisi ngokuxhumeka kwakho kwedatha yeselula. Izinhlelo zokusebenza nazo zingadala i-hotspot ukwabelana nokuqukethwe namadivayisi aseduze."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Sebenzisa i-hotspot nokusebenzisa ifoni njengemodemu ukuze unikeze i-inthanethi kumanye amadivayisi nge-Wi-Fi yakho noma ukuxhumeka kwedatha kweselula. Izinhlelo zokusebenza zingaphinda zidale i-hotspot ukuze zabelane ngokuqukethwe namadivayisi aseduze."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Usizo"</string>
@@ -2118,13 +2115,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Okuncanyelwayo kwamagama-ngcazo"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Ukukhuliswa"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Indawo yokukhulisa"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Ukukhuliswa kunikwe amandla"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Khetha izindawo zokukhulisa ofuna ukuzisebenzisa uma ukhulisa isikrini"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Iskrini esigcwele"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Ingxenye yesikrini"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Isikrini esigcwele nengxenye yesikrini"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Khulisa sonke isikrini"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Khulisa ingxenye eyesikrini"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Ushintshela kunkinobho yokufinyelela?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Ukusebenzisa ukuthepha kathathu ukuze ukhulise ingxenye yesikrini kuzobangela ukuzama nezinye izenzo ukuba zibambezeleke.\n\nIngabe ufuna ukushintshela ekusebenziseni inkinobho yokufinyelela ukuze ukhulise?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Shintshela kunkinobho yokufinyelela"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Qhubeka uthepha kathathu ukuze ukhulise"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Izilungiselelo zokukhuliswa"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Shintsha ngokuthepha kathathu"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Khulisa ngesinqamuleli"</string>
@@ -2178,11 +2178,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Inkinobho yamandla ivala ikholi"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Isikhombi esikhulu segundane"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Susa ukugqwayiza"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Umsindo we-Mono"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Hlanganisa iziteshi uma udlala umsindo"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Ukubhalansa umsindo"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Ngakwesokunxele"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Okungakwesokudla"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Umsindo we-Mono"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Hlanganisa iziteshi uma udlala umsindo"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Ukubhalansa umsindo"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Kwesokunxele"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Kwesokudla"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Okuzenzakalelayo"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"imizuzwana eyi-10"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 amasekhondi"</string>
@@ -2212,11 +2212,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Ukudlidliza kwesaziso"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Ukudlidliza kokukhala"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Impendulo yokuthinta"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Sebenzisa i-<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Vula i-<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Sebenzisa ukulungisa kombala"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Bonisa amagama-ncazo"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Okohlelo lokusebenza olusekelwe kuphela"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Sebenzisa i-<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Vula i-<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Sebenzisa ukulungisa kombala"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Bonisa amagama-ncazo"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Okohlelo lokusebenza olusekelwe kuphela"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Usayizi wegama-ngcazo nesitayela"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> usayizi wombhalo"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Ezinye izinketho"</string>
@@ -2246,6 +2246,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"I-Deuteranomaly"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"I-Protanomaly"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"I-Tritanomaly"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"I-grayscale"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Okubomvu-okuluhlaza okotshani"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Okubomvu-okuluhlaza okotshani"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Okuluhlaza okwesibhakabhaka-okuphuzi"</string>
@@ -2375,7 +2376,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Ukukhawulelwa okungemuva"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Vumela uhlelo lokusebenza ukuthi lusebenze ngemuva"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Uhlelo lokusebenza alivunyelwe ukubuyela ngasemuva"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Ukusetshenziswa kwangemuva akukwazi ukukhawulelwa"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Ukusetshenziswa kwangemuva akukwazi ukukhawulelwa"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Khawulela umsebenzi wasemuva?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Uma ukhawulela umsebenzi wangasemuva wohlelo lokusebenza, lungahle lungasebenzi kahle"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Njengoba lolu hlelo lokusebenza lungasethiwe ukuze kulungiselelwe ibhethri, awukwazi ukulikhawulela.\n\nUkuze ukhawulele uhlelo lokusebenza, qala uvule ukulungiselelwa kwebhethri."</string>
@@ -2592,9 +2593,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Setha ishejuli"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Khulisa impilo yebhethri"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Vala lapho ishajiwe"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Isilondolozi sebhethri sivalwa uma ifoni yakho iku-<xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Isilondolozi sebhethri siyavalwa uma ithebulethi yakho iku-<xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Isilondolozi sebhethri siyavalwa uma idivayisi yakho iku-<xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Isilondolozi sebhethri sivala lapho ifoni yakho ishaja ngaphezu kuka-<xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Isilondolozi sebhethri sivala lapho ithebulethi yakho ishaja ngaphezu kuka-<xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Isilondolozi sebhethri sivala lapho idivayisi yakho ishaja ngaphezu kuka-<xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Vula"</string>
@@ -2659,6 +2660,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Setha kabusha"</string>
     <string name="tts_play" msgid="2945513377250757221">"Dlala"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"I-VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Uxhumo lwe-adaptive"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Kunweba impilo yebhethri kuphinde kuthuthukise ukusebenza kwedivayisi ngokuphatha uxhumo lenethiwekhi yakho ngokuzenzakalelayo"</string>
     <string name="credentials_title" msgid="7535942196886123656">" Isitoreji sokuqinisekisa"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Faka isitifiketi"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Faka izitifiketi kusuka ekugcineni"</string>
@@ -2670,9 +2673,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Ukuqinisekisa komsebenzisi"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Buka uphinde ulungise ukuqinisekisa okugciniwe"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Ithuthukisiwe"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Uhlobo lwesitoreji"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Izingxenyekazi zekhompyutha zisekelwe ngokulondoloza"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Isofthiwe kuphela"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Izifakazo azitholakaleli lo msebenzisi"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Kufakelwe i-VPN nezinhlelo zokusebenza"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Kufakelwe i-Wi-Fi"</string>
@@ -3061,7 +3061,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Ukukhokha kutheminali"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Setha uhlelo lokusebenza lokhukhokha. Bese vele ubambe ingemuva lefoni yakho kuya kunoma iyiphi itheminali enophawu elingenabo oxhumana nabo."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Ngiyitholile"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Okuningi..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Okuningi…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Setha uhlelo lokusebenza olukhokhelwayo oluzenzakalelayo"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Buyekeza uhlelo lokusebenza olukhokhelwayo oluzenzakalelayo"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Kutheminali yangaphandle kokuthinta, khokha nge-<xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3145,7 +3145,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Njalo sebenzisa lokhu kumakholi"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Khetha i-SIM yedatha"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Khetha i-SIM ye-SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Ishintsha i-SIM yedatha, lokhu kungathatha kufikela kuminithi..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Ishintsha i-SIM yedatha, lokhu kungathatha kufikela kuminithi…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Shaya nge"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Khetha ikhadi le-SIM"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"I-SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3288,6 +3288,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"umzila, ishejuli, isilondolozi sebhethri, isilondolozi samandla, ibhethri, ukuzenzakalela, iphesenti"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"i-volte, ukushaya okuthuthukile, ukushaya kwe-4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"engeza ulimi, engeza ulimi"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"usayizi wombhalo"</string>
     <string name="default_sound" msgid="6604374495015245195">"Umsindo owufica ukhona"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Ivolumu yokukhala neyesaziso ku-<xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Ivolomu, ukudlidliza, ungaphazamisi"</string>
@@ -3327,11 +3328,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Amandla kumisindo"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Amagama-ncazo abukhoma"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Yenza amagama-ngcazo ngokuzenzakalela emidiya"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Lutho"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> amashejuli asethiwe</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> amashejuli asethiwe</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Lutho}=1{ishejuli esethiwe e-1}one{amashejuli asethiwe angu-#}other{amashejuli asethiwe angu-#}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Ungaphazamisi"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Yaziswa kuphela abantu ababalulekile nezinhlelo zokusebenza"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Khawulela ukuphazamisa"</string>
@@ -3399,20 +3396,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Okubalulekile kuphela"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Kuvuliwe / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Kuvaliwe / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Kuvaliwe"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Vuliwe"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Buza njalo"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Uze uvale isikrini"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> amahora</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> amahora</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> amaminithi"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> amashejuli angavula ngokuzenzakalelayo</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> amashejuli angavula ngokuzenzakalelayo</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{ihora eli-1}one{amahora #}other{amahora #}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{umzuzu 1}one{imizuzu #}other{imizuzu #}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Kuvaliwe}=1{Kuvaliwe ? ishejuli e-1 ingavula ngokuzenzakalelayo}one{Kuvaliwe / amashejuli angu-# angavula ngokuzenzakalelayo}other{Kuvaliwe / amashejuli angu-# angavula ngokuzenzakalelayo}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Yini engaphazamisa okuthi Ungaphazamisi"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Abantu"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Izinhlelo zokusebenza"</string>
@@ -3458,6 +3447,8 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Setha ngokuzenzakalela izaziso zokubaluleka okuncane zibe Mnene"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Ukulinganisa kwesaziso sokujwayela"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Linganisa ngokuzenzakalelayo izaziso ngokuhlobana"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Impendulo yesaziso sokujwayela"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Bonisa ukulungiswa okwenziwe kuzaziso bese ubonisa inketho yokuhlinzeka ngempendulo kusistimu"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Izenzo eziphakanyisiwe nezimpendulo"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Bonisa ngokuzenzakalela izenzo eziphakanyisiwe nezimpendulo"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Bona izaziso zakamuva nezisnuziwe"</string>
@@ -3654,7 +3645,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Ukufinyelela kokungaphazamisi"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Vumela ukungaphazamisi"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Azikho izinhlelo zokusebenza ezifakiwe ezicele ukufinyelela kokungaphazamisi"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Ilayisha izinhlelo zokusebenza..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Ilayisha izinhlelo zokusebenza…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Ngokwesicelo sakho, i-Android ivimbela izaziso zalolu hlelo lokusebenza kusukela ekuveleni kule divayisi"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Ngokwesicelo sakho i-Android ivimbela lesi sigaba sezaziso kusukela ekuveleni kule divayisi"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Ngokwesicelo sakho i-Android ivimbela leli qembu lezaziso kusukela ekuveleni kule divayisi"</string>
@@ -3746,11 +3737,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Zonke izingxoxo"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Izingxoxo ezibalulekile"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Lutho"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> izingxoxo</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> izingxoxo</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Lutho"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Lutho}=1{ingxoxo e-1}one{izingxoxo ezingu-#}other{izingxoxo ezingu-#}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Labo abangaphazamisa"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Amakholi"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Amakholi"</string>
@@ -3759,11 +3746,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Ukuqinisekisa ukuthi amakholi avunyelwe enza umsindo, hlola ukuthi idivayisi isethelwe ukukhalisa"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Okwe-‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ kwamakholi angenayo kuvinjelwe. Ungalungisa izilungiselelo ukuze uvumele abangani bakho, umndeni, noma abanye oxhumana nabo ukuthi bafinyelele kuwe."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Oxhumana nabo abafakwe inkanyezi"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one"><xliff:g id="NUM_PEOPLE">%d</xliff:g> okunye</item>
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> okunye</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Lutho"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Lutho}=1{{contact_1}}=2{U-{contact_1} no-{contact_2}}=3{U-{contact_1}, {contact_2}, no-{contact_3}}one{U-{contact_1}, {contact_2}, nabanye abangu-#}other{U-{contact_1}, {contact_2}, nabanye abangu-#}}"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Imilayezo"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"imilayezo"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Imilayezo"</string>
@@ -3772,11 +3755,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Okwemilayezo engenayo ye-\'<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\' evinjiwe. Ungalungisa izilungiselelo ukuze uvumele abangani bakho, umndeni, noma abanye oxhumana nabo ukuthi bafinyelele kuwe."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Yonke imilayezo ingafinyelela kuwe"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Wonke amakholi angafinyelela kuwe"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Lutho"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> oxhumana nabo</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> oxhumana nabo</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Lutho}=1{oxhumana naye o-1}one{oxhumana nabo abangu-#}other{oxhumana nabo abangu-#}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Noma ubani"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Oxhumana nabo"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Oxhumana nabo abafakwe inkanyezi"</string>
@@ -3814,22 +3793,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Zonke izaziso"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Ezinye izaziso"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Abantu abakhethiwe basengakuthola, ngisho noma ungavumeli izinhlelo zokusebenza ukuphazamisa"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one">Ama-<xliff:g id="APP_NAMES">%s</xliff:g> angaphazamisa</item>
-      <item quantity="other">Ama-<xliff:g id="APP_NAMES">%s</xliff:g> angaphazamisa</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> okuningi"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Azikho izinhlelo zokusebenza ezingaphazamisa}=1{I-{app_1} ingaphazamisa}=2{I-{app_1} ne-{app_2} zingaphazamisa}=3{I-{app_1}, i-{app_2}, ne-{app_3} zingaphazamisa}one{I-{app_1}, i-{app_2}, kanye nezingu-# ezengeziwe zingaphazamisa}other{I-{app_1}, i-{app_2}, kanye nezingu-# ezengeziwe zingaphazamisa}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Izinhlelo zokusebenza"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Zonke izaziso"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Ezinye izaziso"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Izaziso ezingaphazamisa"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Vumela zonke izaziso"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one">Ama-<xliff:g id="SOUND_CATEGORIES">%s</xliff:g> angaphazamisa</item>
-      <item quantity="other">Ama-<xliff:g id="SOUND_CATEGORIES">%s</xliff:g> angaphazamisa</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Akukho okungaphazamisa"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> okuningi"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Akukho okungaphazamisa}=1{I-{sound_category_1} ingaphazamisa}=2{I-{sound_category_1} ne-{sound_category_2} zingaphazamisa}=3{I-{sound_category_1}, i-{sound_category_2}, ne-{sound_category_3} zingaphazamisa}one{I-{sound_category_1}, i-{sound_category_2}, kanye nezingu-# ezengeziwe zingaphazamisa}other{I-{sound_category_1}, i-{sound_category_2}, kanye nezingu-# ezengeziwe zingaphazamisa}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Akukho okungaphazamisa"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Akekho ongaphazamisa"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Abantu abathile bangaphazamisa"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Bonke abantu bangaphazamisa"</string>
@@ -4073,7 +4044,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"I-USB ilawulwa nge-"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Idivayisi exhunyiwe"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Le divayisi"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Iyashintsha..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Iyashintsha…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Ayikwazanga ukushintsha"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Ishaja le divayisi"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Ishaja idivayisi exhunyiwe"</string>
@@ -4320,7 +4291,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Buka imininingwane"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Iseva yedatha"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Idatha engakhawulelwe"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Idatha yangemuva ivaliwe"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Idatha yangemuva ivaliwe"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Vuliwe"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Valiwe"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Sebenzisa iseva yedatha"</string>
@@ -4343,7 +4314,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Uma idivayisi ikhiyiwe, vimbela ukuthayipha izimpendulo noma omunye umbhalo kuzaziso."</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Isihloli sokupela esizenzakalelayo"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Khetha isihloli sokupela"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Sebenzisa isihloli sokupela"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Sebenzisa isihloli sokupela"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Abangakhethiwe"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(lutho)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4433,7 +4404,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Ukuze kusizwe kukhululwe isikhala sesitoreji, isiphathi sesitoreji sisusa izithombe ezenziwe isipele namavidiyo kusukela kudivayisi yakho."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Susa izithombe namavidiyo"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Isiphathi sesitoreji"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Sebenzisa isiphathi sesitoreji"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Sebenzisa isiphathi sesitoreji"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Okuzenzakalelayo"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Okwenziwa ngesandla"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Khulula isikhala manje"</string>
@@ -4471,6 +4442,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Thepha kabili ukuze uhlole ifoni"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Thepha kabili ukuze uhlole ithebulethi"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Thepha kabili ukuze uhlole idivayisi"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Swayiphela izaziso"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Swayiphela phansi kunqenqema oluphansi lwesikrini ukuze ubonise izaziso zakho"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Imodi yesandla esisodwa"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Sebenzisa imodi yesandla esisodwa"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Phuma uma ushintsha izinhlelo zokusebenza"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Isikhathi sokuvala"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"Amasekhondi ama-4"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"Amasekhondi ayisi-8"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"Amasekhondi ayi-12"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"ukufinyeleleka"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Ukuze uhlole isikhathi, izaziso, nolunye ulwazi, thepha kabili isikrini sakho."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Phakamisa ukuze uhlole ifoni"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Phakamisa ukuze uhlole ithebulethi"</string>
@@ -4483,6 +4464,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Thepha ukuze uhlole ithebulethi"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Thepha ukuze uhlole idivayisi"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Ukuze uhlole isikhathi, izaziso, nolunye ulwazi, thepha isikrini sakho."</string>
+    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Inkinobho yokwesaba"</string>
+    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Qala izenzo ze-SOS yesimo esiphuthumayo ngokucindezela inkinobho yamandla ngokushesha izikhathi ezi-5."</string>
+    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Umsindo wesexwayiso"</string>
+    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Isexwayiso ngaphambi kokuqalisa izenzo"</string>
+    <string name="panic_gesture_edit_emergency_contact_setting_title" msgid="7791096427878863017">"Oxhumana nabo esimweni esiphuthumayo"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Swayipha izigxivizo zeminwe ukuze uthole izaziso"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Swayipha izigxivizo zeminwe"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Ukuze uhlole izaziso zakho, swayiphela phansi kunzwa yezigxivizo zeminwe ngemuva kwefoni yakho."</string>
@@ -4637,7 +4623,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Nikela amandla zonke izinhlelo zokusebenza"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Khetha i-Graphics Driver"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Okuzenzekelayo"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Umshayeli wegeyimu"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Umshayeli Wegeyimu"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Isishayeli Sikanjiniyela"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Umshayeli wemifanekiso yesistimu"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4706,6 +4692,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Ayikwazanga ukuthola amanethiwekhi. Zama futhi."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(kunqatshelwe)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Alikho ikhadi le-SIM."</string>
+    <string name="sim_card" msgid="6381158752066377709">"I-SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Ayikho i-SIM"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Lutho"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Idinga i-SIM ukuze ixhume"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Idinga i-SIM ye-<xliff:g id="WIRELESS_CARRIER">%s</xliff:g> ukuze ixhume"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Imodi yenethiwekhi ekhethwayo: i-WCDMA ekhethwayo"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Imodi yenethiwekhi ekhethwayo: i-GSM kuphela"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Imodi yenethiwekhi ekhethwayo: i-WCDMA kuphela"</string>
@@ -4759,6 +4750,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Idatha yeselula"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Finyelela kudatha usebenzisa inethiwekhi yeselula"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Ifoni izoshintshela ngokuzenzakalela kule nkampani yenethiwekhi uma iseduze"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Akukho SIM etholakalayo"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Okuncamelayo kwamakholi"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Okuncanyelwayo kwe-SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Hlala ubuza njalo"</string>
@@ -4941,10 +4933,12 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Vumela ukumbozwa kwesikrini kokuthi Amasethingi"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Vumela izinhlelo zokusebenza ezingabonisa ngaphezulu kwezinye izinhlelo zokusebenza ukumboza izikrini zokuthi Amasethingi"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Imidiya"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Fihla umdlali lapho iseshini yemidiya isiphelile"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Umdlali ukuvumela ukuthi uqalise kabusha iseshini kusuka kuphaneli Yamasethingi asheshayo enwetshiwe"</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"I-Media player kokuthi Amasethingi asheshayo"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Bonisa i-media player isikhathi esandisiwe ukuze uqalise kabusha kalula ukudlala"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Fihla umdlali"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Bonisa umdlali"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Abekho abadlali abatholakalayo"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Izinhlelo zokusebenza ezivunyelwe"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"imidiya"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"I-Bluetooth izovuleka"</string>
 </resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 1ad3cc3..f8df920 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -749,6 +749,17 @@
         <item>Long</item>
     </string-array>
 
+    <!-- Avoid the gender issue, create the new fork of the string long_press_timeout_selector_titles -->
+    <!-- Titles for the list of long press timeout options in preference. -->
+    <string-array name="long_press_timeout_selector_list_titles">
+        <!-- A title for the option for short long-press timeout [CHAR LIMIT=25] -->
+        <item>Short</item>
+        <!-- A title for the option for medium long-press timeout [CHAR LIMIT=25] -->
+        <item>Medium</item>
+        <!-- A title for the option for long long-press timeout [CHAR LIMIT=25] -->
+        <item>Long</item>
+    </string-array>
+
     <!-- Values for the list of long press timeout options. -->
     <string-array name="long_press_timeout_selector_values" translatable="false">
         <item>400</item>
@@ -1071,6 +1082,7 @@
         <item>daltonizer_mode_deuteranomaly</item>
         <item>daltonizer_mode_protanomaly</item>
         <item>daltonizer_mode_tritanomaly</item>
+        <item>daltonizer_mode_grayscale</item>
     </string-array>
 
     <!-- Values for display color space adjustment modes for accessibility -->
@@ -1078,6 +1090,7 @@
         <item>12</item>
         <item>11</item>
         <item>13</item>
+        <item>0</item>
     </integer-array>
 
     <!-- Battery saver mode: allowable trigger threshold levels. -->
@@ -1352,7 +1365,7 @@
         <item>CDMA/EvDo/GSM/WCDMA</item>
         <item>CDMA + LTE/EvDo</item>
         <item>GSM/WCDMA/LTE</item>
-        <item>Global</item>
+        <item>LTE/CDMA/EvDo/GSM/WCDMA</item>
         <item>LTE</item>
         <item>LTE / WCDMA</item>
         <item>TDSCDMA only</item>
@@ -1369,7 +1382,8 @@
         <item>NR/LTE</item>
         <item>NR/LTE/CDMA/EvDo</item>
         <item>NR/LTE/GSM/WCDMA</item>
-        <item>NR/LTE/CDMA/EvDo/GSM/WCDMA</item>
+        <!-- Global includes NR/LTE/CDMA/EvDo/GSM/WCDMA -->
+        <item>Global</item>
         <item>NR/LTE/WCDMA</item>
         <item>NR/LTE/TDSCDMA</item>
         <item>NR/LTE/TDSCDMA/GSM</item>
@@ -1461,14 +1475,14 @@
         <item>@string/enhanced_4g_lte_mode_summary_4g_calling</item>
     </string-array>
 
-    <!-- A whitelist which packages won't show summary in battery usage screen.  [CHAR LIMIT=NONE] -->
-    <string-array name="whitelist_hide_summary_in_battery_usage" translatable="false">
+    <!-- An allowlist which packages won't show summary in battery usage screen.  [CHAR LIMIT=NONE] -->
+    <string-array name="allowlist_hide_summary_in_battery_usage" translatable="false">
         <!-- Google -->
         <item>"com.google.android.googlequicksearchbox"</item>
     </string-array>
 
     <!-- Array of titles palette list for accessibility. -->
-    <string-array name="setting_palette_colors" translatable="false" >
+    <string-array name="setting_palette_data" translatable="false" >
         <item>@string/color_red</item>
         <item>@string/color_orange</item>
         <item>@string/color_yellow</item>
@@ -1476,10 +1490,11 @@
         <item>@string/color_cyan</item>
         <item>@string/color_blue</item>
         <item>@string/color_purple</item>
+        <item>@string/color_gray</item>
     </string-array>
 
     <!-- Values for palette list view preference. -->
-    <array name="setting_palette_data" translatable="false" >
+    <array name="setting_palette_colors" translatable="false" >
         <item>@color/palette_list_color_red</item>
         <item>@color/palette_list_color_orange</item>
         <item>@color/palette_list_color_yellow</item>
@@ -1487,6 +1502,7 @@
         <item>@color/palette_list_color_cyan</item>
         <item>@color/palette_list_color_blue</item>
         <item>@color/palette_list_color_purple</item>
+        <item>@color/palette_list_color_gray</item>
     </array>
 
     <!--String arrays for showing the rtt settings options -->
@@ -1501,4 +1517,19 @@
         <item>@string/rtt_settings_always_visible</item>
     </string-array>
 
+    <!-- Array of titles list for one-handed timeout options. [DO NOT TRANSLATE] -->
+    <string-array name="one_handed_timeout_title" translatable="false">
+        <item>@string/screensaver_settings_summary_never</item>
+        <item>@string/one_handed_timeout_short</item>
+        <item>@string/one_handed_timeout_medium</item>
+        <item>@string/one_handed_timeout_long</item>
+    </string-array>
+
+    <!-- Values of list for one-handed timeout options. [DO NOT TRANSLATE] -->
+    <string-array name="one_handed_timeout_values" translatable="false">
+        <item>0</item>
+        <item>4</item>
+        <item>8</item>
+        <item>12</item>
+    </string-array>
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 06f135f..58b8aa4 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -129,6 +129,7 @@
     <color name="notification_importance_button_unselected">#DADCE0</color>
     <color name="notification_importance_button_selected">#1967D2</color> <!-- material blue 700 -->
     <color name="notification_importance_selection_bg">#FFFFFF</color>
+    <color name="notification_history_background">?android:attr/colorBackgroundFloating</color>
 
     <!-- launcher icon color -->
     <color name="icon_launcher_setting_color">@*android:color/accent_device_default_light</color>
@@ -158,6 +159,7 @@
     <color name="palette_list_color_cyan">#12b5cb</color> <!-- Material Cyan 600 -->
     <color name="palette_list_color_blue">#1a73e8</color> <!-- Material Blue 600 -->
     <color name="palette_list_color_purple">#9334e6</color> <!-- Material Purple 600 -->
+    <color name="palette_list_color_gray">#80868b</color> <!-- Material Gray 600 -->
 
     <!-- Palette list preference dark mode colors. -->
     <color name="palette_list_dark_mode_color_red">#f28b82</color> <!-- Material Red 300 -->
@@ -167,5 +169,21 @@
     <color name="palette_list_dark_mode_color_cyan">#78d9ec</color> <!-- Material Cyan 300 -->
     <color name="palette_list_dark_mode_color_blue">#8AB4F8</color> <!-- Material Blue 300 -->
     <color name="palette_list_dark_mode_color_purple">#c58af9</color> <!-- Material Purple 300 -->
+    <color name="palette_list_dark_mode_color_gray">#dadce0</color> <!-- Material Gray 300 -->
 
+    <!-- SIM colors -->
+    <color name="SIM_color_teal">#ff00796b</color> <!-- Material Teal 700 -->
+    <color name="SIM_color_blue">#ff3367d6</color> <!-- Material Blue 700 -->
+    <color name="SIM_color_indigo">#ff303f9f</color> <!-- Material Indigo 700 -->
+    <color name="SIM_color_purple">#ff7b1fa2</color> <!-- Material Purple 700 -->
+    <color name="SIM_color_pink">#ffc2185b</color> <!-- Material Pink 700 -->
+    <color name="SIM_color_red">#ffd32f2f</color> <!-- Material Red 700 -->
+
+    <!-- Dark mode SIM colors -->
+    <color name="SIM_dark_mode_color_teal">#ff80cbc4</color> <!-- Material Teal 200 -->
+    <color name="SIM_dark_mode_color_blue">#ff90caf9</color> <!-- Material Blue 200 -->
+    <color name="SIM_dark_mode_color_indigo">#ffc5cae9</color> <!-- Material Indigo 100 -->
+    <color name="SIM_dark_mode_color_purple">#ffe1bee7</color> <!-- Material Purple 100 -->
+    <color name="SIM_dark_mode_color_pink">#fff48fb1</color> <!-- Material Pink 200 -->
+    <color name="SIM_dark_mode_color_red">#ffef9a9a</color> <!-- Material Red 200 -->
 </resources>
\ No newline at end of file
diff --git a/res/values/config.xml b/res/values/config.xml
index 746d3e7..6a7a1bd 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -120,8 +120,8 @@
         <!--
         <item>com.example.package.first/com.example.class.FirstService</item>
         <item>com.example.package.second/com.example.class.SecondService</item>
-        <item>toggle_master_mono</item>
-        <item>seekbar_master_balance</item>
+        <item>toggle_primary_mono</item>
+        <item>seekbar_primary_balance</item>
         <item>...</item>
         -->
     </string-array>
@@ -152,8 +152,8 @@
         -->
     </string-array>
 
-    <!-- List of packages that should be whitelisted for slice uri access. Do not translate -->
-    <string-array name="slice_whitelist_package_names" translatable="false"/>
+    <!-- List of packages that should be allowlisted for slice uri access. Do not translate -->
+    <string-array name="slice_allowlist_package_names" translatable="false"/>
 
     <!-- Whether or not App & Notification screen should display recently used apps -->
     <bool name="config_display_recent_apps">true</bool>
@@ -457,9 +457,12 @@
     <!-- Whether nfc detection point preview image is available or not. -->
     <bool name="config_nfc_detection_point">false</bool>
 
-    <!-- Whether to show Enhanced Connectivity switch in Developer Options -->
-    <bool name="config_show_enhanced_connectivity">false</bool>
-
     <!-- Whether to show Smooth Display feature in Settings Options -->
     <bool name="config_show_smooth_display">false</bool>
+
+    <!-- Whether to show panic button gesture in Settings -->
+    <bool name="config_show_panic_gesture_settings">true</bool>
+
+    <!-- Whether to show the Preference for Adaptive connectivity -->
+    <bool name="config_show_adaptive_connectivity">false</bool>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index dc23c3d..799aa22 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -326,8 +326,8 @@
     <!-- Margin for the reset screens -->
     <dimen name="reset_network_margin_start">72dp</dimen>
     <dimen name="reset_network_margin_end">12dp</dimen>
-    <dimen name="reset_master_clear_margin_start">32dp</dimen>
-    <dimen name="reset_master_clear_margin_end">12dp</dimen>
+    <dimen name="reset_main_clear_margin_start">32dp</dimen>
+    <dimen name="reset_main_clear_margin_end">12dp</dimen>
 
     <!-- Padding for the reset screens -->
     <dimen name="reset_checkbox_padding_end">8dp</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4acfde3..ddd0733 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -666,8 +666,8 @@
     <string name="Accounts_settings_title">Accounts</string>
     <!-- Main Settings screen setting option title for the item to take you to the location screen -->
     <string name="location_settings_title">Location</string>
-    <!-- Used in the location settings to control turning on/off the feature entirely -->
-    <string name="location_settings_master_switch_title">Use location</string>
+    <!-- Used in the location settings to control turning on/off the feature entirely [CHAR LIMIT=60] -->
+    <string name="location_settings_primary_switch_title">Use location</string>
     <!-- Summary for Location settings when location is off [CHAR LIMIT=NONE] -->
     <string name="location_settings_summary_location_off">Off</string>
     <!-- Summary for Location settings when location is on, explaining how many apps have location permission [CHAR LIMIT=NONE]-->
@@ -730,6 +730,12 @@
     <string name="security_settings_face_enroll_education_message"></string>
     <!-- Button that takes the user to the enrollment activity [CHAR LIMIT=20] -->
     <string name="security_settings_face_enroll_education_start">Start</string>
+    <!-- Confirmation dialog message shown when users with system accessibility features enabled try to start the non-accessibility version of enrollment [CHAR LIMIT=150] -->
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message">If accessibility face unlock is turned off, some setup steps may not work properly with TalkBack.</string>
+    <!-- Negative button text for users who were shown the accessibility dialog [CHAR LIMIT=10] -->
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative">Go back</string>
+    <!-- Positive button text for users who were shown the accessibility dialog [CHAR LIMIT=20] -->
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive">Continue setup</string>
     <!-- Button shown which shows accessibility toggles for face enrollment when clicked. [CHAR LIMIT=32] -->
     <string name="security_settings_face_enroll_introduction_accessibility">Use accessibility setup</string>
     <!-- Additional details shown when the accessibility toggle is expanded. [CHAR LIMIT=NONE]-->
@@ -1412,9 +1418,6 @@
     <!-- Error shown when in PIN mode and PIN has been used recently. Please keep this string short! -->
     <string name="lockpassword_pin_recently_used">Device admin doesn\'t allow using a recent PIN</string>
 
-    <!-- Error shown when a user is choosing a PIN for their work phone, but what they suggest is blocked by their company's IT administrator. The user should try another PIN that's less common and more complicated. -->
-    <string name="lockpassword_pin_blacklisted_by_admin">Common PINs are blocked by your IT admin. Try a different PIN.</string>
-
     <!-- Error shown when in PASSWORD mode and user enters an invalid character -->
     <string name="lockpassword_illegal_character">This can\'t include an invalid character</string>
 
@@ -1472,9 +1475,6 @@
     <string name="lockpassword_password_recently_used">Device admin doesn\'t allow using a recent
         password</string>
 
-    <!-- Error shown when a user is choosing a PASSWORD for their work phone, but what they suggest is blocked by their company's IT administrator. The user should try another PASSWORD that's less common and more complicated. -->
-    <string name="lockpassword_password_blacklisted_by_admin">Common passwords are blocked by your IT admin. Try a different password.</string>
-
     <!-- [CHAR_LIMIT=NONE] Error shown when the user tries to set an ascending or descending sequence of digits -->
     <string name="lockpassword_pin_no_sequential_digits">Ascending, descending, or repeated sequence
         of digits isn\'t allowed</string>
@@ -1664,7 +1664,7 @@
     <!--  Bluetooth device details. In the confirmation dialog for unpairing a paired device, this is the label on the button that will complete the unpairing action. -->
     <string name="bluetooth_unpair_dialog_forget_confirm_button">Forget device</string>
 
-    <!-- Bluetooth settings.  The title of the screen to pick which profiles to connect to on the device.  For example, headphones may have both A2DP and headset, this allows the user to choose which one he wants to connect to. -->
+    <!-- Bluetooth settings.  The title of the screen to pick which profiles to connect to on the device.  For example, headphones may have both A2DP and headset, this allows the users to choose which one they want to connect to. -->
     <string name="bluetooth_connect_specific_profiles_title">Connect to\u2026</string>
 
     <!-- Bluetooth settings.  Message for disconnecting from the A2DP profile. [CHAR LIMIT=80] -->
@@ -1834,7 +1834,7 @@
     <string name="wifi_settings">Wi\u2011Fi</string>
 
     <!-- Used in the Wi-Fi settings screen to control turning on/off Wi-Fi entirely [CHAR LIMIT=30]-->
-    <string name="wifi_settings_master_switch_title">Use Wi\u2011Fi</string>
+    <string name="wifi_settings_primary_switch_title">Use Wi\u2011Fi</string>
     <!-- Title of the Wi-fi settings screen -->
     <string name="wifi_settings_category">Wi\u2011Fi settings</string>
     <!-- Title of the Wi-fi settings entry in the left top level menu -->
@@ -2059,7 +2059,7 @@
     <!-- Title for the fragment to share Wi-Fi [CHAR LIMIT=50]  -->
     <string name="wifi_dpp_share_wifi">Share Wi\u2011Fi</string>
     <!-- Hint for the user to use another device to scan QR code on screen to join Wi-Fi [CHAR LIMIT=NONE] -->
-    <string name="wifi_dpp_scan_qr_code_with_another_device">Scan this QR code to connect to \u201c<xliff:g id="ssid" example="OfficeWifi">%1$s</xliff:g>\u201d and share the password</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device">Scan this QR code with another device to join \u201c<xliff:g id="ssid" example="OfficeWifi">%1$s</xliff:g>\u201d</string>
     <!-- Hint for the user to use another device to scan QR code on screen to join a open Wi-Fi [CHAR LIMIT=NONE] -->
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device">Scan this QR code to connect to \u201c<xliff:g id="ssid" example="OfficeWifi">%1$s</xliff:g>\u201d</string>
     <!-- Hint for Wi-Fi DPP handshake failure [CHAR LIMIT=NONE]  -->
@@ -2112,9 +2112,7 @@
          when signal of the Wi-Fi network is reachable [CHAR LIMIT=50]  -->
     <string name="wifi_auto_connect_title">Auto\u2011connect</string>
     <!-- Hint for Wi-Fi Auto-connect [CHAR LIMIT=NONE]  -->
-    <string name="wifi_auto_connect_summary" product="default">Allow phone to automatically connect near this network</string>
-    <!-- Hint for Wi-Fi Auto-connect [CHAR LIMIT=NONE]  -->
-    <string name="wifi_auto_connect_summary" product="tablet">Allow tablet to automatically connect near this network</string>
+    <string name="wifi_auto_connect_summary">Allow connection to this network when in range</string>
     <!-- Label for "Use a QR code to add a device to this network" [CHAR LIMIT=50]  -->
     <string name="wifi_dpp_add_device">Add device</string>
     <!-- Hint for "Add device" [CHAR LIMIT=NONE]  -->
@@ -2137,8 +2135,6 @@
     <string name="wifi_do_not_provide_eap_user_cert">Do not provide</string>
     <!-- Menu option for not validating the EAP server -->
     <string name="wifi_do_not_validate_eap_server">Do not validate</string>
-    <!-- Warning message displayed if user choses not to validate the EAP server -->
-    <string name="wifi_do_not_validate_eap_server_warning">No certificate specified. Your connection will not be private.</string>
     <!-- Warning message displayed if network name (ssid) is too long -->
     <string name="wifi_ssid_too_long">Network name is too long.</string>
     <!-- Warning message displayed if user does not specify a domain for the CA certificate.
@@ -2195,6 +2191,8 @@
     <string name="wifi_turned_on_message">Wi\u2011Fi turned on</string>
     <!-- A notification for connected to a Wi-Fi network [CHAR LIMIT=NONE] -->
     <string name="wifi_connected_to_message">Connected to <xliff:g id="network_name" example="MyNetwork">%1$s</xliff:g></string>
+    <!-- A notification for connecting to a Wi-Fi network [CHAR LIMIT=NONE] -->
+    <string name="wifi_connecting_to_message">Connecting to <xliff:g id="network_name" example="MyNetwork">%1$s</xliff:g></string>
     <!-- Button label to connecting progress to a Wi-Fi network [CHAR LIMIT=20] -->
     <string name="wifi_connecting">Connecting\u2026</string>
     <!-- Failured notification for connect -->
@@ -2337,7 +2335,7 @@
     <!-- Label for Wifi hotspot name. -->
     <string name="wifi_hotspot_name_title">Hotspot name</string>
     <!-- Summary for Wifi hotspot name when connection is in progress. -->
-    <string name="wifi_hotspot_name_summary_connecting">Turning on <xliff:g id="wifi_hotspot_name">%1$s</xliff:g>...</string>
+    <string name="wifi_hotspot_name_summary_connecting">Turning on <xliff:g id="wifi_hotspot_name">%1$s</xliff:g>\u2026</string>
     <!-- Summary for Wifi hotspot name when connected. -->
     <string name="wifi_hotspot_name_summary_connected">Other devices can connect to <xliff:g id="wifi_hotspot_name">%1$s</xliff:g></string>
     <!-- Label for Wifi hotspot password. -->
@@ -2753,7 +2751,7 @@
     <!-- Display settings screen, peak refresh rate settings summary [CHAR LIMIT=NONE] -->
     <string name="peak_refresh_rate_summary">Automatically raises the refresh rate from 60 to 90 Hz for some content. Increases battery usage.</string>
     <!-- Display developer settings: Force to the highest refresh rate [CHAR LIMIT=NONE] -->
-    <string name="force_high_refresh_rate_toggle">Smooth Display</string>
+    <string name="force_high_refresh_rate_toggle">Force 90 Hz refresh rate</string>
     <!-- Display developer settings: Force to the highest refresh rate description [CHAR LIMIT=NONE]-->
     <string name="force_high_refresh_rate_desc">Highest refresh rate for improved touch responsiveness &amp; animation quality. Increases battery usage.</string>
     <!-- Display settings screen, setting option name to enable adaptive sleep [CHAR LIMIT=30] -->
@@ -3054,8 +3052,6 @@
     <string name="security_patch">Android security update</string>
     <!-- About phone screen, status item label  [CHAR LIMIT=40] -->
     <string name="model_info">Model</string>
-    <!-- About phone screen, status item summary  [CHAR LIMIT=40] -->
-    <string name="model_summary">Model&#58; %1$s</string>
     <!-- About phone screen, dialog title for showing hardware information such as model, serial number, etc.[CHAR LIMIT=60] -->
     <string name="hardware_info">Model &amp; hardware</string>
     <!-- Label for device's hardware revision value [CHAR LIMIT=40] -->
@@ -3713,29 +3709,29 @@
     <!-- Message of the error message shown when error happens during erase eSIM data [CHAR LIMIT=NONE] -->
     <string name="reset_esim_error_msg">Downloaded SIMs can\u2019t be erased due to an error.\n\nRestart your device and try again.</string>
 
-    <!-- Master Clear -->
-    <!-- Button title to factory data reset the entire device -->
-    <string name="master_clear_title">Erase all data (factory reset)</string>
+    <!-- Main Clear -->
+    <!-- Button title to factory data reset the entire device [CHAR LIMIT=NONE] -->
+    <string name="main_clear_title">Erase all data (factory reset)</string>
     <!-- Button title to factory data reset the entire device. The "(factory reset)" part is optional for translation. [CHAR LIMIT=30 BACKUP_MESSAGE_ID=3531267871084279512]-->
-    <string name="master_clear_short_title">Erase all data (factory reset)</string>
+    <string name="main_clear_short_title">Erase all data (factory reset)</string>
     <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
-    <string name="master_clear_desc" product="tablet">"This will erase all data from your tablet\u2019s <b>internal storage</b>, including:\n\n<li>Your Google Account</li>\n<li>System and app data and settings</li>\n<li>Downloaded apps</li>"</string>
+    <string name="main_clear_desc" product="tablet">"This will erase all data from your tablet\u2019s <b>internal storage</b>, including:\n\n<li>Your Google Account</li>\n<li>System and app data and settings</li>\n<li>Downloaded apps</li>"</string>
     <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
-    <string name="master_clear_desc" product="default">"This will erase all data from your phone\u2019s <b>internal storage</b>, including:\n\n<li>Your Google Account</li>\n<li>System and app data and settings</li>\n<li>Downloaded apps</li>"</string>
+    <string name="main_clear_desc" product="default">"This will erase all data from your phone\u2019s <b>internal storage</b>, including:\n\n<li>Your Google Account</li>\n<li>System and app data and settings</li>\n<li>Downloaded apps</li>"</string>
     <!-- SD card & phone storage settings screen, instructions and list of current accounts.  The list of accounts follows this text[CHAR LIMIT=NONE] -->
-    <string name="master_clear_accounts" product="default">"\n\nYou are currently signed into the following accounts:\n"</string>
+    <string name="main_clear_accounts" product="default">"\n\nYou are currently signed into the following accounts:\n"</string>
     <!-- SD card & phone storage settings screen, notification if other users are present on the device [CHAR LIMIT=NONE] -->
-    <string name="master_clear_other_users_present" product="default">"\n\nThere are other users present on this device.\n"</string>
+    <string name="main_clear_other_users_present" product="default">"\n\nThere are other users present on this device.\n"</string>
     <!-- SD card & phone storage settings screen, list of items in user data storage (USB storage or SD card) that will be erased during this operation [CHAR LIMIT=NONE] -->
-    <string name="master_clear_desc_also_erases_external">"<li>Music</li>\n<li>Photos</li>\n<li>Other user data</li>"</string>
+    <string name="main_clear_desc_also_erases_external">"<li>Music</li>\n<li>Photos</li>\n<li>Other user data</li>"</string>
     <!-- SD card & phone storage settings screen, list of items on an eSIM (embedded SIM) that will be erased during this operation [CHAR LIMIT=NONE] -->
-    <string name="master_clear_desc_also_erases_esim">"<li>eSIMs</li>"</string>
+    <string name="main_clear_desc_also_erases_esim">"<li>eSIMs</li>"</string>
     <!-- SD card & phone storage settings screen, notification if there are eSIM (embedded SIM) profiles present that the user's mobile service plan will not be canceled [CHAR LIMIT=NONE] -->
-    <string name="master_clear_desc_no_cancel_mobile_plan">"\n\nThis will not cancel your mobile service plan.</string>
+    <string name="main_clear_desc_no_cancel_mobile_plan">"\n\nThis will not cancel your mobile service plan.</string>
     <!-- SD card & phone storage settings screen, instructions about whether to also erase the external storage (SD card) when erasing the internal storage [CHAR LIMIT=NONE] -->
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard">"\n\nTo clear music, pictures, and other user data, the <b>USB storage</b> needs to be erased."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard">"\n\nTo clear music, pictures, and other user data, the <b>USB storage</b> needs to be erased."</string>
     <!-- SD card & phone storage settings screen, instructions about whether to also erase the external storage (SD card) when erasing the internal storage [CHAR LIMIT=NONE] -->
-    <string name="master_clear_desc_erase_external_storage" product="default">"\n\nTo clear music, pictures, and other user data, the <b>SD card</b> needs to be erased."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default">"\n\nTo clear music, pictures, and other user data, the <b>SD card</b> needs to be erased."</string>
     <!-- SD card & phone storage settings screen, label for check box to erase USB storage [CHAR LIMIT=30] -->
     <string name="erase_external_storage" product="nosdcard">Erase USB storage</string>
     <!-- SD card & phone storage settings screen, label for check box to erase SD card [CHAR LIMIT=30] -->
@@ -3744,26 +3740,22 @@
     <string name="erase_external_storage_description" product="nosdcard">Erase all the data on the internal USB storage, such as music or photos</string>
     <!-- SD card & phone storage settings screen, description for check box to erase USB storage [CHAR LIMIT=NONE] -->
     <string name="erase_external_storage_description" product="default">Erase all the data on the SD card, such as music or photos</string>
-    <!-- SD card & phone storage settings screen, button on screen after user selects Factory data reset -->
-    <string name="master_clear_button_text" product="tablet">Erase all data</string>
-    <!-- SD card & phone storage settings screen, button on screen after user selects Factory data reset -->
-    <string name="master_clear_button_text" product="default">Erase all data</string>
-    <!-- SD card & phone storage settings screen, message on screen after user selects Reset phone button -->
-    <string name="master_clear_final_desc">All of your personal information and downloaded apps will be deleted. You can\u2019t undo this action.</string>
+    <!-- SD card & phone storage settings screen, button on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+    <string name="main_clear_button_text" product="tablet">Erase all data</string>
+    <!-- SD card & phone storage settings screen, button on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+    <string name="main_clear_button_text" product="default">Erase all data</string>
     <!-- SD card & phone storage settings screen, message on screen after user selects Reset phone button [CHAR LIMIT=NONE] -->
-    <string name="master_clear_final_desc_esim">All of your personal information, including downloaded apps &amp; SIMs, will be deleted. You can\u2019t undo this action.</string>
-    <!-- SD card & phone storage settings screen, button on screen after user selects Reset phone button -->
-    <string name="master_clear_final_button_text">Erase everything</string>
-    <!-- Master clear failed message -->
-    <string name="master_clear_failed">No reset was performed because the System Clear service isn\u2019t available.</string>
-    <!-- Master clear confirmation screen title [CHAR LIMIT=33] -->
-    <string name="master_clear_confirm_title">Erase all data?</string>
+    <string name="main_clear_final_desc">All of your personal information and downloaded apps will be deleted. You can\u2019t undo this action.</string>
+    <!-- SD card & phone storage settings screen, message on screen after user selects Reset phone button [CHAR LIMIT=NONE] -->
+    <string name="main_clear_final_desc_esim">All of your personal information, including downloaded apps &amp; SIMs, will be deleted. You can\u2019t undo this action.</string>
+    <!-- Main clear confirmation screen title [CHAR LIMIT=33] -->
+    <string name="main_clear_confirm_title">Erase all data?</string>
     <!-- Error message for users that aren't allowed to factory reset [CHAR LIMIT=none] -->
-    <string name="master_clear_not_available">Factory reset is not available for this user</string>
-    <!-- Master clear progress screen title [CHAR LIMIT=30] -->
-    <string name="master_clear_progress_title" >Erasing</string>
-    <!-- Master clear progress screen text [CHAR LIMIT=75] -->
-    <string name="master_clear_progress_text">Please wait...</string>
+    <string name="main_clear_not_available">Factory reset is not available for this user</string>
+    <!-- Main clear progress screen title [CHAR LIMIT=30] -->
+    <string name="main_clear_progress_title" >Erasing</string>
+    <!-- Main clear progress screen text [CHAR LIMIT=75] -->
+    <string name="main_clear_progress_text">Please wait\u2026</string>
 
     <!-- Main settings screen, Call settings title for item to go into the call settings -->
     <string name="call_settings_title">Call settings</string>
@@ -3870,7 +3862,7 @@
     <!-- Label for ethernet tether checkbox [CHAR LIMIT=NONE]-->
     <string name="ethernet_tether_checkbox_text">Ethernet tethering</string>
     <!-- Ethernet Tethering subtext [CHAR LIMIT=NONE]-->
-    <string name="ethernet_tethering_subtext" product="default">Share phone\u2019s internet connection via USB Ethernet</string>
+    <string name="ethernet_tethering_subtext" product="default">Share phone\u2019s internet connection via Ethernet</string>
 
     <!-- Tethering footer info [CHAR LIMIT=NONE]-->
     <string name="tethering_footer_info">Use hotspot and tethering to provide internet to other devices through your mobile data connection. Apps can also create a hotspot to share content with nearby devices.</string>
@@ -4125,22 +4117,22 @@
     <!-- Text for button that the user should tap when they forgot their work profile PIN [CHAR LIMIT=40] -->
     <string name="lockpassword_forgot_pin">Forgot your PIN?</string>
 
-    <!-- Message to be used to explain the user that he needs to enter his pattern to continue a
+    <!-- Message to be used to explain the users that they need to enter their pattern to continue a
          particular operation. [CHAR LIMIT=70]-->
     <string name="lockpassword_confirm_your_pattern_generic">Use your device pattern to continue</string>
-    <!-- Message to be used to explain the user that he needs to enter his PIN to continue a
+    <!-- Message to be used to explain the users that they need to enter their PIN to continue a
          particular operation. [CHAR LIMIT=70]-->
     <string name="lockpassword_confirm_your_pin_generic">Enter your device PIN to continue</string>
-    <!-- Message to be used to explain the user that he needs to enter his password to continue a
+    <!-- Message to be used to explain the users that they need to enter their password to continue a
          particular operation. [CHAR LIMIT=70]-->
     <string name="lockpassword_confirm_your_password_generic">Enter your device password to continue</string>
-    <!-- Message to be used to explain the user that he needs to enter his work pattern to continue a
+    <!-- Message to be used to explain the users that they need to enter their work pattern to continue a
          particular operation. [CHAR LIMIT=70]-->
     <string name="lockpassword_confirm_your_pattern_generic_profile">Use your work pattern to continue</string>
-    <!-- Message to be used to explain the user that he needs to enter his work PIN to continue a
+    <!-- Message to be used to explain the users that they need to enter their work PIN to continue a
          particular operation. [CHAR LIMIT=70]-->
     <string name="lockpassword_confirm_your_pin_generic_profile">Enter your work PIN to continue</string>
-    <!-- Message to be used to explain the user that he needs to enter his work password to continue a
+    <!-- Message to be used to explain the users that they need to enter their work password to continue a
          particular operation. [CHAR LIMIT=70]-->
     <string name="lockpassword_confirm_your_password_generic_profile">Enter your work password to continue</string>
 
@@ -4231,9 +4223,9 @@
     <string name="lockpattern_settings_enable_title">Require pattern</string>
     <!-- Security & location settings screen, setting summary for the checkbox "Require pattern" -->
     <string name="lockpattern_settings_enable_summary">Must draw pattern to unlock screen</string>
-    <!-- Security & location settings screen, setting check box title. This setting controls whether a visible green line is drawn as the user moves his finger around while drawing the unlock pattern.  If checked, this line is drawn.  If unchecked, there is nothing drawn so the user does not reveal his pattern while he unlocks the phone.-->
+    <!-- Security & location settings screen, setting check box title. This setting controls whether a visible green line is drawn as the users move their finger around while drawing the unlock pattern.  If checked, this line is drawn.  If unchecked, there is nothing drawn so the users do not reveal their pattern while they unlock the phone.-->
     <string name="lockpattern_settings_enable_visible_pattern_title">Make pattern visible</string>
-    <!-- Security & location settings screen, setting check box title. This setting controls whether a visible green line is drawn as the user moves his finger around while drawing the profile unlock pattern.  If checked, this line is drawn.  If unchecked, there is nothing drawn so the user does not reveal his pattern while he unlocks the profile.-->
+    <!-- Security & location settings screen, setting check box title. This setting controls whether a visible green line is drawn as the users move their finger around while drawing the profile unlock pattern.  If checked, this line is drawn.  If unchecked, there is nothing drawn so the users do not reveal their pattern while they unlock the profile.-->
     <string name="lockpattern_settings_enable_visible_pattern_title_profile">Make profile pattern visible</string>
     <!-- Security & location settings screen, setting check box title. This setting controls whether tactile feedback will be produced when the user draws the pattern.-->
     <string name="lockpattern_settings_enable_tactile_feedback_title">Vibrate on tap</string>
@@ -4674,7 +4666,7 @@
     <string name="auto_replace">Auto-replace</string>
     <!-- On Text & language settings screen, setting summary.  This is the summary for the "Auto-replace" setting. -->
     <string name="auto_replace_summary">Correct mistyped words</string>
-    <!-- On Text & language settings screen, setting option name.  title of the setting to enable autocapitalization of entered text.  for example, after the user finishes a sentence, the next letter he types will automatically be capitalizated. [CHAR LIMIT=25] -->
+    <!-- On Text & language settings screen, setting option name.  title of the setting to enable autocapitalization of entered text.  For example, after the users finish a sentence, the next letter they type will automatically be capitalized. [CHAR LIMIT=25] -->
     <string name="auto_caps">Auto-capitalization</string>
     <!-- On Text & language settings screen, setting summary. Summary for the Auto-cap setting. [CHAR LIMIT=100]-->
     <string name="auto_caps_summary">Capitalize first letter in sentences</string>
@@ -4909,8 +4901,6 @@
     <string name="accessibility_screen_magnification_title">Magnification</string>
     <!-- Title for the accessibility preference screen to edit magnification area. [CHAR LIMIT=35] -->
     <string name="accessibility_magnification_mode_title">Magnification area</string>
-    <!-- Title for the accessibility preference screen to edit magnification enable mode. [CHAR LIMIT=35] -->
-    <string name="accessibility_magnification_enable_mode_title">Magnification enable</string>
     <!-- Message for the accessibility preference screen to edit magnification area dialog. [CHAR LIMIT=none] -->
     <string name="accessibility_magnification_area_settings_message">Choose the magnification area(s) you want to use when magnifying the screen</string>
     <!-- Summary for the accessibility preference screen to edit full screen. [CHAR LIMIT=none] -->
@@ -4923,6 +4913,14 @@
     <string name="accessibility_magnification_area_settings_full_screen">Magnify entire screen</string>
     <!-- Message for the accessibility preference screen to edit part of screen. [CHAR LIMIT=none] -->
     <string name="accessibility_magnification_area_settings_window_screen">Magnify part of screen</string>
+    <!-- Title for the accessibility magnification switch shortcut dialog. [CHAR LIMIT=48] -->
+    <string name="accessibility_magnification_switch_shortcut_title">Switch to accessibility button?</string>
+    <!-- Message for the accessibility magnification switch shortcut dialog. [CHAR LIMIT=none] -->
+    <string name="accessibility_magnification_switch_shortcut_message">Using triple tap to magnify part of the screen will cause typing and other actions to be delayed.\n\nDo you want to switch to using accessibility button to magnify?</string>
+    <!-- Title for the switch shortcut button in accessibility switch shortcut dialog to change the config shortcut value. [CHAR LIMIT=45] -->
+    <string name="accessibility_magnification_switch_shortcut_positive_button">Switch to accessibility button</string>
+    <!-- Title for the cancel button in accessibility switch shortcut dialog to keep the config shortcut value. [CHAR LIMIT=54] -->
+    <string name="accessibility_magnification_switch_shortcut_negative_button">Keep triple tap to magnify</string>
     <!-- Title for the accessibility preference screen to enable screen magnification settings. [CHAR LIMIT=35] -->
     <string name="accessibility_magnification_service_settings_title">Magnification settings</string>
     <!-- Title for the accessibility preference screen to enable triple-tap gesture screen magnification. [CHAR LIMIT=35] -->
@@ -5045,16 +5043,16 @@
     <string name="accessibility_toggle_large_pointer_icon_title">Large mouse pointer</string>
     <!-- Title for the accessibility preference for disabling animations. [CHAR LIMIT=35] -->
     <string name="accessibility_disable_animations">Remove animations</string>
-    <!-- Title for the accessibility preference for master mono. [CHAR LIMIT=35] -->
-    <string name="accessibility_toggle_master_mono_title">Mono audio</string>
-    <!-- Summary for the accessibility preference for master mono. [CHAR LIMIT=50] -->
-    <string name="accessibility_toggle_master_mono_summary">Combine channels when playing audio</string>
-    <!-- Title for the accessibility preference for master balance. [CHAR LIMIT=35] -->
-    <string name="accessibility_toggle_master_balance_title">Audio balance</string>
-    <!-- 'Left' balance text for the accessibility preference for master balance. [CHAR LIMIT=20] -->
-    <string name="accessibility_toggle_master_balance_left_label">Left</string>
-    <!-- 'Right' balance text for the accessibility preference for master balance. [CHAR LIMIT=20] -->
-    <string name="accessibility_toggle_master_balance_right_label">Right</string>
+    <!-- Title for the accessibility preference for primary mono. [CHAR LIMIT=35] -->
+    <string name="accessibility_toggle_primary_mono_title">Mono audio</string>
+    <!-- Summary for the accessibility preference for primary mono. [CHAR LIMIT=50] -->
+    <string name="accessibility_toggle_primary_mono_summary">Combine channels when playing audio</string>
+    <!-- Title for the accessibility preference for primary balance. [CHAR LIMIT=35] -->
+    <string name="accessibility_toggle_primary_balance_title">Audio balance</string>
+    <!-- 'Left' balance text for the accessibility preference for primary balance. [CHAR LIMIT=20] -->
+    <string name="accessibility_toggle_primary_balance_left_label">Left</string>
+    <!-- 'Right' balance text for the accessibility preference for primary balance. [CHAR LIMIT=20] -->
+    <string name="accessibility_toggle_primary_balance_right_label">Right</string>
 
     <!-- Option heading to leave the timeout requirement for accessibility users at its default level. [CHAR LIMIT=35] -->
     <string name="accessibility_timeout_default">Default</string>
@@ -5124,16 +5122,16 @@
     <string name="accessibility_ring_vibration_title">Ring vibration</string>
     <!-- Title for accessibility preference for configuring touch feedback vibrations. -->
     <string name="accessibility_touch_vibration_title">Touch feedback</string>
-    <!-- Used in the accessibility service settings to control turning on/off the service entirely -->
-    <string name="accessibility_service_master_switch_title">Use <xliff:g id="accessibility_app_name" example="TalkBack">%1$s</xliff:g></string>
+    <!-- Used in the accessibility service settings to control turning on/off the service entirely [CHAR LIMIT=60] -->
+    <string name="accessibility_service_primary_switch_title">Use <xliff:g id="accessibility_app_name" example="TalkBack">%1$s</xliff:g></string>
     <!-- Used in the accessibility service settings to open the activity. [CHAR LIMIT=NONE] -->
-    <string name="accessibility_service_master_open_title">Open <xliff:g id="accessibility_app_name" example="TalkBack">%1$s</xliff:g></string>
-    <!-- Used in the Color correction settings screen to control turning on/off the feature entirely -->
-    <string name="accessibility_daltonizer_master_switch_title">Use color correction</string>
-    <!-- Title for Captions settings screen to control turning on/off the feature entirely -->
-    <string name="accessibility_caption_master_switch_title">Show captions</string>
+    <string name="accessibility_service_primary_open_title">Open <xliff:g id="accessibility_app_name" example="TalkBack">%1$s</xliff:g></string>
+    <!-- Used in the Color correction settings screen to control turning on/off the feature entirely [CHAR LIMIT=60] -->
+    <string name="accessibility_daltonizer_primary_switch_title">Use color correction</string>
+    <!-- Title for Captions settings screen to control turning on/off the feature entirely [CHAR LIMIT=60] -->
+    <string name="accessibility_caption_primary_switch_title">Show captions</string>
     <!-- Summary for Captions settings screen to control turning on/off the feature entirely [CHAR LIMIT=NONE] -->
-    <string name="accessibility_caption_master_switch_summary">For supported app only</string>
+    <string name="accessibility_caption_primary_switch_summary">For supported app only</string>
     <!-- Title for Caption preference settings screen for configuring font style. [CHAR LIMIT=NONE] -->
     <string name="captioning_caption_appearance_title">Caption size and style</string>
     <!-- Summary for Captions settings, explaining important settings under it. [CHAR LIMIT=NONE] -->
@@ -5192,6 +5190,8 @@
     <string name="daltonizer_mode_protanomaly_title">Protanomaly</string>
     <!-- Title shown for tritanomaly (blue-yellow color blindness) [CHAR LIMIT=45] -->
     <string name="daltonizer_mode_tritanomaly_title">Tritanomaly</string>
+    <!-- Title shown for grayscale [CHAR LIMIT=45] -->
+    <string name="daltonizer_mode_grayscale_title">Grayscale</string>
     <!-- Summary shown for deuteranomaly (red-green color blindness) [CHAR LIMIT=45] -->
     <string name="daltonizer_mode_deuteranomaly_summary">Red-green</string>
     <!-- Summary shown for protanomaly (red-green color blindness) [CHAR LIMIT=45] -->
@@ -5345,17 +5345,17 @@
     <string name="secure_lock_encryption_warning">Because you\u2019ve turned on an accessibility service,
         your device won’t use your screen lock to enhance data encryption.</string>
 
-    <!-- Message to the user to enter his pattern before enabling an accessibility service. [CHAR LIMIT=NONE] -->
+    <!-- Message to the users to enter their pattern before enabling an accessibility service. [CHAR LIMIT=NONE] -->
     <string name="enable_service_pattern_reason">Because turning on <xliff:g id="service"
         example="TalkBack">%1$s</xliff:g> affects data encryption, you need to confirm your pattern.
     </string>
 
-    <!-- Message to the user to enter his PIN before enabling an accessibility service. [CHAR LIMIT=NONE] -->
+    <!-- Message to the users to enter their PIN before enabling an accessibility service. [CHAR LIMIT=NONE] -->
     <string name="enable_service_pin_reason">Because turning on <xliff:g id="service"
         example="TalkBack">%1$s</xliff:g> affects data encryption, you need to confirm your PIN.
     </string>
 
-    <!-- Message to the user to enter his password before enabling an accessibility service. [CHAR LIMIT=NONE] -->
+    <!-- Message to the users to enter their password before enabling an accessibility service. [CHAR LIMIT=NONE] -->
     <string name="enable_service_password_reason">Because turning on <xliff:g id="service"
         example="TalkBack">%1$s</xliff:g> affects data encryption, you need to confirm your password.
     </string>
@@ -5535,8 +5535,8 @@
     <string name="background_activity_summary">Allow the app to run in the background</string>
     <!-- Summary for the background activity when it is disabled [CHAR_LIMIT=120] -->
     <string name="background_activity_summary_disabled">App not allowed to run in background</string>
-    <!-- TODO: Pending UX review. Summary for the background activity when it is whitlisted [CHAR_LIMIT=120] -->
-    <string name="background_activity_summary_whitelisted">Background usage can\u2019t be restricted</string>
+    <!-- TODO: Pending UX review. Summary for the background activity when it is allowlisted [CHAR_LIMIT=120] -->
+    <string name="background_activity_summary_allowlisted">Background usage can\u2019t be restricted</string>
     <!-- TODO: Pending UX review. Title for the warning dialog to show to the user when limiting background activity for an app -->
     <string name="background_activity_warning_dialog_title">Limit background activity?</string>
     <!-- TODO: Pending UX review. Text for the warning dialog to show to the user when limiting background activity for an app -->
@@ -6005,11 +6005,11 @@
     <string name="battery_saver_sticky_title_new">Turn off when charged</string>
 
     <!-- Battery Saver: Description for sticky battery saver preference [CHAR_LIMIT=NONE] -->
-    <string name="battery_saver_sticky_description_new" product="default">Battery Saver turns off when your phone is at <xliff:g id="percent" example="90%">%1$s</xliff:g></string>
+    <string name="battery_saver_sticky_description_new" product="default">Battery Saver turns off when your phone charges above <xliff:g id="percent" example="90%">%1$s</xliff:g></string>
     <!-- Battery Saver: Description for sticky battery saver preference [CHAR_LIMIT=NONE] -->
-    <string name="battery_saver_sticky_description_new" product="tablet">Battery Saver turns off when your tablet is at <xliff:g id="percent" example="90%">%1$s</xliff:g></string>
+    <string name="battery_saver_sticky_description_new" product="tablet">Battery Saver turns off when your tablet charges above <xliff:g id="percent" example="90%">%1$s</xliff:g></string>
     <!-- Battery Saver: Description for sticky battery saver preference [CHAR_LIMIT=NONE] -->
-    <string name="battery_saver_sticky_description_new" product="device">Battery Saver turns off when your device is at <xliff:g id="percent" example="90%">%1$s</xliff:g></string>
+    <string name="battery_saver_sticky_description_new" product="device">Battery Saver turns off when your device charges above <xliff:g id="percent" example="90%">%1$s</xliff:g></string>
 
     <!-- Battery saver: Label for seekbar to change battery saver threshold [CHAR_LIMIT=40] -->
     <string name="battery_saver_seekbar_title"><xliff:g id="percent">%1$s</xliff:g></string>
@@ -6178,6 +6178,11 @@
     <!-- Title of preference to enter the VPN settings activity -->
     <string name="vpn_settings_title">VPN</string>
 
+    <!-- Title of Adaptive connectivity. Adaptive connectivity is a feature which automatically manages network connections for better battery life and performance. [CHAR LIMIT=60] -->
+    <string name="adaptive_connectivity_title">Adaptive connectivity</string>
+    <!-- Summary of Adaptive connectivity preference. [CHAR LIMIT=NONE] -->
+    <string name="adaptive_connectivity_summary">Extends battery life and improves device performance by automatically managing your network connections</string>
+
     <!-- Title of preference group for credential storage settings [CHAR LIMIT=30] -->
     <string name="credentials_title">Credential storage</string>
     <!-- Title of preference to install certificates [CHAR LIMIT=30] -->
@@ -6200,12 +6205,6 @@
     <string name="user_credentials_summary">View and modify stored credentials</string>
     <!-- Title of preference group for advance security settings [CHAR LIMIT=30] -->
     <string name="advanced_security_title">Advanced</string>
-    <!-- Title of preference of what type of credential storage this device has: hardware or software [CHAR LIMIT=30] -->
-    <string name="credential_storage_type">Storage type</string>
-    <!-- Summary text for preference showing what type of credential storage this device has when it is stored in a hardware-backed storage (as opposed to "software only") [CHAR LIMIT=NONE] -->
-    <string name="credential_storage_type_hardware">Hardware-backed</string>
-    <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
-    <string name="credential_storage_type_software">Software only</string>
     <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
     <string name="credentials_settings_not_available">Credentials are not available for this user</string>
     <!-- Sub-heading for a user credential installed to be used by apps and as part of VPN configurations. [CHAR LIMIT=NONE] -->
@@ -7061,10 +7060,10 @@
     <string name="nfc_how_it_works_title">Paying at the terminal</string>
     <!-- Content for text explaning how to pay at a payment terminal in a store -->
     <string name="nfc_how_it_works_content">Set up a payment app. Then just hold the back of your phone up to any terminal with the contactless symbol.</string>
-    <!-- Button the user can click to indicate he understood and dismiss the screen -->
+    <!-- Button the users can click to indicate they understood and dismiss the screen -->
     <string name="nfc_how_it_works_got_it">Got it</string>
     <!-- NFC More... title.  [CHAR LIMIT=40] -->
-    <string name="nfc_more_title">More...</string>
+    <string name="nfc_more_title">More\u2026</string>
     <!-- Label for the dialog that is shown when the user is asked to set a
          preferred payment application -->
     <string name="nfc_payment_set_default_label">Set default payment app</string>
@@ -7424,7 +7423,7 @@
     <!-- Message for selecting sim for SMS in settings.  [CHAR LIMIT=40] -->
     <string name="select_sim_for_sms">Select a SIM for SMS</string>
     <!-- Message for switching data SIM; switching takes a while -->
-    <string name="data_switch_started">Switching data SIM, this may take up to a minute...</string>
+    <string name="data_switch_started">Switching data SIM, this may take up to a minute\u2026</string>
     <!-- Message for selecting sim for call in settings.  [CHAR LIMIT=40] -->
     <string name="select_sim_for_calls">Call with</string>
     <!-- Title for selecting a SIM card.  [CHAR LIMIT=40] -->
@@ -7700,6 +7699,9 @@
     <!-- List of synonyms for add language, used to match in settings search [CHAR LIMIT=NONE] -->
     <string name="keywords_add_language">add language, add a language</string>
 
+    <!-- List of synonyms for the font size, used to match in settings search [CHAR LIMIT=NONE] -->
+    <string name="keywords_font_size">text size</string>
+
     <!-- Option title for the default sound, context based on screen -->
     <string name="default_sound">Default sound</string>
 
@@ -7824,14 +7826,14 @@
     <!-- Setting summary for controlling how caption text display in real time [CHAR LIMIT=NONE]-->
     <string name="live_caption_summary">Automatically caption media</string>
 
-    <!-- Sound: Summary for the Do not Disturb option when there are no automatic rules enabled. [CHAR LIMIT=NONE]-->
-    <string name="zen_mode_settings_summary_off">None</string>
-
-    <!-- Sound: Summary for the Do not Disturb option when at least one automatic rule is enabled. [CHAR LIMIT=NONE]-->
-    <plurals name="zen_mode_settings_summary_on">
-        <item quantity="one">1 schedule set</item>
-        <item quantity="other"><xliff:g id="on_count" example="10">%d</xliff:g> schedules set</item>
-    </plurals>
+    <!-- Sound: Summary for the Do not Disturb option that describes how many automatic rules (schedules) are enabled [CHAR LIMIT=NONE]-->
+    <string name="zen_mode_settings_schedules_summary">
+        {count, plural,
+            =0    {None}
+            =1    {1 schedule set}
+            other {# schedules set}
+        }
+    </string>
 
     <!-- Sound: Title for the Do not Disturb option and associated settings page. [CHAR LIMIT=50]-->
     <string name="zen_mode_settings_title">Do Not Disturb</string>
@@ -8004,12 +8006,6 @@
     <!-- Sound settings screen, summary format of do not disturb when on with extra info. [CHAR LIMIT=NONE] -->
     <string name="zen_mode_sound_summary_on_with_info">On / <xliff:g name="dnd_summary" example="No sound except alarms and media">%1$s</xliff:g></string>
 
-    <!-- Sound settings screen, summary format of do not disturb when off with extra information. [CHAR LIMIT=NONE] -->
-    <string name="zen_mode_sound_summary_off_with_info">Off / <xliff:g name="dnd_summary" example="1 schedule can turn on automatically">%1$s</xliff:g></string>
-
-    <!-- Sound settings screen, summary format of do not disturb when off with no extra information. [CHAR LIMIT=NONE] -->
-    <string name="zen_mode_sound_summary_off">Off</string>
-
     <!-- Sound settings screen, summary format of do not disturb when on with no extra information. [CHAR LIMIT=NONE] -->
     <string name="zen_mode_sound_summary_on">On</string>
 
@@ -8020,19 +8016,29 @@
     <string name="zen_mode_duration_summary_forever">Until you turn off</string>
 
     <!--  Do not disturb: Summary for zen mode duration setting indicating how long dnd will last when dnd is manually toggled on [CHAR LIMIT=NONE] -->
-    <plurals name="zen_mode_duration_summary_time_hours">
-        <item quantity="one">1 hour</item>
-        <item quantity="other"><xliff:g id="num_hours" example="3">%d</xliff:g> hours</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours">
+        {count, plural,
+            =1    {1 hour}
+            other {# hours}
+        }
+    </string>
 
     <!--  Do not disturb: Summary for zen mode duration setting indicating how long dnd will last when toggled on -->
-    <string name="zen_mode_duration_summary_time_minutes"><xliff:g id="num_minutes" example="5">%d</xliff:g> minutes</string>
+    <string name="zen_mode_duration_summary_time_minutes">
+        {count, plural,
+            =1    {1 minute}
+            other {# minutes}
+        }
+    </string>
 
-    <!-- Summary for the Sound Do not Disturb option when at least one automatic rules is enabled. [CHAR LIMIT=NONE]-->
-    <plurals name="zen_mode_sound_summary_summary_off_info">
-        <item quantity="one">1 schedule can turn on automatically</item>
-        <item quantity="other"><xliff:g id="on_count" example="3">%d</xliff:g> schedules can turn on automatically</item>
-    </plurals>
+    <!-- Summary for the Sound Do not Disturb option when DND isn't currently on. [CHAR LIMIT=NONE]-->
+    <string name="zen_mode_sound_summary_off">
+        {count, plural,
+            =0    {Off}
+            =1    {Off / 1 schedule can turn on automatically}
+            other {Off / # schedules can turn on automatically}
+        }
+    </string>
 
     <!-- Do not disturb settings, main screen, category header [CHAR LIMIT=120]-->
     <string name="zen_category_behavior">What can interrupt Do Not Disturb</string>
@@ -8169,6 +8175,12 @@
     <!-- Configure Notifications: setting summary [CHAR LIMIT=200] -->
     <string name="asst_capability_ranking_summary">Automatically rank notifications by relevance</string>
 
+    <!-- Configure Notifications: setting title [CHAR LIMIT=80 BACKUP_MESSAGE_ID=6691908606916292167] -->
+    <string name="asst_feedback_indicator_title">Adaptive notification feedback</string>
+
+    <!-- Configure Notifications: setting summary [CHAR LIMIT=200] -->
+    <string name="asst_feedback_indicator_summary">Indicate adjustments made to notifications and show the option to provide feedback to the system</string>
+
     <!-- Configure Notifications: setting title [CHAR LIMIT=80] -->
     <string name="asst_capabilities_actions_replies_title">Suggested actions and replies</string>
 
@@ -8211,7 +8223,7 @@
     <!-- Configure Notifications: setting summary [CHAR LIMIT=NONE] -->
     <string name="hide_silent_icons_summary">Icons from gentle notifications aren\'t shown in the status bar</string>
 
-    <!-- Configure Notifications: Title for the notification badging option. [CHAR LIMIT=30 BACKUP_MESSAGE_ID=5125022693565388760] -->
+    <!-- Configure Notifications: Title for the notification badging option. [CHAR LIMIT=50 BACKUP_MESSAGE_ID=5125022693565388760] -->
     <string name="notification_badging_title">Notification dot on app icon</string>
 
     <!-- Configure Notifications: Title for the people notification strip option. [CHAR LIMIT=60] -->
@@ -8304,7 +8316,7 @@
     <!-- Configure Notifications: Title for the pulse notification light option. [CHAR LIMIT=30] -->
     <string name="notification_pulse_title">Blink light</string>
 
-    <!-- Configure Notifications: 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=60] -->
     <string name="lock_screen_notifications_title">Notifications on lock screen</string>
 
     <!-- Configure lock screen: Title for the option of unlocking directly to home. [CHAR LIMIT=30] -->
@@ -8777,7 +8789,7 @@
     <string name="zen_access_empty_text">No installed apps have requested Do Not Disturb access</string>
 
     <!-- [CHAR LIMIT=NONE] Text when loading app list in notification settings -->
-    <string name="loading_notification_apps">Loading apps...</string>
+    <string name="loading_notification_apps">Loading apps\u2026</string>
 
     <!-- [CHAR LIMIT=NONE] Text appearing when app notifications are off -->
     <string name="app_notifications_off_desc">At your request, Android is blocking this app\'s notifications from appearing on this device</string>
@@ -9025,12 +9037,14 @@
     <string name="zen_mode_from_all_conversations">All conversations</string>
     <string name="zen_mode_from_important_conversations">Priority conversations</string>
     <string name="zen_mode_from_no_conversations">None</string>
-    <plurals name="zen_mode_conversations_count">
-        <item quantity="one">1 conversation</item>
-        <item quantity="other"><xliff:g id="conversations" example="3">%d</xliff:g> conversations</item>
-    </plurals>
-    <!-- [CHAR LIMIT=40] Zen mode settings: No conversations are allowed to bypass DND -->
-    <string name="zen_mode_conversations_count_none">None</string>
+    <!-- [CHAR LIMIT=NONE] Zen mode settings: Number of conversations allowed to bypass DND -->
+    <string name="zen_mode_conversations_count">
+        {count, plural,
+            =0    {None}
+            =1    {1 conversation}
+            other {# conversations}
+        }
+    </string>
     <!-- [CHAR LIMIT=120] Zen mode settings: Header for calls and messages section of conversations
     setting page -->
     <string name="zen_mode_people_calls_messages_section_title">Who can interrupt</string>
@@ -9051,12 +9065,15 @@
     <!-- [CHAR LIMIT=50] Zen mode settings: Starred contacts preference title -->
     <string name="zen_mode_starred_contacts_title">Starred contacts</string>
     <!-- Zen mode settings: Starred contacts summary [CHAR LIMIT=NONE] -->
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts">
-        <item quantity="one">1 other</item>
-        <item quantity="other"><xliff:g id="num_people" example="3">%d</xliff:g> others</item>
-    </plurals>
-    <!-- [CHAR LIMIT=40] Zen mode settings: Starred contacts summary when there are no starred contacts -->
-    <string name="zen_mode_starred_contacts_summary_none">None</string>
+    <string name="zen_mode_starred_contacts_summary_contacts">
+        {count, plural, offset:2
+            =0    {None}
+            =1    {{contact_1}}
+            =2    {{contact_1} and {contact_2}}
+            =3    {{contact_1}, {contact_2}, and {contact_3}}
+            other {{contact_1}, {contact_2}, and # others}
+        }
+    </string>
 
     <!-- [CHAR LIMIT=40] Zen mode settings: Messages option -->
     <string name="zen_mode_messages">Messages</string>
@@ -9075,15 +9092,14 @@
     <string name="zen_mode_all_messages_summary">All messages can reach you</string>
     <!-- Zen mode settings: All calls can bypass DND summary [CHAR LIMIT=NONE -->
     <string name="zen_mode_all_calls_summary">All calls can reach you</string>
-
-    <!-- Zen mode settings: There are no contacts on the device [CHAR LIMIT=NONE] -->
-    <string name="zen_mode_contacts_count_none">None</string>
     <!-- Zen mode settings: Senders in contacts can bypass DND summary summary [CHAR LIMIT=NONE] -->
-    <plurals name="zen_mode_contacts_count">
-        <item quantity="one">1 contact</item>
-        <item quantity="other"><xliff:g id="num_contacts" example="120">%d</xliff:g> contacts</item>
-    </plurals>
-
+    <string name="zen_mode_contacts_count">
+        {count, plural,
+            =0    {None}
+            =1    {1 contact}
+            other {# contacts}
+        }
+    </string>
     <!-- [CHAR LIMIT=40] Zen mode settings: Calls or messages option value: From anyone -->
     <string name="zen_mode_from_anyone">Anyone</string>
     <!-- [CHAR LIMIT=40] Zen mode settings: Calls or messages option value: From contacts only -->
@@ -9168,14 +9184,16 @@
     <string name="zen_mode_bypassing_apps_summary_some">Some notifications</string>
     <!-- [CHAR LIMIT=NONE] Zen mode settings: Footer for DND bypassing apps settings -->
     <string name="zen_mode_bypassing_apps_footer">Selected people can still reach you, even if you don\u2019t allow apps to interrupt</string>
-    <!-- [CHAR LIMIT=120] Zen mode settings: Allow apps to bypass DND -->
-    <plurals name="zen_mode_bypassing_apps_subtext">
-        <item quantity="one"><xliff:g id="app_name" example="Nest">%s</xliff:g> can interrupt</item>
-        <item quantity="other"><xliff:g id="app_names" example="Nest and Google Play Store">%s</xliff:g> can interrupt</item>
-    </plurals>
-    <!-- [CHAR LIMIT=30] Zen mode settings: List item in a summary indicating additional apps are
-     allowed to bypass Do Not Disturb. For example, "Nest, Messages, and 2 more can interrupt". -->
-    <string name="zen_mode_apps_bypassing_list_count"><xliff:g id="number" example="2">%d</xliff:g> more</string>
+    <!-- [CHAR LIMIT=NONE] Zen mode settings: Lists apps that can bypass DND. For example, "Nest, Messages, and 2 more can interrupt". -->
+    <string name="zen_mode_bypassing_apps_subtext">
+        {count, plural, offset:2
+            =0    {No apps can interrupt}
+            =1    {{app_1} can interrupt}
+            =2    {{app_1} and {app_2} can interrupt}
+            =3    {{app_1}, {app_2}, and {app_3} can interrupt}
+            other {{app_1}, {app_2}, and # more can interrupt}
+        }
+    </string>
     <!-- [CHAR LIMIT=100] Zen mode settings: Allow apps to bypass DND title-->
     <string name="zen_mode_bypassing_apps_title">Apps</string>
     <!-- [CHAR LIMIT=100] Zen mode settings: App that can bypass DND's secondary text describing which notification channels from the app can bypass DND-->
@@ -9188,18 +9206,18 @@
     toggle title -->
     <string name="zen_mode_bypassing_app_channels_toggle_all">Allow all notifications</string>
 
-    <!-- [CHAR LIMIT=120] Zen mode settings: Summary for sound interruption settings -->
-    <plurals name="zen_mode_other_sounds_summary">
-        <item quantity="one"><xliff:g id="sound_category">%s</xliff:g> can interrupt</item>
-        <item quantity="other"><xliff:g id="sound_categories" example="Alarms, media sounds, and 2 more">%s</xliff:g> can interrupt</item>
-    </plurals>
-    <!-- [CHAR LIMIT=120] Zen mode settings: No other sounds are allowed to bypass DND -->
-    <string name="zen_mode_other_sounds_none">Nothing can interrupt</string>
-    <!-- [CHAR LIMIT=30] Zen mode settings: List item in a summary indicating additional sounds
-    are allowed to bypass Do Not Disturb. For example, "Alarms, media sounds, and 2 more can
-    interrupt". -->
-    <string name="zen_mode_other_sounds_list_count"><xliff:g id="number" example="2">%d</xliff:g> more</string>
-
+    <!-- [CHAR LIMIT=NONE] Zen mode settings: Summary for sound interruption settings -->
+    <string name="zen_mode_other_sounds_summary">
+        {count, plural, offset:2
+            =0    {Nothing can interrupt}
+            =1    {{sound_category_1} can interrupt}
+            =2    {{sound_category_1} and {sound_category_2} can interrupt}
+            =3    {{sound_category_1}, {sound_category_2}, and {sound_category_3} can interrupt}
+            other {{sound_category_1}, {sound_category_2}, and # more can interrupt}
+        }
+    </string>
+    <!-- [CHAR LIMIT=120] Zen mode settings: No sounds are allowed to bypass DND -->
+    <string name="zen_mode_sounds_none">Nothing can interrupt</string>
     <!-- [CHAR LIMIT=120] Zen mode settings: Summary for people category -->
     <string name="zen_mode_people_none">No one can interrupt</string>
     <!-- [CHAR LIMIT=120] Zen mode settings: Summary for people category -->
@@ -9836,7 +9854,7 @@
     <string name="usb_control_device">This device</string>
     <!-- The summary text that appears under a USB control option while it is in the process of
          switching control or power. -->
-    <string name="usb_switching">Switching...</string>
+    <string name="usb_switching">Switching\u2026</string>
     <!-- The summary text that appears under a USB control option when switching control or power has
          failed. -->
     <string name="usb_switching_failed">Couldn\'t switch</string>
@@ -10494,8 +10512,8 @@
     <!-- Button that leads to list of apps with unrestricted data access [CHAR LIMIT=60] -->
     <string name="unrestricted_data_saver">Unrestricted data</string>
 
-    <!-- Description of message shown when app is blacklisted for background data access [CHAR LIMIT=NONE] -->
-    <string name="restrict_background_blacklisted">Background data is turned off</string>
+    <!-- Description of message shown when app is blocklisted for background data access [CHAR LIMIT=NONE] -->
+    <string name="restrict_background_blocklisted">Background data is turned off</string>
 
     <!-- Summary for the Data Saver feature being on [CHAR LIMIT=NONE] -->
     <string name="data_saver_on">On</string>
@@ -10568,8 +10586,8 @@
     <!-- [CHAR LIMIT=30] Title for dialog for setting to control the default spell checker -->
     <string name="choose_spell_checker">Choose spell checker</string>
 
-    <!-- [CHAR LIMIT=45] Title for the master switch for spell checker, turning off will disable entire spell check feature. -->
-    <string name="spell_checker_master_switch_title">Use spell checker</string>
+    <!-- [CHAR LIMIT=45] Title for the primary switch for spell checker, turning off will disable entire spell check feature. -->
+    <string name="spell_checker_primary_switch_title">Use spell checker</string>
 
     <!-- [CHAR LIMIT=30] Label for the placeholder of the current spell checker name.  Used when no spell checker is currently selected. -->
     <string name="spell_checker_not_selected">Not selected</string>
@@ -10782,8 +10800,8 @@
     <!-- Preference title for the automatic storage manager toggle. [CHAR LIMIT=60]-->
     <string name="automatic_storage_manager_preference_title">Storage manager</string>
 
-    <!-- Used in the storage manager settings screen to control turning on/off the feature entirely -->
-    <string name="automatic_storage_manager_master_switch_title">Use Storage manager</string>
+    <!-- Used in the storage manager settings screen to control turning on/off the feature entirely [CHAR LIMIT=60] -->
+    <string name="automatic_storage_manager_primary_switch_title">Use Storage manager</string>
 
     <!-- Category title for the automatic settings in the storage manager settings. [CHAR LIMIT=40] -->
     <string name="deletion_helper_automatic_title">Automatic</string>
@@ -10885,6 +10903,28 @@
     <!-- Preference and settings suggestion title text for ambient display double tap (device) [CHAR LIMIT=60]-->
     <string name="ambient_display_title" product="device">Double-tap to check device</string>
 
+    <!-- Title text for swiping downwards on the bottom of the screen for notifications [CHAR LIMIT=60]-->
+    <string name="swipe_bottom_to_notifications_title">Swipe for notifications</string>
+    <!-- Summary text for swiping downwards on the bottom of the screen for notifications [CHAR LIMIT=80]-->
+    <string name="swipe_bottom_to_notifications_summary">Swipe down on the bottom edge of the screen to show your notifications</string>
+
+    <!-- Preference and settings suggestion title text for one handed [CHAR LIMIT=60] -->
+    <string name="one_handed_title">One-Handed mode</string>
+    <!-- Preference Switch for enabling one handed [CHAR LIMIT=60] -->
+    <string name="one_handed_mode_enabled">Use one-handed mode</string>
+    <!-- Preference Switch for app taps to exit one handed [CHAR LIMIT=60] -->
+    <string name="one_handed_app_taps_to_exit">Exit when switching apps</string>
+    <!-- Timeout(Never) title for one handed [CHAR LIMIT=60] -->
+    <string name="one_handed_timeout_title">Timeout</string>
+    <!-- Timeout(Short) title for one handed [CHAR LIMIT=60] -->
+    <string name="one_handed_timeout_short">4 seconds</string>
+    <!-- Timeout(Medium) title for one handed [CHAR LIMIT=60] -->
+    <string name="one_handed_timeout_medium">8 seconds</string>
+    <!-- Timeout(Long) title for one handed [CHAR LIMIT=60] -->
+    <string name="one_handed_timeout_long">12 seconds</string>
+    <!-- Search keywords for "One-Handed" settings [CHAR_LIMIT=NONE] -->
+    <string name="keywords_one_handed">reachability</string>
+
     <!-- Summary text for ambient display double tap [CHAR LIMIT=NONE]-->
     <string name="ambient_display_summary">To check time, notifications, and other info, double-tap your screen.</string>
 
@@ -10915,6 +10955,21 @@
     <!-- Summary text for ambient display tap [CHAR LIMIT=NONE]-->
     <string name="ambient_display_tap_screen_summary">To check time, notifications, and other info, tap your screen.</string>
 
+    <!-- Preference title to enable feature for calling emergency services at panic/distress moments[CHAR_LIMIT=60]-->
+    <string name="panic_gesture_screen_title">Panic button</string>
+
+    <!-- Preference summary to enable feature for calling emergency services at panic/distress moments[CHAR_LIMIT=NONE]-->
+    <string name="panic_gesture_screen_summary">Start the emergency SOS actions by pressing the power button quickly 5 times.</string>
+
+    <!-- Preference title to enable generating noisy sound before calling emergency services at panic/distress moments[CHAR_LIMIT=60]-->
+    <string name="panic_gesture_sound_setting_title">Warning sound</string>
+
+    <!-- Preference summary to enable generating noisy sound before calling emergency services at panic/distress moments[CHAR_LIMIT=NONE]-->
+    <string name="panic_gesture_sound_setting_summary">Alert before starting the actions</string>
+
+    <!-- Preference title to let user edit their emergency contact list[CHAR_LIMIT=60]-->
+    <string name="panic_gesture_edit_emergency_contact_setting_title">Emergency contacts</string>
+
     <!-- Title text for swiping downwards on fingerprint sensor for notifications [CHAR LIMIT=80]-->
     <string name="fingerprint_swipe_for_notifications_title">Swipe fingerprint for notifications</string>
     <!-- Title text for fingerprint gesture preference screen [CHAR LIMIT=25] -->
@@ -11290,23 +11345,23 @@
     <string name="graphics_driver_app_preference_title">Select Graphics Driver</string>
     <!-- The default value of graphics driver preference for app [CHAR LIMIT=50] -->
     <string name="graphics_driver_app_preference_default">Default</string>
-    <!-- The game driver value for Game Driver app preference [CHAR LIMIT=50] -->
-    <string name="graphics_driver_app_preference_game_driver">Game Driver</string>
-    <!-- The prerelase driver value for Developer Driver app preference [CHAR LIMIT=50] -->
+    <!-- The value for updatable production driver app preference [CHAR LIMIT=50] -->
+    <string name="graphics_driver_app_preference_production_driver">Game Driver</string>
+    <!-- The value for updatable developer driver app preference [CHAR LIMIT=50] -->
     <string name="graphics_driver_app_preference_prerelease_driver">Developer Driver</string>
     <!-- The system driver value for system graphics driver app preference [CHAR LIMIT=50] -->
     <string name="graphics_driver_app_preference_system">System Graphics Driver</string>
     <!-- All the graphics driver preference values for all apps globally [CHAR LIMIT=50] -->
     <string-array name="graphics_driver_all_apps_preference_values">
         <item>@string/graphics_driver_app_preference_default</item>
-        <item>@string/graphics_driver_app_preference_game_driver</item>
+        <item>@string/graphics_driver_app_preference_production_driver</item>
         <item>@string/graphics_driver_app_preference_prerelease_driver</item>
     </string-array>
     <!-- All the values of graphics driver for app preference [CHAR LIMIT=50] -->
     <string-array name="graphics_driver_app_preference_values">
         <item>@string/graphics_driver_app_preference_default</item>
         <item>@string/graphics_driver_app_preference_prerelease_driver</item>
-        <item>@string/graphics_driver_app_preference_game_driver</item>
+        <item>@string/graphics_driver_app_preference_production_driver</item>
         <item>@string/graphics_driver_app_preference_system</item>
     </string-array>
 
@@ -11481,6 +11536,17 @@
     <!-- Message informs the user that has no SIM card in personalized Settings [CHAR LIMIT=30] -->
     <string name="no_sim_card">No SIM card</string>
 
+    <!-- A title for a SIM card spinner UI component which users can choose a SIM card. [CHAR LIMIT=NONE] -->
+    <string name="sim_card">SIM</string>
+    <!-- A label when there is no SIM card to choose. [CHAR LIMIT=NONE] -->
+    <string name="wifi_no_sim_card">No SIM</string>
+    <!-- A label when there is no SIM card information of a Wi-Fi network. [CHAR LIMIT=NONE] -->
+    <string name="wifi_no_related_sim_card">None</string>
+    <!-- A label wen a user needs a SIM to connect to the Wi-Fi network. [CHAR LIMIT=NONE] -->
+    <string name="wifi_require_sim_card_to_connect">Requires SIM to connect</string>
+    <!-- A label wen a user needs a specific SIM to connect to the Wi-Fi network. [CHAR LIMIT=NONE] -->
+    <string name="wifi_require_specific_sim_card_to_connect">Requires <xliff:g id="wireless_carrier" example="Verizon">%s</xliff:g> SIM to connect</string>
+
     <!-- The following strings are summaries for preferred network modes in Mobile network settings,
      and have a character limit of 100 -->
     <!-- WCDMA preferred [CHAR LIMIT=NONE] -->
@@ -11615,6 +11681,9 @@
     <string name="mobile_data_settings_summary_auto_switch">
         Phone will automatically switch to this carrier when in range
     </string>
+    <!-- Mobile network setting screen, summary of Mobile data switch preference when the network
+         is unavailable, the preference selection will be disabled. [CHAR LIMIT=NONE] -->
+    <string name="mobile_data_settings_summary_unavailable">No SIM card available</string>
 
     <!-- Mobile network settings screen, title of item showing the name of the default subscription
      that will be used for calls. This only appears in multi-SIM mode. [CHAR LIMIT=NONE] -->
@@ -11859,7 +11928,7 @@
     <string name="force_desktop_mode">Force desktop mode</string>
     <!-- UI debug setting: force desktop mode summary [CHAR LIMIT=NONE] -->
     <string name="force_desktop_mode_summary">Force experimental desktop mode on secondary displays</string>
-    <!-- UI debug setting: enable non-resizables in freeform [CHAR LIMIT=50] -->
+    <!-- UI debug setting: enable non-resizables in freeform [CHAR LIMIT=60] -->
     <string name="enable_sizecompat_freeform">Enable freeform sizecompat</string>
     <!-- UI debug setting: enable non-resizables in freeform summary [CHAR LIMIT=NONE] -->
     <string name="enable_sizecompat_freeform_summary">Allows sizecompat apps to be in freeform</string>
@@ -12015,7 +12084,7 @@
     <!-- DSU Loader Description. Do not translate. -->
     <string name="dsu_loader_description" translatable="false">Load a Dynamic System Update Image</string>
     <!-- DSU Loader Loading. Do not translate. -->
-    <string name="dsu_loader_loading" translatable="false">Loading...</string>
+    <string name="dsu_loader_loading" translatable="false">Loading\u2026</string>
     <!-- DSU Loader. Do not translate. -->
     <string name="dsu_is_running" translatable="false">DSU is running</string>
 
@@ -12135,16 +12204,21 @@
 
     <!-- Title for media control settings [CHAR LIMIT=50]-->
     <string name="media_controls_title">Media</string>
-    <!-- Summary for media control settings [CHAR LIMIT=60]-->
-    <string name="media_controls_summary">Hide player when the media session has ended</string>
+    <!-- Summary for media control settings [CHAR LIMIT=NONE]-->
+    <string name="media_controls_summary">Media player in Quick Settings</string>
     <!-- Description of toggle to enable or disable the media resumption feature in quick settings [CHAR LIMIT=NONE]-->
-    <string name="media_controls_resume_description">The player allows you to resume a session from the expanded Quick Settings panel.</string>
+    <string name="media_controls_resume_description">Show media player for an extended period to easily resume playback</string>
     <!-- Subtext for media settings when the player will be hidden [CHAR LIMIT=50] -->
     <string name="media_controls_hide_player">Hide player</string>
     <!-- Subtext for media settings when the player will be shown [CHAR LIMIT=50] -->
     <string name="media_controls_show_player">Show player</string>
     <!-- Subtext for media settings when no players can be shown [CHAR LIMIT=50] -->
     <string name="media_controls_no_players">No players available</string>
+    <!-- Subtitle for section of media control settings that shows which apps are allowed [CHAR LIMIT=50] -->
+    <string name="media_controls_apps_title">Allowed apps</string>
     <!-- Keywords for the media controls setting [CHAR LIMIT=NONE]-->
     <string name="keywords_media_controls">media</string>
+
+    <!-- Summary for see all preference when bluetooth is disable [CHAR LIMIT=none]-->
+    <string name="connected_device_see_all_summary">Bluetooth will turn on</string>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index c74a1a2..7ba1156 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -585,8 +585,8 @@
     <style name="SliceRow.Slider.LargeIcon">
         <!-- 10dp start padding for the start icon -->
         <item name="titleItemStartPadding">10dp</item>
-        <!-- Layout is 48dp and actual icon size is 48-(iconSize/2) -->
-        <item name="iconSize">12dp</item>
+        <!-- Title icon size -->
+        <item name="iconSize">36dp</item>
         <!-- RecycleView item animator -->
         <item name="disableRecyclerViewItemAnimator">true</item>
     </style>
@@ -618,7 +618,7 @@
 
     <style name="TextAppearance.NotificationImportanceButton">
         <item name="android:textSize">@dimen/notification_importance_button_text</item>
-        <item name="android:fontFamily">@*android:string/config_bodyFontFamilyMedium</item>
+        <item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
         <item name="android:gravity">center</item>
     </style>
 
diff --git a/res/xml/accessibility_daltonizer_settings.xml b/res/xml/accessibility_daltonizer_settings.xml
index c98736b..d638b94 100644
--- a/res/xml/accessibility_daltonizer_settings.xml
+++ b/res/xml/accessibility_daltonizer_settings.xml
@@ -49,6 +49,10 @@
             android:persistent="false"
             android:summary="@string/daltonizer_mode_tritanomaly_summary"
             android:title="@string/daltonizer_mode_tritanomaly_title" />
+        <com.android.settingslib.widget.RadioButtonPreference
+            android:key="daltonizer_mode_grayscale"
+            android:persistent="false"
+            android:title="@string/daltonizer_mode_grayscale_title" />
 
     </PreferenceCategory>
 
diff --git a/res/xml/accessibility_magnification_service_settings.xml b/res/xml/accessibility_magnification_service_settings.xml
index 0548e5e..e80d936 100644
--- a/res/xml/accessibility_magnification_service_settings.xml
+++ b/res/xml/accessibility_magnification_service_settings.xml
@@ -29,13 +29,4 @@
         settings:searchable="false"
         settings:controller="com.android.settings.accessibility.MagnificationModePreferenceController" />
 
-    <SwitchPreference
-        android:key="magnification_enable"
-        android:persistent="false"
-        android:title="@string/accessibility_magnification_enable_mode_title"
-        android:summaryOn="@string/accessibility_magnification_area_settings_full_screen_summary"
-        android:summaryOff="@string/accessibility_magnification_area_settings_window_screen_summary"
-        settings:searchable="false"
-        settings:controller="com.android.settings.accessibility.MagnificationEnablePreferenceController" />
-
 </PreferenceScreen>
diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml
index cea8eb3..615f5b8 100644
--- a/res/xml/accessibility_settings.xml
+++ b/res/xml/accessibility_settings.xml
@@ -113,7 +113,7 @@
             settings:controller="com.android.settings.accessibility.LockScreenRotationPreferenceController"/>
 
         <ListPreference
-            android:entries="@array/long_press_timeout_selector_titles"
+            android:entries="@array/long_press_timeout_selector_list_titles"
             android:entryValues="@array/long_press_timeout_selector_values"
             android:key="select_long_press_timeout_preference"
             android:persistent="false"
@@ -158,16 +158,16 @@
             settings:controller="com.android.settings.accessibility.LiveCaptionPreferenceController"/>
 
         <SwitchPreference
-            android:key="toggle_master_mono"
+            android:key="toggle_primary_mono"
             android:persistent="false"
-            android:summary="@string/accessibility_toggle_master_mono_summary"
-            android:title="@string/accessibility_toggle_master_mono_title"
-            settings:controller="com.android.settings.accessibility.MasterMonoPreferenceController"/>
+            android:summary="@string/accessibility_toggle_primary_mono_summary"
+            android:title="@string/accessibility_toggle_primary_mono_title"
+            settings:controller="com.android.settings.accessibility.PrimaryMonoPreferenceController"/>
 
         <com.android.settings.accessibility.BalanceSeekBarPreference
-            android:key="seekbar_master_balance"
+            android:key="seekbar_primary_balance"
             android:persistent="false"
-            android:title="@string/accessibility_toggle_master_balance_title"/>
+            android:title="@string/accessibility_toggle_primary_balance_title"/>
 
         <Preference
             android:key="hearing_aid_preference"
diff --git a/res/xml/adaptive_connectivity_settings.xml b/res/xml/adaptive_connectivity_settings.xml
new file mode 100644
index 0000000..ff9bdb0
--- /dev/null
+++ b/res/xml/adaptive_connectivity_settings.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:title="@string/adaptive_connectivity_title">
+
+    <com.android.settingslib.widget.LayoutPreference
+        android:key="adaptive_connectivity_header"
+        android:layout="@layout/adaptive_connectivity_header"
+        android:persistent="false"
+        android:selectable="false"
+        android:title="@string/summary_placeholder"
+        settings:allowDividerBelow="true"
+        settings:searchable="false"/>
+
+    <SwitchPreference
+        android:key="adaptive_connectivity"
+        android:title="@string/adaptive_connectivity_title"
+        android:summary="@string/adaptive_connectivity_summary"
+        settings:allowDividerAbove="true"
+        settings:controller="com.android.settings.network.AdaptiveConnectivityTogglePreferenceController"/>
+
+</PreferenceScreen>
diff --git a/res/xml/adb_wireless_settings.xml b/res/xml/adb_wireless_settings.xml
index 945611e..8a9cfe6 100644
--- a/res/xml/adb_wireless_settings.xml
+++ b/res/xml/adb_wireless_settings.xml
@@ -35,7 +35,8 @@
             android:key="adb_ip_addr_pref"
             android:title="@string/adb_wireless_ip_addr_preference_title"
             android:summary="@string/summary_placeholder"
-            android:selectable="false"/>
+            android:selectable="false"
+            settings:enableCopying="true"/>
     </PreferenceCategory>
 
     <!-- Pairing methods category -->
diff --git a/res/xml/battery_saver_settings.xml b/res/xml/battery_saver_settings.xml
index 966034e..29b82ef 100644
--- a/res/xml/battery_saver_settings.xml
+++ b/res/xml/battery_saver_settings.xml
@@ -34,7 +34,7 @@
         settings:controller="com.android.settings.fuelgauge.batterysaver.BatterySaverStickyPreferenceController"/>
 
     <com.android.settings.widget.TwoStateButtonPreference
-        android:key="battery_saver_button"
+        android:key="battery_saver"
         android:title="@string/battery_saver"
         android:selectable="false"
         android:summary="@string/battery_saver_turn_on_summary"
diff --git a/res/xml/captioning_settings.xml b/res/xml/captioning_settings.xml
index 7ae93b9..6bd3763 100644
--- a/res/xml/captioning_settings.xml
+++ b/res/xml/captioning_settings.xml
@@ -33,8 +33,8 @@
     <SwitchPreference
         android:key="captioning_preference_switch"
         android:persistent="false"
-        android:summary="@string/accessibility_caption_master_switch_summary"
-        android:title="@string/accessibility_caption_master_switch_title"
+        android:summary="@string/accessibility_caption_primary_switch_summary"
+        android:title="@string/accessibility_caption_primary_switch_title"
         settings:allowDividerAbove="true" />
 
     <Preference
diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index 746a51c..cb3e589 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -143,7 +143,7 @@
         <Preference android:key="clear_adb_keys"
                     android:title="@string/clear_adb_keys" />
 
-        <com.android.settings.widget.MasterSwitchPreference
+        <com.android.settings.widget.PrimarySwitchPreference
             android:fragment="com.android.settings.development.WirelessDebuggingFragment"
             android:key="toggle_adb_wireless"
             android:title="@string/enable_adb_wireless"
@@ -298,11 +298,6 @@
             android:summary="@string/mobile_data_always_on_summary" />
 
         <SwitchPreference
-            android:key="enhanced_connectivity"
-            android:title="@string/enhanced_connectivity"
-            android:summary="@string/enhanced_connectivity_summary" />
-
-        <SwitchPreference
             android:key="tethering_hardware_offload"
             android:title="@string/tethering_hardware_offload"
             android:summary="@string/tethering_hardware_offload_summary" />
@@ -610,6 +605,11 @@
             android:title="@string/asst_capability_ranking_title"
             settings:controller="com.android.settings.notification.AssistantCapabilityPreferenceController" />
 
+        <SwitchPreference
+            android:key="asst_feedback_indicator"
+            android:title="@string/asst_feedback_indicator_title"
+            settings:controller="com.android.settings.notification.AssistantFeedbackPreferenceController" />
+
         <Preference
             android:key="inactive_apps"
             android:title="@string/inactive_apps_title"
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index 30dad01..9a51bdc 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -107,7 +107,8 @@
         android:key="font_size"
         android:title="@string/title_font_size"
         android:fragment="com.android.settings.display.ToggleFontSizePreferenceFragment"
-        settings:controller="com.android.settings.display.FontSizePreferenceController" />
+        settings:controller="com.android.settings.display.FontSizePreferenceController"
+        settings:keywords="@string/keywords_font_size" />
 
     <com.android.settings.display.ScreenZoomPreference
         android:key="display_settings_screen_zoom"
diff --git a/res/xml/encryption_and_credential.xml b/res/xml/encryption_and_credential.xml
index b0906c1..fe0498d 100644
--- a/res/xml/encryption_and_credential.xml
+++ b/res/xml/encryption_and_credential.xml
@@ -37,12 +37,6 @@
         android:persistent="false"
         android:order="100">
 
-        <com.android.settingslib.RestrictedPreference
-            android:key="credential_storage_type"
-            android:title="@string/credential_storage_type"
-            android:summary="@string/summary_placeholder"
-            settings:userRestriction="no_config_credentials" />
-
         <Preference
             android:key="trusted_credentials"
             android:title="@string/trusted_credentials"
diff --git a/res/xml/gestures.xml b/res/xml/gestures.xml
index 0f407f4..fb519d0 100644
--- a/res/xml/gestures.xml
+++ b/res/xml/gestures.xml
@@ -21,6 +21,12 @@
     android:title="@string/gesture_preference_title">
 
     <Preference
+        android:key="gesture_panic_button_summary"
+        android:title="@string/panic_gesture_screen_title"
+        android:fragment="com.android.settings.gestures.PanicGestureSettings"
+        settings:controller="com.android.settings.gestures.PanicGesturePreferenceController" />
+
+    <Preference
         android:key="gesture_assist_input_summary"
         android:title="@string/assist_gesture_title"
         android:fragment="com.android.settings.gestures.AssistGestureSettings"
@@ -34,6 +40,13 @@
         settings:controller="com.android.settings.gestures.SwipeToNotificationPreferenceController" />
 
     <Preference
+        android:key="gesture_swipe_bottom_to_notification"
+        android:title="@string/swipe_bottom_to_notifications_title"
+        android:fragment="com.android.settings.gestures.SwipeBottomToNotificationSettings"
+        settings:searchable="false"
+        settings:controller="com.android.settings.gestures.SwipeBottomToNotificationPreferenceController" />
+
+    <Preference
         android:key="gesture_double_tap_power_input_summary"
         android:title="@string/double_tap_power_for_camera_title"
         android:fragment="com.android.settings.gestures.DoubleTapPowerSettings"
@@ -55,6 +68,12 @@
         settings:keywords="@string/keywords_system_navigation" />
 
     <Preference
+        android:key="gesture_one_handed"
+        android:title="@string/one_handed_title"
+        android:fragment="com.android.settings.gestures.OneHandedSettings"
+        settings:controller="com.android.settings.gestures.OneHandedEnablePreferenceController" />
+
+    <Preference
         android:key="gesture_tap_screen_input_summary"
         android:title="@string/ambient_display_tap_screen_title"
         android:fragment="com.android.settings.gestures.TapScreenGestureSettings"
diff --git a/res/xml/media_controls_settings.xml b/res/xml/media_controls_settings.xml
index 3f0483f..3ace6a0 100644
--- a/res/xml/media_controls_settings.xml
+++ b/res/xml/media_controls_settings.xml
@@ -28,4 +28,9 @@
         app:controller="com.android.settings.sound.MediaControlsPreferenceController"
         app:allowDividerAbove="true" />
 
+    <PreferenceCategory
+        android:key="media_controls_resumable_apps"
+        android:title="@string/media_controls_apps_title"
+        app:controller="com.android.settings.sound.ResumableMediaAppsController" />
+
 </PreferenceScreen>
diff --git a/res/xml/my_device_info.xml b/res/xml/my_device_info.xml
index 5e5fab3..eb9ceb4 100644
--- a/res/xml/my_device_info.xml
+++ b/res/xml/my_device_info.xml
@@ -43,6 +43,7 @@
         android:order="2"
         android:title="@string/my_device_info_account_preference_title"
         android:summary="@string/summary_placeholder"
+        settings:enableCopying="true"
         settings:controller="com.android.settings.deviceinfo.BrandedAccountPreferenceController"/>
 
     <!-- Phone number -->
@@ -100,7 +101,7 @@
     <Preference
         android:key="device_model"
         android:order="31"
-        android:title="@string/hardware_info"
+        android:title="@string/model_info"
         android:summary="@string/summary_placeholder"
         android:fragment="com.android.settings.deviceinfo.hardwareinfo.HardwareInfoFragment"
         settings:enableCopying="true"
@@ -142,7 +143,7 @@
         android:order="45"
         android:title="@string/status_wifi_mac_address"
         android:summary="@string/view_saved_network"
-        android:fragment="com.android.settings.wifi.savedaccesspoints.SavedAccessPointsWifiSettings"
+        android:fragment="com.android.settings.wifi.savedaccesspoints2.SavedAccessPointsWifiSettings2"
         settings:enableCopying="false"/>
 
     <!-- Factory Wi-Fi MAC address -->
diff --git a/res/xml/network_and_internet.xml b/res/xml/network_and_internet.xml
index eaa7808..c92ce94 100644
--- a/res/xml/network_and_internet.xml
+++ b/res/xml/network_and_internet.xml
@@ -29,7 +29,7 @@
         android:order="-40"
         settings:controller="com.android.settings.network.MultiNetworkHeaderController"/>
 
-    <com.android.settings.widget.MasterSwitchPreference
+    <com.android.settings.widget.PrimarySwitchPreference
         android:fragment="com.android.settings.wifi.WifiSettings"
         android:key="main_toggle_wifi"
         android:title="@string/wifi_settings"
@@ -40,7 +40,7 @@
         <intent
             android:action="android.settings.WIFI_SETTINGS"
             android:targetClass="Settings$WifiSettingsActivity" />
-    </com.android.settings.widget.MasterSwitchPreference>
+    </com.android.settings.widget.PrimarySwitchPreference>
 
     <com.android.settings.widget.AddPreference
         android:key="mobile_network_list"
@@ -80,7 +80,7 @@
         settings:userRestriction="no_config_tethering"
         settings:useAdminDisabledSummary="true" />
 
-    <com.android.settings.widget.MasterSwitchPreference
+    <com.android.settings.widget.PrimarySwitchPreference
         android:fragment="com.android.settings.AllInOneTetherSettings"
         android:key="all_tether_settings"
         android:title="@string/tether_settings_title_all"
@@ -118,4 +118,11 @@
         android:positiveButtonText="@string/save"
         android:negativeButtonText="@android:string/cancel" />
 
+    <Preference
+        android:fragment="com.android.settings.network.AdaptiveConnectivitySettings"
+        android:key="adaptive_connectivity"
+        android:title="@string/adaptive_connectivity_title"
+        android:summary="@string/summary_placeholder"
+        android:order="25"
+        settings:controller="com.android.settings.network.AdaptiveConnectivityPreferenceController"/>
 </PreferenceScreen>
diff --git a/res/xml/one_handed_settings.xml b/res/xml/one_handed_settings.xml
new file mode 100644
index 0000000..3508d8a
--- /dev/null
+++ b/res/xml/one_handed_settings.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2020 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:persistent="false"
+    android:title="@string/one_handed_title">
+
+    <SwitchPreference
+        android:key="gesture_one_handed_mode_enabled"
+        android:title="@string/one_handed_mode_enabled"
+        settings:keywords="@string/keywords_one_handed"
+        settings:controller="com.android.settings.gestures.OneHandedEnablePreferenceController"/>
+
+    <SwitchPreference
+        android:key="gesture_app_taps_to_exit"
+        android:title="@string/one_handed_app_taps_to_exit"
+        settings:controller="com.android.settings.gestures.OneHandedAppTapsExitPreferenceController"/>
+
+    <ListPreference
+        android:entries="@array/one_handed_timeout_title"
+        android:entryValues="@array/one_handed_timeout_values"
+        android:key="one_handed_timeout_preference"
+        android:persistent="false"
+        android:title="@string/one_handed_timeout_title"
+        settings:controller="com.android.settings.gestures.OneHandedTimeoutPreferenceController"/>
+</PreferenceScreen>
diff --git a/res/xml/panic_gesture_settings.xml b/res/xml/panic_gesture_settings.xml
new file mode 100644
index 0000000..f5fe1b9
--- /dev/null
+++ b/res/xml/panic_gesture_settings.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2020 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:title="@string/panic_gesture_screen_title">
+
+    <com.android.settings.widget.VideoPreference
+        android:key="panic_button_screen_video"
+        app:animation="@raw/gesture_double_tap"
+        app:preview="@drawable/gesture_double_tap"/>
+
+    <SwitchPreference
+        android:key="gesture_panic_button"
+        android:title="@string/panic_gesture_screen_title"
+        android:summary="@string/panic_gesture_screen_summary"
+        android:icon="@drawable/ic_hand_gesture"
+        app:keywords="@string/keywords_gesture"
+        app:controller="com.android.settings.gestures.PanicGesturePreferenceController"
+        app:allowDividerAbove="true"/>
+
+    <SwitchPreference
+        android:key="panic_gesture_sound"
+        android:icon="@drawable/ic_hearing"
+        android:title="@string/panic_gesture_sound_setting_title"
+        android:summary="@string/panic_gesture_sound_setting_summary"
+        app:keywords="@string/keywords_gesture"
+        app:controller="com.android.settings.gestures.PanicGestureSoundPreferenceController"
+        app:allowDividerAbove="true"/>
+
+    <Preference
+        android:key="panic_emergency_contacts"
+        android:icon="@drawable/ic_emergency_contact"
+        android:title="@string/panic_gesture_edit_emergency_contact_setting_title"
+        app:keywords="@sttring/keywords_gesture"
+        app:allowDividerAbove="true">
+        <intent
+            android:action="android.settings.EDIT_EMERGENCY_INFO"
+            android:targetPackage="@string/config_aosp_emergency_package_name"/>
+    </Preference>
+
+</PreferenceScreen>
diff --git a/res/xml/dummy_preference_screen.xml b/res/xml/placeholder_preference_screen.xml
similarity index 100%
rename from res/xml/dummy_preference_screen.xml
rename to res/xml/placeholder_preference_screen.xml
diff --git a/res/xml/privacy_dashboard_settings.xml b/res/xml/privacy_dashboard_settings.xml
index c18a236..f79da61 100644
--- a/res/xml/privacy_dashboard_settings.xml
+++ b/res/xml/privacy_dashboard_settings.xml
@@ -109,11 +109,11 @@
         android:summary="@string/content_capture_summary"
         settings:controller="com.android.settings.privacy.EnableContentCapturePreferenceController"/>
 
-    <com.android.settings.widget.MasterSwitchPreference
+    <com.android.settings.widget.PrimarySwitchPreference
         android:key="content_capture_custom_settings"
         android:title="@string/content_capture"
         android:summary="@string/content_capture_summary"
         settings:controller="com.android.settings.privacy.EnableContentCaptureWithServiceSettingsPreferenceController">
-    </com.android.settings.widget.MasterSwitchPreference>
+    </com.android.settings.widget.PrimarySwitchPreference>
 
 </PreferenceScreen>
diff --git a/res/xml/privacy_settings.xml b/res/xml/privacy_settings.xml
index 2fc3ca4..8eb689c 100644
--- a/res/xml/privacy_settings.xml
+++ b/res/xml/privacy_settings.xml
@@ -33,7 +33,7 @@
         android:persistent="false"
         settings:controller="com.android.settings.backup.ConfigureAccountPreferenceController">
         <!-- the Intent declared here is always overwritten by a real one -->
-        <intent android:action="dummy" />
+        <intent android:action="placeholder" />
     </Preference>
 
     <Preference
diff --git a/res/xml/reset_dashboard_fragment.xml b/res/xml/reset_dashboard_fragment.xml
index ac4ccb5..1b0e9fc 100644
--- a/res/xml/reset_dashboard_fragment.xml
+++ b/res/xml/reset_dashboard_fragment.xml
@@ -36,9 +36,9 @@
     <!-- Factory reset -->
     <com.android.settingslib.RestrictedPreference
         android:key="factory_reset"
-        android:title="@string/master_clear_title"
+        android:title="@string/main_clear_title"
         settings:keywords="@string/keywords_factory_data_reset"
         settings:userRestriction="no_factory_reset"
         settings:useAdminDisabledSummary="true"
-        android:fragment="com.android.settings.MasterClear" />
+        android:fragment="com.android.settings.MainClear" />
 </PreferenceScreen>
diff --git a/res/xml/storage_dashboard_fragment.xml b/res/xml/storage_dashboard_fragment.xml
index 91634fc..bc58d7e 100644
--- a/res/xml/storage_dashboard_fragment.xml
+++ b/res/xml/storage_dashboard_fragment.xml
@@ -24,7 +24,7 @@
         android:order="0"
         settings:searchable="false"
         settings:controller="com.android.settings.deviceinfo.storage.StorageSummaryDonutPreferenceController"/>
-    <com.android.settings.widget.MasterSwitchPreference
+    <com.android.settings.widget.PrimarySwitchPreference
         android:fragment="com.android.settings.deletionhelper.AutomaticStorageManagerSettings"
         android:key="toggle_asm"
         android:title="@string/automatic_storage_manager_preference_title"
diff --git a/res/xml/swipe_bottom_to_notification_settings.xml b/res/xml/swipe_bottom_to_notification_settings.xml
new file mode 100644
index 0000000..bec774b
--- /dev/null
+++ b/res/xml/swipe_bottom_to_notification_settings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2020 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:title="@string/swipe_bottom_to_notifications_title">
+
+    <com.android.settings.widget.VideoPreference
+        android:title="@string/swipe_bottom_to_notifications_title"
+        settings:animation="@raw/gesture_fingerprint_swipe"
+        settings:preview="@drawable/gesture_fingerprint_swipe"
+        settings:controller="com.android.settings.widget.VideoPreferenceController"/>
+
+    <SwitchPreference
+        android:key="gesture_swipe_bottom_to_notification"
+        android:title="@string/swipe_bottom_to_notifications_title"
+        android:summary="@string/swipe_bottom_to_notifications_summary"
+        settings:controller="com.android.settings.gestures.SwipeBottomToNotificationPreferenceController"
+        settings:allowDividerAbove="true" />
+
+</PreferenceScreen>
diff --git a/res/xml/wifi_display_saved_access_points.xml b/res/xml/wifi_display_saved_access_points.xml
deleted file mode 100644
index b3a8d55..0000000
--- a/res/xml/wifi_display_saved_access_points.xml
+++ /dev/null
@@ -1,33 +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.
--->
-
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res-auto"
-    android:key="saved_access_points"
-    android:title="@string/wifi_saved_access_points_label">
-
-    <PreferenceCategory
-        android:key="subscribed_access_points_category"
-        android:title="@string/wifi_subscribed_access_points_tab"
-        settings:controller="com.android.settings.wifi.savedaccesspoints.SubscribedAccessPointsPreferenceController"/>
-
-    <PreferenceCategory
-        android:key="saved_access_points_category"
-        android:title="@string/wifi_saved_access_points_tab"
-        settings:controller="com.android.settings.wifi.savedaccesspoints.SavedAccessPointsPreferenceController"/>
-
-</PreferenceScreen>
diff --git a/res/xml/wifi_network_details_fragment.xml b/res/xml/wifi_network_details_fragment.xml
deleted file mode 100644
index 7ec1f0e..0000000
--- a/res/xml/wifi_network_details_fragment.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res-auto"
-    settings:initialExpandedChildrenCount="5">
-
-    <com.android.settingslib.widget.LayoutPreference
-        android:key="connection_header"
-        android:layout="@layout/settings_entity_header"
-        android:selectable="false"
-        android:order="-10000"
-        settings:allowDividerBelow="true"/>
-
-    <com.android.settings.datausage.DataUsageSummaryPreference
-        android:key="status_header"
-        android:selectable="false"
-        settings:isPreferenceVisible="false"/>
-
-    <!-- Buttons -->
-    <com.android.settingslib.widget.ActionButtonsPreference
-        android:key="buttons"
-        android:selectable="false" />
-
-    <!-- General Details Preferences -->
-    <Preference
-        android:key="signal_strength"
-        android:title="@string/wifi_signal"
-        android:selectable="false"
-        settings:allowDividerAbove="true"/>
-
-    <Preference
-        android:key="frequency"
-        android:icon="@drawable/ic_frequency_antenna"
-        android:title="@string/wifi_frequency"
-        android:selectable="false"/>
-
-    <Preference
-        android:key="security"
-        android:icon="@drawable/ic_security_lock_24dp"
-        android:title="@string/wifi_security"
-        android:selectable="false"/>
-
-    <DropDownPreference
-        android:key="metered"
-        android:icon="@drawable/ic_attach_money_black_24dp"
-        android:title="@string/wifi_metered_title"
-        android:entries="@array/wifi_metered_entries"
-        android:entryValues="@array/wifi_metered_values"/>
-
-    <DropDownPreference
-        android:key="privacy"
-        android:icon="@drawable/ic_wifi_privacy_24dp"
-        android:title="@string/wifi_privacy_settings"
-        android:entries="@array/wifi_privacy_entries"
-        android:entryValues="@array/wifi_privacy_values"/>
-
-    <!-- Add device Preference -->
-    <Preference
-        android:key="add_device_to_network"
-        android:title="@string/wifi_dpp_add_device"
-        android:summary="@string/wifi_dpp_connect_network_using_qr_code"
-        settings:allowDividerAbove="true"/>
-
-    <!-- Network Details -->
-    <PreferenceCategory
-            android:key="ip_details_category"
-            android:title="@string/wifi_setup_detail">
-        <Preference
-                android:key="ssid"
-                android:title="@string/wifi_advanced_ssid_title"
-                android:selectable="false"
-                settings:enableCopying="true"/>
-        <Preference
-                android:key="mac_address"
-                android:title="@string/wifi_advanced_randomized_mac_address_title"
-                android:selectable="false"
-                settings:enableCopying="true"/>
-        <Preference
-                android:key="ip_address"
-                android:title="@string/wifi_ip_address"
-                android:selectable="false"
-                settings:enableCopying="true"/>
-        <Preference
-                android:key="gateway"
-                android:title="@string/wifi_gateway"
-                android:selectable="false"
-                settings:enableCopying="true"/>
-        <Preference
-                android:key="subnet_mask"
-                android:title="@string/wifi_details_subnet_mask"
-                android:selectable="false"
-                settings:enableCopying="true"/>
-        <Preference
-                android:key="dns"
-                android:title="@string/wifi_details_dns"
-                android:selectable="false"
-                settings:enableCopying="true"/>
-        <Preference
-                android:key="tx_link_speed"
-                android:title="@string/tx_wifi_speed"
-                android:selectable="false"
-                settings:enableCopying="true"/>
-        <Preference
-                android:key="rx_link_speed"
-                android:title="@string/rx_wifi_speed"
-                android:selectable="false"
-                settings:enableCopying="true"/>
-    </PreferenceCategory>
-
-    <!-- IPv6 Details -->
-    <PreferenceCategory
-            android:key="ipv6_category"
-            android:title="@string/wifi_details_ipv6_address_header"
-            android:selectable="false">
-        <Preference
-                android:key="ipv6_addresses"
-                android:selectable="false"
-                settings:enableCopying="true"/>
-    </PreferenceCategory>
-</PreferenceScreen>
diff --git a/res/xml/wifi_network_details_fragment2.xml b/res/xml/wifi_network_details_fragment2.xml
index 92f68cc..181b799 100644
--- a/res/xml/wifi_network_details_fragment2.xml
+++ b/res/xml/wifi_network_details_fragment2.xml
@@ -106,6 +106,11 @@
                 android:selectable="false"
                 settings:enableCopying="true"/>
         <Preference
+                android:key="eap_sim_subscription"
+                android:title="@string/sim_card"
+                android:selectable="false"
+                settings:enableCopying="true"/>
+        <Preference
                 android:key="mac_address"
                 android:title="@string/wifi_advanced_randomized_mac_address_title"
                 android:selectable="false"
diff --git a/res/xml/wifi_settings.xml b/res/xml/wifi_settings.xml
index a7f5a20..eadea68 100644
--- a/res/xml/wifi_settings.xml
+++ b/res/xml/wifi_settings.xml
@@ -17,21 +17,19 @@
 <PreferenceScreen
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:settings="http://schemas.android.com/apk/res-auto"
-        android:title="@string/wifi_settings">
+        android:title="@string/wifi_settings"
+        settings:keywords="@string/keywords_wifi">
 
     <com.android.settings.wifi.LinkablePreference
-        android:key="wifi_status_message"
-        settings:searchable="false"/>
+        android:key="wifi_status_message"/>
 
     <PreferenceCategory
         android:key="connected_access_point"
-        android:layout="@layout/preference_category_no_label"
-        settings:searchable="false"/>
+        android:layout="@layout/preference_category_no_label"/>
 
     <PreferenceCategory
         android:key="access_points"
-        android:layout="@layout/preference_category_no_label"
-        settings:searchable="false"/>
+        android:layout="@layout/preference_category_no_label"/>
 
     <Preference
         android:key="configure_wifi_settings"
@@ -42,10 +40,9 @@
     <Preference
         android:key="saved_networks"
         android:title="@string/wifi_saved_access_points_label"
-        android:fragment="com.android.settings.wifi.savedaccesspoints.SavedAccessPointsWifiSettings"/>
+        android:fragment="com.android.settings.wifi.savedaccesspoints2.SavedAccessPointsWifiSettings2"/>
 
     <com.android.settings.datausage.DataUsagePreference
         android:key="wifi_data_usage"
-        android:title="@string/wifi_data_usage"
-        settings:keywords="@string/keywords_wifi_data_usage"/>
+        android:title="@string/wifi_data_usage"/>
 </PreferenceScreen>
diff --git a/res/xml/wifi_settings2.xml b/res/xml/wifi_settings2.xml
deleted file mode 100644
index 2bf39dbe..0000000
--- a/res/xml/wifi_settings2.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2019 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<PreferenceScreen
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res-auto"
-        android:title="@string/wifi_settings"
-        settings:keywords="@string/keywords_wifi">
-
-    <com.android.settings.wifi.LinkablePreference
-        android:key="wifi_status_message"/>
-
-    <PreferenceCategory
-        android:key="connected_access_point"
-        android:layout="@layout/preference_category_no_label"/>
-
-    <PreferenceCategory
-        android:key="access_points"
-        android:layout="@layout/preference_category_no_label"/>
-
-    <Preference
-        android:key="configure_wifi_settings"
-        android:title="@string/wifi_configure_settings_preference_title"
-        settings:allowDividerAbove="true"
-        android:fragment="com.android.settings.wifi.ConfigureWifiSettings"/>
-
-    <Preference
-        android:key="saved_networks"
-        android:title="@string/wifi_saved_access_points_label"
-        android:fragment="com.android.settings.wifi.savedaccesspoints2.SavedAccessPointsWifiSettings2"/>
-
-    <com.android.settings.datausage.DataUsagePreference
-        android:key="wifi_data_usage"
-        android:title="@string/wifi_data_usage"/>
-</PreferenceScreen>
diff --git a/src/com/android/settings/AllInOneTetherSettings.java b/src/com/android/settings/AllInOneTetherSettings.java
index ed3b5b0..82e3206 100644
--- a/src/com/android/settings/AllInOneTetherSettings.java
+++ b/src/com/android/settings/AllInOneTetherSettings.java
@@ -304,12 +304,12 @@
     }
 
     @Override
-    public void onWhitelistStatusChanged(int uid, boolean isWhitelisted) {
+    public void onAllowlistStatusChanged(int uid, boolean isAllowlisted) {
         // Do nothing
     }
 
     @Override
-    public void onBlacklistStatusChanged(int uid, boolean isBlacklisted) {
+    public void onDenylistStatusChanged(int uid, boolean isDenylisted) {
         // Do nothing
     }
 
diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MainClear.java
similarity index 93%
rename from src/com/android/settings/MasterClear.java
rename to src/com/android/settings/MainClear.java
index 57dfd1b..326aeef 100644
--- a/src/com/android/settings/MasterClear.java
+++ b/src/com/android/settings/MainClear.java
@@ -83,16 +83,16 @@
  *
  * This is the initial screen.
  */
-public class MasterClear extends InstrumentedFragment implements OnGlobalLayoutListener {
-    private static final String TAG = "MasterClear";
+public class MainClear extends InstrumentedFragment implements OnGlobalLayoutListener {
+    private static final String TAG = "MainClear";
 
     @VisibleForTesting
     static final int KEYGUARD_REQUEST = 55;
     @VisibleForTesting
     static final int CREDENTIAL_CONFIRM_REQUEST = 56;
 
-    private static final String KEY_SHOW_ESIM_RESET_CHECKBOX
-            = "masterclear.allow_retain_esim_profiles_after_fdr";
+    private static final String KEY_SHOW_ESIM_RESET_CHECKBOX =
+            "masterclear.allow_retain_esim_profiles_after_fdr";
 
     static final String ERASE_EXTERNAL_EXTRA = "erase_sd";
     static final String ERASE_ESIMS_EXTRA = "erase_esim";
@@ -139,8 +139,11 @@
      */
     private boolean runKeyguardConfirmation(int request) {
         Resources res = getActivity().getResources();
-        return new ChooseLockSettingsHelper(getActivity(), this).launchConfirmationActivity(
-                request, res.getText(R.string.master_clear_short_title));
+        final ChooseLockSettingsHelper.Builder builder =
+                new ChooseLockSettingsHelper.Builder(getActivity(), this);
+        return builder.setRequestCode(request)
+                .setTitle(res.getText(R.string.main_clear_short_title))
+                .show();
     }
 
     @VisibleForTesting
@@ -185,9 +188,9 @@
         args.putBoolean(ERASE_EXTERNAL_EXTRA, mExternalStorage.isChecked());
         args.putBoolean(ERASE_ESIMS_EXTRA, mEsimStorage.isChecked());
         new SubSettingLauncher(getContext())
-                .setDestination(MasterClearConfirm.class.getName())
+                .setDestination(MainClearConfirm.class.getName())
                 .setArguments(args)
-                .setTitleRes(R.string.master_clear_confirm_title)
+                .setTitleRes(R.string.main_clear_confirm_title)
                 .setSourceMetricsCategory(getMetricsCategory())
                 .launch();
     }
@@ -293,7 +296,7 @@
         if (mScrollView != null) {
             mScrollView.getViewTreeObserver().removeOnGlobalLayoutListener(this);
         }
-        mScrollView = mContentView.findViewById(R.id.master_clear_scrollview);
+        mScrollView = mContentView.findViewById(R.id.main_clear_scrollview);
 
         /*
          * If the external storage is emulated, it will be erased with a factory
@@ -351,9 +354,9 @@
         final UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
         loadAccountList(um);
         final StringBuffer contentDescription = new StringBuffer();
-        final View masterClearContainer = mContentView.findViewById(R.id.master_clear_container);
-        getContentDescription(masterClearContainer, contentDescription);
-        masterClearContainer.setContentDescription(contentDescription);
+        final View mainClearContainer = mContentView.findViewById(R.id.main_clear_container);
+        getContentDescription(mainClearContainer, contentDescription);
+        mainClearContainer.setContentDescription(contentDescription);
 
         // Set the status of initiateButton based on scrollview
         mScrollView.setOnScrollChangeListener(new OnScrollChangeListener() {
@@ -421,7 +424,7 @@
         final FooterBarMixin mixin = layout.getMixin(FooterBarMixin.class);
         mixin.setPrimaryButton(
                 new FooterButton.Builder(getActivity())
-                        .setText(R.string.master_clear_button_text)
+                        .setText(R.string.main_clear_button_text)
                         .setListener(mInitiateListener)
                         .setButtonType(ButtonType.OTHER)
                         .setTheme(R.style.SudGlifButton_Primary)
@@ -472,15 +475,15 @@
             final int profileId = userInfo.id;
             final UserHandle userHandle = new UserHandle(profileId);
             Account[] accounts = mgr.getAccountsAsUser(profileId);
-            final int N = accounts.length;
-            if (N == 0) {
+            final int accountLength = accounts.length;
+            if (accountLength == 0) {
                 continue;
             }
-            accountsCount += N;
+            accountsCount += accountLength;
 
             AuthenticatorDescription[] descs = AccountManager.get(context)
                     .getAuthenticatorTypesAsUser(profileId);
-            final int M = descs.length;
+            final int descLength = descs.length;
 
             if (profilesSize > 1) {
                 View titleView = Utils.inflateCategoryHeader(inflater, contents);
@@ -490,10 +493,10 @@
                 contents.addView(titleView);
             }
 
-            for (int i = 0; i < N; i++) {
+            for (int i = 0; i < accountLength; i++) {
                 Account account = accounts[i];
                 AuthenticatorDescription desc = null;
-                for (int j = 0; j < M; j++) {
+                for (int j = 0; j < descLength; j++) {
                     if (account.type.equals(descs[j].type)) {
                         desc = descs[j];
                         break;
@@ -521,7 +524,7 @@
                     icon = context.getPackageManager().getDefaultActivityIcon();
                 }
 
-                View child = inflater.inflate(R.layout.master_clear_account, contents, false);
+                View child = inflater.inflate(R.layout.main_clear_account, contents, false);
                 ((ImageView) child.findViewById(android.R.id.icon)).setImageDrawable(icon);
                 ((TextView) child.findViewById(android.R.id.title)).setText(account.name);
                 contents.addView(child);
@@ -549,7 +552,7 @@
                 .hasBaseUserRestriction(context, UserManager.DISALLOW_FACTORY_RESET,
                         UserHandle.myUserId());
         if (disallow && !Utils.isDemoUser(context)) {
-            return inflater.inflate(R.layout.master_clear_disallowed_screen, null);
+            return inflater.inflate(R.layout.main_clear_disallowed_screen, null);
         } else if (admin != null) {
             new ActionDisabledByAdminDialogHelper(getActivity())
                     .prepareDialogBuilder(UserManager.DISALLOW_FACTORY_RESET, admin)
@@ -558,7 +561,7 @@
             return new View(getContext());
         }
 
-        mContentView = inflater.inflate(R.layout.master_clear, null);
+        mContentView = inflater.inflate(R.layout.main_clear, null);
 
         establishInitialState();
         return mContentView;
diff --git a/src/com/android/settings/MasterClearConfirm.java b/src/com/android/settings/MainClearConfirm.java
similarity index 92%
rename from src/com/android/settings/MasterClearConfirm.java
rename to src/com/android/settings/MainClearConfirm.java
index 3ace436..c45a907 100644
--- a/src/com/android/settings/MasterClearConfirm.java
+++ b/src/com/android/settings/MainClearConfirm.java
@@ -64,8 +64,8 @@
  *
  * This is the confirmation screen.
  */
-public class MasterClearConfirm extends InstrumentedFragment {
-    private final static String TAG = "MasterClearConfirm";
+public class MainClearConfirm extends InstrumentedFragment {
+    private static final String TAG = "MainClearConfirm";
 
     @VisibleForTesting View mContentView;
     private boolean mEraseSdCard;
@@ -103,7 +103,7 @@
                         mProgressDialog.hide();
                         if (getActivity() != null) {
                             getActivity().setRequestedOrientation(mOldOrientation);
-                            doMasterClear();
+                            doMainClear();
                         }
                     }
 
@@ -121,7 +121,7 @@
                     }
                 }.execute();
             } else {
-                doMasterClear();
+                doMainClear();
             }
         }
 
@@ -130,9 +130,9 @@
             progressDialog.setIndeterminate(true);
             progressDialog.setCancelable(false);
             progressDialog.setTitle(
-                    getActivity().getString(R.string.master_clear_progress_title));
+                    getActivity().getString(R.string.main_clear_progress_title));
             progressDialog.setMessage(
-                    getActivity().getString(R.string.master_clear_progress_text));
+                    getActivity().getString(R.string.main_clear_progress_text));
             return progressDialog;
         }
     };
@@ -180,11 +180,11 @@
         return !WizardManagerHelper.isDeviceProvisioned(getActivity());
     }
 
-    private void doMasterClear() {
+    private void doMainClear() {
         Intent intent = new Intent(Intent.ACTION_FACTORY_RESET);
         intent.setPackage("android");
         intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
-        intent.putExtra(Intent.EXTRA_REASON, "MasterClearConfirm");
+        intent.putExtra(Intent.EXTRA_REASON, "MainClearConfirm");
         intent.putExtra(Intent.EXTRA_WIPE_EXTERNAL_STORAGE, mEraseSdCard);
         intent.putExtra(Intent.EXTRA_WIPE_ESIMS, mEraseEsims);
         getActivity().sendBroadcast(intent);
@@ -200,7 +200,7 @@
         final FooterBarMixin mixin = layout.getMixin(FooterBarMixin.class);
         mixin.setPrimaryButton(
                 new FooterButton.Builder(getActivity())
-                        .setText(R.string.master_clear_button_text)
+                        .setText(R.string.main_clear_button_text)
                         .setListener(mFinalClickListener)
                         .setButtonType(ButtonType.OTHER)
                         .setTheme(R.style.SudGlifButton_Primary)
@@ -230,7 +230,7 @@
                 getActivity(), UserManager.DISALLOW_FACTORY_RESET, UserHandle.myUserId());
         if (RestrictedLockUtilsInternal.hasBaseUserRestriction(getActivity(),
                 UserManager.DISALLOW_FACTORY_RESET, UserHandle.myUserId())) {
-            return inflater.inflate(R.layout.master_clear_disallowed_screen, null);
+            return inflater.inflate(R.layout.main_clear_disallowed_screen, null);
         } else if (admin != null) {
             new ActionDisabledByAdminDialogHelper(getActivity())
                     .prepareDialogBuilder(UserManager.DISALLOW_FACTORY_RESET, admin)
@@ -238,7 +238,7 @@
                     .show();
             return new View(getActivity());
         }
-        mContentView = inflater.inflate(R.layout.master_clear_confirm, null);
+        mContentView = inflater.inflate(R.layout.main_clear_confirm, null);
         setUpActionBarAndTitle();
         establishFinalConfirmationState();
         setAccessibilityTitle();
@@ -260,7 +260,7 @@
     void setSubtitle() {
         if (mEraseEsims) {
             ((TextView) mContentView.findViewById(R.id.sud_layout_description))
-                .setText(R.string.master_clear_final_desc_esim);
+                .setText(R.string.main_clear_final_desc_esim);
         }
     }
 
@@ -270,9 +270,9 @@
 
         Bundle args = getArguments();
         mEraseSdCard = args != null
-                && args.getBoolean(MasterClear.ERASE_EXTERNAL_EXTRA);
+                && args.getBoolean(MainClear.ERASE_EXTERNAL_EXTRA);
         mEraseEsims = args != null
-                && args.getBoolean(MasterClear.ERASE_ESIMS_EXTRA);
+                && args.getBoolean(MainClear.ERASE_ESIMS_EXTRA);
     }
 
     @Override
diff --git a/src/com/android/settings/ResetNetwork.java b/src/com/android/settings/ResetNetwork.java
index 733d7fe..5ff59b5 100644
--- a/src/com/android/settings/ResetNetwork.java
+++ b/src/com/android/settings/ResetNetwork.java
@@ -92,8 +92,11 @@
      */
     private boolean runKeyguardConfirmation(int request) {
         Resources res = getActivity().getResources();
-        return new ChooseLockSettingsHelper(getActivity(), this).launchConfirmationActivity(
-                request, res.getText(R.string.reset_network_title));
+        final ChooseLockSettingsHelper.Builder builder =
+                new ChooseLockSettingsHelper.Builder(getActivity(), this);
+        return builder.setRequestCode(request)
+                .setTitle(res.getText(R.string.reset_network_title))
+                .show();
     }
 
     @Override
@@ -122,7 +125,7 @@
             args.putInt(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX,
                     subscription.getSubscriptionId());
         }
-        args.putBoolean(MasterClear.ERASE_ESIMS_EXTRA,
+        args.putBoolean(MainClear.ERASE_ESIMS_EXTRA,
                 mEsimContainer.getVisibility() == View.VISIBLE && mEsimCheckbox.isChecked());
         new SubSettingLauncher(getContext())
                 .setDestination(ResetNetworkConfirm.class.getName())
diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android/settings/ResetNetworkConfirm.java
index 6856a5a..53fe369 100644
--- a/src/com/android/settings/ResetNetworkConfirm.java
+++ b/src/com/android/settings/ResetNetworkConfirm.java
@@ -188,7 +188,7 @@
         progressDialog.setIndeterminate(true);
         progressDialog.setCancelable(false);
         progressDialog.setMessage(
-                context.getString(R.string.master_clear_progress_text));
+                context.getString(R.string.main_clear_progress_text));
         return progressDialog;
     }
 
@@ -251,7 +251,7 @@
         if (args != null) {
             mSubId = args.getInt(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX,
                     SubscriptionManager.INVALID_SUBSCRIPTION_ID);
-            mEraseEsim = args.getBoolean(MasterClear.ERASE_ESIMS_EXTRA);
+            mEraseEsim = args.getBoolean(MainClear.ERASE_ESIMS_EXTRA);
         }
 
         mActivity = getActivity();
diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index 0325842..812ab41 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -218,11 +218,11 @@
     }
 
     @Override
-    public void onWhitelistStatusChanged(int uid, boolean isWhitelisted) {
+    public void onAllowlistStatusChanged(int uid, boolean isAllowlisted) {
     }
 
     @Override
-    public void onBlacklistStatusChanged(int uid, boolean isBlacklisted)  {
+    public void onDenylistStatusChanged(int uid, boolean isDenylisted)  {
     }
 
     @VisibleForTesting
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 64919d9..a7e0eec 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -525,7 +525,7 @@
      * @return UserInfo of the user or null for non-existent user.
      */
     public static UserInfo getExistingUser(UserManager userManager, UserHandle checkUser) {
-        final List<UserInfo> users = userManager.getUsers(true /* excludeDying */);
+        final List<UserInfo> users = userManager.getAliveUsers();
         final int checkUserId = checkUser.getIdentifier();
         for (UserInfo user : users) {
             if (user.id == checkUserId) {
@@ -634,7 +634,7 @@
      *
      * @param isInternal indicating if the caller is "internal" to the system,
      *            meaning we're willing to trust extras like
-     *            {@link ChooseLockSettingsHelper#EXTRA_ALLOW_ANY_USER}.
+     *            {@link ChooseLockSettingsHelper#EXTRA_KEY_ALLOW_ANY_USER}.
      * @throws SecurityException if the given userId does not belong to the
      *             current user group.
      */
@@ -643,7 +643,7 @@
             return getCredentialOwnerUserId(context);
         }
         final boolean allowAnyUser = isInternal
-                && bundle.getBoolean(ChooseLockSettingsHelper.EXTRA_ALLOW_ANY_USER, false);
+                && bundle.getBoolean(ChooseLockSettingsHelper.EXTRA_KEY_ALLOW_ANY_USER, false);
         final int userId = bundle.getInt(Intent.EXTRA_USER_ID, UserHandle.myUserId());
         if (userId == LockPatternUtils.USER_FRP) {
             return allowAnyUser ? userId : enforceSystemUser(context, userId);
diff --git a/src/com/android/settings/accessibility/AccessibilityEditDialogUtils.java b/src/com/android/settings/accessibility/AccessibilityEditDialogUtils.java
index 3930581..f349a12 100644
--- a/src/com/android/settings/accessibility/AccessibilityEditDialogUtils.java
+++ b/src/com/android/settings/accessibility/AccessibilityEditDialogUtils.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.accessibility;
 
+import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.res.TypedArray;
@@ -26,6 +27,7 @@
 import android.text.style.ImageSpan;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
@@ -56,12 +58,14 @@
          DialogType.EDIT_SHORTCUT_GENERIC,
          DialogType.EDIT_SHORTCUT_MAGNIFICATION,
          DialogType.EDIT_MAGNIFICATION_MODE,
+         DialogType.EDIT_MAGNIFICATION_SWITCH_SHORTCUT,
     })
 
     private @interface DialogType {
         int EDIT_SHORTCUT_GENERIC = 0;
         int EDIT_SHORTCUT_MAGNIFICATION = 1;
         int EDIT_MAGNIFICATION_MODE = 2;
+        int EDIT_MAGNIFICATION_SWITCH_SHORTCUT = 3;
     }
 
     /**
@@ -115,6 +119,26 @@
         return alertDialog;
     }
 
+    /**
+     * Method to show the magnification edit shortcut dialog in Magnification.
+     *
+     * @param context A valid context
+     * @param dialogTitle The title of magnify edit shortcut dialog
+     * @param listener The listener to determine the action of magnify edit shortcut dialog
+     * @return A magnification edit shortcut dialog in Magnification
+     */
+    public static Dialog showMagnificationSwitchShortcutDialog(Context context,
+            CharSequence dialogTitle, View.OnClickListener listener) {
+        final AlertDialog alertDialog = new AlertDialog.Builder(context)
+                .setView(createSwitchShortcutDialogContentView(context))
+                .setTitle(dialogTitle)
+                .create();
+        alertDialog.show();
+        setEditShortcutButtonsListener(alertDialog, listener);
+        setScrollIndicators(alertDialog);
+        return alertDialog;
+    }
+
     private static AlertDialog createDialog(Context context, int dialogType,
             CharSequence dialogTitle, DialogInterface.OnClickListener listener) {
 
@@ -140,6 +164,22 @@
                 View.SCROLL_INDICATOR_TOP | View.SCROLL_INDICATOR_BOTTOM);
     }
 
+    private static void setEditShortcutButtonsListener(AlertDialog dialog,
+            View.OnClickListener listener) {
+        final View contentView = dialog.findViewById(R.id.container_layout);
+        final Button positiveButton = contentView.findViewById(
+                R.id.switch_shortcut_positive_button);
+        final Button negativeButton = contentView.findViewById(
+                R.id.switch_shortcut_negative_button);
+
+        positiveButton.setOnClickListener(listener);
+        negativeButton.setOnClickListener(v -> dialog.dismiss());
+    }
+
+    private static View createSwitchShortcutDialogContentView(Context context) {
+        return createEditDialogContentView(context, DialogType.EDIT_MAGNIFICATION_SWITCH_SHORTCUT);
+    }
+
     /**
      * Get a content View for the edit shortcut dialog.
      *
@@ -174,6 +214,10 @@
                 initMagnifyFullScreen(context, contentView);
                 initMagnifyWindowScreen(context, contentView);
                 break;
+            case DialogType.EDIT_MAGNIFICATION_SWITCH_SHORTCUT:
+                contentView = inflater.inflate(
+                        R.layout.accessibility_edit_magnification_shortcut, null);
+                break;
             default:
                 throw new IllegalArgumentException();
         }
@@ -185,7 +229,6 @@
         final View dialogView = view.findViewById(R.id.magnify_full_screen);
         final CharSequence title = context.getText(
                 R.string.accessibility_magnification_area_settings_full_screen);
-        // TODO(b/146019459): Use vector drawable instead of temporal png file to avoid distorted.
         setupShortcutWidget(dialogView, title, R.drawable.accessibility_magnification_full_screen);
     }
 
@@ -193,7 +236,6 @@
         final View dialogView = view.findViewById(R.id.magnify_window_screen);
         final CharSequence title = context.getText(
                 R.string.accessibility_magnification_area_settings_window_screen);
-        // TODO(b/146019459): Use vector drawable instead of temporal png file to avoid distorted.
         setupShortcutWidget(dialogView, title,
                 R.drawable.accessibility_magnification_window_screen);
     }
diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
index f918046..fca49f9 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -216,6 +216,7 @@
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
         initializeAllPreferences();
+        updateAllPreferences();
     }
 
     @Override
@@ -229,7 +230,6 @@
     @Override
     public void onStart() {
         super.onStart();
-        updateAllPreferences();
 
         mSettingsPackageMonitor.register(getActivity(), getActivity().getMainLooper(), false);
         mSettingsContentObserver.register(getContentResolver());
diff --git a/src/com/android/settings/accessibility/BalanceSeekBar.java b/src/com/android/settings/accessibility/BalanceSeekBar.java
index ecc226b..15526b6 100644
--- a/src/com/android/settings/accessibility/BalanceSeekBar.java
+++ b/src/com/android/settings/accessibility/BalanceSeekBar.java
@@ -115,6 +115,7 @@
                 res.getDimensionPixelSize(R.dimen.balance_seekbar_center_marker_width),
                 res.getDimensionPixelSize(R.dimen.balance_seekbar_center_marker_height));
         mCenterMarkerPaint = new Paint();
+        // TODO use a more suitable colour?
         mCenterMarkerPaint.setColor(isNightMode(context) ? Color.WHITE : Color.BLACK);
         mCenterMarkerPaint.setStyle(Paint.Style.FILL);
         // Remove the progress colour
diff --git a/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java b/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java
index 23c0c57..ccc7d60 100644
--- a/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java
@@ -120,7 +120,7 @@
     protected void updateToggleServiceTitle(SwitchPreference switchPreference) {
         final AccessibilityShortcutInfo info = getAccessibilityShortcutInfo();
         final String switchBarText = (info == null) ? EMPTY_STRING : getString(
-                R.string.accessibility_service_master_open_title,
+                R.string.accessibility_service_primary_open_title,
                 info.getActivityInfo().loadLabel(getPackageManager()));
 
         switchPreference.setTitle(switchBarText);
diff --git a/src/com/android/settings/accessibility/MagnificationEnablePreferenceController.java b/src/com/android/settings/accessibility/MagnificationEnablePreferenceController.java
deleted file mode 100644
index 57a2962..0000000
--- a/src/com/android/settings/accessibility/MagnificationEnablePreferenceController.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.accessibility;
-
-import android.content.Context;
-import android.os.UserHandle;
-import android.provider.Settings;
-
-import com.android.settings.core.TogglePreferenceController;
-
-/** Controller that shows the magnification enable mode summary. */
-public class MagnificationEnablePreferenceController extends TogglePreferenceController {
-
-    private static final String KEY_ENABLE = Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE;
-
-    public MagnificationEnablePreferenceController(Context context, String preferenceKey) {
-        super(context, preferenceKey);
-    }
-
-    @Override
-    public boolean isChecked() {
-        final int enableMode = Settings.Secure.getIntForUser(mContext.getContentResolver(),
-                KEY_ENABLE,
-                Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN,
-                UserHandle.USER_CURRENT);
-        return enableMode == Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN;
-    }
-
-    @Override
-    public boolean setChecked(boolean isChecked) {
-        final int value = isChecked ? Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN
-                : Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW;
-        return Settings.Secure.putIntForUser(mContext.getContentResolver(), KEY_ENABLE, value,
-                UserHandle.USER_CURRENT);
-    }
-
-    @Override
-    public int getAvailabilityStatus() {
-        return AVAILABLE;
-    }
-}
diff --git a/src/com/android/settings/accessibility/MagnificationSettingsFragment.java b/src/com/android/settings/accessibility/MagnificationSettingsFragment.java
index 04e8036..6b91fab 100644
--- a/src/com/android/settings/accessibility/MagnificationSettingsFragment.java
+++ b/src/com/android/settings/accessibility/MagnificationSettingsFragment.java
@@ -16,17 +16,21 @@
 
 package com.android.settings.accessibility;
 
+import static com.android.internal.accessibility.AccessibilityShortcutController.MAGNIFICATION_CONTROLLER_NAME;
+import static com.android.settings.accessibility.AccessibilityUtil.State.OFF;
+import static com.android.settings.accessibility.AccessibilityUtil.State.ON;
+
 import android.app.Dialog;
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.provider.Settings;
+import android.text.TextUtils;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.CheckBox;
 
-import androidx.annotation.IntDef;
-import androidx.appcompat.app.AlertDialog;
 import androidx.preference.Preference;
 
 import com.android.settings.R;
@@ -36,8 +40,7 @@
 
 import com.google.common.primitives.Ints;
 
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
+import java.util.StringJoiner;
 
 /** Settings page for magnification. */
 @SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
@@ -45,14 +48,18 @@
 
     private static final String TAG = "MagnificationSettingsFragment";
     private static final String PREF_KEY_MODE = "magnification_mode";
-    // TODO(b/146019459): Use magnification_capability.
-    private static final String KEY_CAPABILITY = Settings.System.MASTER_MONO;
+    private static final String KEY_CAPABILITY =
+            Settings.Secure.ACCESSIBILITY_MAGNIFICATION_CAPABILITY;
     private static final int DIALOG_MAGNIFICATION_CAPABILITY = 1;
+    private static final int DIALOG_MAGNIFICATION_SWITCH_SHORTCUT = 2;
     private static final String EXTRA_CAPABILITY = "capability";
+    private static final int NONE = 0;
+    private static final char COMPONENT_NAME_SEPARATOR = ':';
     private Preference mModePreference;
-    private int mCapabilities = MagnifyMode.NONE;
+    private int mCapabilities = NONE;
     private CheckBox mMagnifyFullScreenCheckBox;
     private CheckBox mMagnifyWindowCheckBox;
+    private Dialog mDialog;
 
     static String getMagnificationCapabilitiesSummary(Context context) {
         final String[] magnificationModeSummaries = context.getResources().getStringArray(
@@ -67,7 +74,8 @@
     }
 
     private static int getMagnificationCapabilities(Context context) {
-        return getSecureIntValue(context, KEY_CAPABILITY, MagnifyMode.FULLSCREEN);
+        return getSecureIntValue(context, KEY_CAPABILITY,
+                Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN);
     }
 
     private static int getSecureIntValue(Context context, String key, int defaultValue) {
@@ -91,9 +99,9 @@
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
         if (savedInstanceState != null) {
-            mCapabilities = savedInstanceState.getInt(EXTRA_CAPABILITY, MagnifyMode.NONE);
+            mCapabilities = savedInstanceState.getInt(EXTRA_CAPABILITY, NONE);
         }
-        if (mCapabilities == MagnifyMode.NONE) {
+        if (mCapabilities == NONE) {
             mCapabilities = getMagnificationCapabilities(getPrefContext());
         }
     }
@@ -103,6 +111,8 @@
         switch (dialogId) {
             case DIALOG_MAGNIFICATION_CAPABILITY:
                 return SettingsEnums.DIALOG_MAGNIFICATION_CAPABILITY;
+            case DIALOG_MAGNIFICATION_SWITCH_SHORTCUT:
+                return SettingsEnums.DIALOG_MAGNIFICATION_SWITCH_SHORTCUT;
             default:
                 return 0;
         }
@@ -131,15 +141,23 @@
 
     @Override
     public Dialog onCreateDialog(int dialogId) {
-        if (dialogId == DIALOG_MAGNIFICATION_CAPABILITY) {
-            final String title = getPrefContext().getString(
-                    R.string.accessibility_magnification_mode_title);
-            AlertDialog alertDialog = AccessibilityEditDialogUtils
-                    .showMagnificationModeDialog(getPrefContext(), title,
-                            this::callOnAlertDialogCheckboxClicked);
-            initializeDialogCheckBox(alertDialog);
-            return alertDialog;
+        final CharSequence title;
+        switch (dialogId) {
+            case DIALOG_MAGNIFICATION_CAPABILITY:
+                title = getPrefContext().getString(
+                        R.string.accessibility_magnification_mode_title);
+                mDialog = AccessibilityEditDialogUtils.showMagnificationModeDialog(getPrefContext(),
+                        title, this::callOnAlertDialogCheckboxClicked);
+                initializeDialogCheckBox(mDialog);
+                return mDialog;
+            case DIALOG_MAGNIFICATION_SWITCH_SHORTCUT:
+                title = getPrefContext().getString(
+                        R.string.accessibility_magnification_switch_shortcut_title);
+                mDialog = AccessibilityEditDialogUtils.showMagnificationSwitchShortcutDialog(
+                        getPrefContext(), title, this::onSwitchShortcutDialogPositiveButtonClicked);
+                return mDialog;
         }
+
         throw new IllegalArgumentException("Unsupported dialogId " + dialogId);
     }
 
@@ -149,63 +167,133 @@
                 getMagnificationCapabilitiesSummary(getPrefContext()));
     }
 
-    private void initializeDialogCheckBox(AlertDialog dialog) {
+    private void onSwitchShortcutDialogPositiveButtonClicked(View view) {
+        //TODO(b/147990389): Merge this function into util until magnification change format to
+        // Component.
+        optOutMagnificationFromTripleTap();
+        optInMagnificationToAccessibilityButton();
+
+        mDialog.dismiss();
+    }
+
+    private void optOutMagnificationFromTripleTap() {
+        Settings.Secure.putInt(getPrefContext().getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, OFF);
+    }
+
+    private void optInMagnificationToAccessibilityButton() {
+        final String targetKey = Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS;
+        final String targetString = Settings.Secure.getString(getPrefContext().getContentResolver(),
+                targetKey);
+        if (targetString.contains(MAGNIFICATION_CONTROLLER_NAME)) {
+            return;
+        }
+
+        final StringJoiner joiner = new StringJoiner(String.valueOf(COMPONENT_NAME_SEPARATOR));
+
+        if (!TextUtils.isEmpty(targetString)) {
+            joiner.add(targetString);
+        }
+        joiner.add(MAGNIFICATION_CONTROLLER_NAME);
+
+        Settings.Secure.putString(getPrefContext().getContentResolver(), targetKey,
+                joiner.toString());
+    }
+
+    private void initializeDialogCheckBox(Dialog dialog) {
         final View dialogFullScreenView = dialog.findViewById(R.id.magnify_full_screen);
+        final View dialogFullScreenTextArea = dialogFullScreenView.findViewById(R.id.container);
         mMagnifyFullScreenCheckBox = dialogFullScreenView.findViewById(R.id.checkbox);
 
         final View dialogWidowView = dialog.findViewById(R.id.magnify_window_screen);
+        final View dialogWindowTextArea = dialogWidowView.findViewById(R.id.container);
         mMagnifyWindowCheckBox = dialogWidowView.findViewById(R.id.checkbox);
 
+        setTextAreasClickListener(dialogFullScreenTextArea, mMagnifyFullScreenCheckBox,
+                dialogWindowTextArea, mMagnifyWindowCheckBox);
+
         updateAlertDialogCheckState();
-        updateAlertDialogEnableState();
+        updateAlertDialogEnableState(dialogFullScreenTextArea, dialogWindowTextArea);
+    }
+
+    private void setTextAreasClickListener(View fullScreenTextArea, CheckBox fullScreenCheckBox,
+            View windowTextArea, CheckBox windowCheckBox) {
+        fullScreenTextArea.setOnClickListener(v -> {
+            fullScreenCheckBox.toggle();
+            updateCapabilities(false);
+            updateAlertDialogEnableState(fullScreenTextArea, windowTextArea);
+        });
+
+        windowTextArea.setOnClickListener(v -> {
+            windowCheckBox.toggle();
+            updateCapabilities(false);
+            updateAlertDialogEnableState(fullScreenTextArea, windowTextArea);
+
+            if (isTripleTapEnabled() && windowCheckBox.isChecked()) {
+                showDialog(DIALOG_MAGNIFICATION_SWITCH_SHORTCUT);
+            }
+        });
     }
 
     private void updateAlertDialogCheckState() {
-        updateCheckStatus(mMagnifyWindowCheckBox, MagnifyMode.WINDOW);
-        updateCheckStatus(mMagnifyFullScreenCheckBox, MagnifyMode.FULLSCREEN);
+        updateCheckStatus(mMagnifyWindowCheckBox,
+                Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW);
+        updateCheckStatus(mMagnifyFullScreenCheckBox,
+                Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN);
 
     }
 
     private void updateCheckStatus(CheckBox checkBox, int mode) {
         checkBox.setChecked((mode & mCapabilities) != 0);
-        checkBox.setOnClickListener(v -> {
-            updateCapabilities(false);
-            updateAlertDialogEnableState();
-        });
     }
 
-    private void updateAlertDialogEnableState() {
-        if (mCapabilities != MagnifyMode.ALL) {
-            disableEnabledMagnificationModePreference();
-        } else {
-            enableAllPreference();
+    private void updateAlertDialogEnableState(View fullScreenTextArea, View windowTextArea) {
+        switch (mCapabilities) {
+            case Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN:
+                setViewAndChildrenEnabled(fullScreenTextArea, false);
+                break;
+            case Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW:
+                setViewAndChildrenEnabled(windowTextArea, false);
+                break;
+            case Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_ALL:
+                setViewAndChildrenEnabled(fullScreenTextArea, true);
+                setViewAndChildrenEnabled(windowTextArea, true);
+                break;
+            default:
+                throw new IllegalArgumentException(
+                        "Unsupported ACCESSIBILITY_MAGNIFICATION_CAPABILITY " + mCapabilities);
         }
     }
 
-    private void enableAllPreference() {
-        mMagnifyFullScreenCheckBox.setEnabled(true);
-        mMagnifyWindowCheckBox.setEnabled(true);
-    }
-
-    private void disableEnabledMagnificationModePreference() {
-        if (!mMagnifyFullScreenCheckBox.isChecked()) {
-            mMagnifyWindowCheckBox.setEnabled(false);
-        } else if (!mMagnifyWindowCheckBox.isChecked()) {
-            mMagnifyFullScreenCheckBox.setEnabled(false);
+    private void setViewAndChildrenEnabled(View view, boolean enabled) {
+        view.setEnabled(enabled);
+        if (view instanceof ViewGroup) {
+            final ViewGroup viewGroup = (ViewGroup) view;
+            for (int i = 0; i < viewGroup.getChildCount(); i++) {
+                View child = viewGroup.getChildAt(i);
+                setViewAndChildrenEnabled(child, enabled);
+            }
         }
     }
 
     private void updateCapabilities(boolean saveToDB) {
         int capabilities = 0;
         capabilities |=
-                mMagnifyFullScreenCheckBox.isChecked() ? MagnifyMode.FULLSCREEN : 0;
-        capabilities |= mMagnifyWindowCheckBox.isChecked() ? MagnifyMode.WINDOW : 0;
+                mMagnifyFullScreenCheckBox.isChecked()
+                        ? Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN : 0;
+        capabilities |= mMagnifyWindowCheckBox.isChecked()
+                ? Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW : 0;
         mCapabilities = capabilities;
         if (saveToDB) {
             setMagnificationCapabilities(capabilities);
         }
     }
 
+    private boolean isTripleTapEnabled() {
+        return Settings.Secure.getInt(getPrefContext().getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, OFF) == ON;
+    }
+
     private void setSecureIntValue(String key, int value) {
         Settings.Secure.putIntForUser(getPrefContext().getContentResolver(),
                 key, value, getPrefContext().getContentResolver().getUserId());
@@ -215,20 +303,6 @@
         setSecureIntValue(KEY_CAPABILITY, capabilities);
     }
 
-    @Retention(RetentionPolicy.SOURCE)
-    @IntDef({
-            MagnifyMode.NONE,
-            MagnifyMode.FULLSCREEN,
-            MagnifyMode.WINDOW,
-            MagnifyMode.ALL,
-    })
-    private @interface MagnifyMode {
-        int NONE = 0;
-        int FULLSCREEN = 1;
-        int WINDOW = 2;
-        int ALL = 3;
-    }
-
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider(R.xml.accessibility_magnification_service_settings);
 }
diff --git a/src/com/android/settings/accessibility/PaletteListPreference.java b/src/com/android/settings/accessibility/PaletteListPreference.java
index c5c4205..ac552eb 100644
--- a/src/com/android/settings/accessibility/PaletteListPreference.java
+++ b/src/com/android/settings/accessibility/PaletteListPreference.java
@@ -16,23 +16,58 @@
 
 package com.android.settings.accessibility;
 
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.ViewTreeObserver;
-import android.widget.FrameLayout;
-import android.widget.ListView;
+import static android.graphics.drawable.GradientDrawable.Orientation;
 
+import static com.android.settings.accessibility.AccessibilityUtil.getScreenHeightPixels;
+import static com.android.settings.accessibility.AccessibilityUtil.getScreenWidthPixels;
+
+import static com.google.common.primitives.Ints.max;
+
+import android.content.Context;
+import android.graphics.Paint.FontMetrics;
+import android.graphics.drawable.GradientDrawable;
+import android.util.AttributeSet;
+import android.view.Gravity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.annotation.ColorInt;
+import androidx.annotation.IntDef;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceViewHolder;
 
 import com.android.settings.R;
 
-/** Preference that easier preview by matching name to color. */
-public class PaletteListPreference extends Preference {
+import com.google.common.primitives.Floats;
+import com.google.common.primitives.Ints;
 
-    private ListView mListView;
-    private ViewTreeObserver.OnPreDrawListener mPreDrawListener;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/** Preference that easier preview by matching name to color. */
+public final class PaletteListPreference extends Preference {
+
+    private final List<Integer> mGradientColors = new ArrayList<>();
+    private final List<Float> mGradientOffsets = new ArrayList<>();
+
+    @IntDef({
+            Position.START,
+            Position.CENTER,
+            Position.END,
+    })
+    @Retention(RetentionPolicy.SOURCE)
+    @interface Position {
+        int START = 0;
+        int CENTER = 1;
+        int END = 2;
+    }
 
     /**
      * Constructs a new PaletteListPreference with the given context's theme and the supplied
@@ -61,47 +96,94 @@
     public PaletteListPreference(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
         setLayoutResource(R.layout.daltonizer_preview);
-        initPreDrawListener();
     }
 
     @Override
     public void onBindViewHolder(PreferenceViewHolder holder) {
         super.onBindViewHolder(holder);
 
-        final View rootView = holder.itemView;
-        mListView = rootView.findViewById(R.id.palette_listView);
-        if (mPreDrawListener != null) {
-            mListView.getViewTreeObserver().addOnPreDrawListener(mPreDrawListener);
+        final ViewGroup paletteView = holder.itemView.findViewById(R.id.palette_view);
+        initPaletteAttributes(getContext());
+        initPaletteView(getContext(), paletteView);
+    }
+
+    private void initPaletteAttributes(Context context) {
+        final int defaultColor = context.getColor(R.color.palette_list_gradient_background);
+        mGradientColors.add(Position.START, defaultColor);
+        mGradientColors.add(Position.CENTER, defaultColor);
+        mGradientColors.add(Position.END, defaultColor);
+
+        mGradientOffsets.add(Position.START, /* element= */ 0.0f);
+        mGradientOffsets.add(Position.CENTER, /* element= */ 0.5f);
+        mGradientOffsets.add(Position.END, /* element= */ 1.0f);
+    }
+
+    private void initPaletteView(Context context, ViewGroup rootView) {
+        if (rootView.getChildCount() > 0) {
+            rootView.removeAllViews();
+        }
+
+        final List<Integer> paletteColors = getPaletteColors(context);
+        final List<String> paletteData = getPaletteData(context);
+
+        final float textPadding =
+                context.getResources().getDimension(R.dimen.accessibility_layout_margin_start_end);
+        final String maxLengthData =
+                Collections.max(paletteData, Comparator.comparing(String::length));
+        final int textWidth = getTextWidth(context, maxLengthData);
+        final float textBound = (textWidth + textPadding) / getScreenWidthPixels(context);
+        mGradientOffsets.set(Position.CENTER, textBound);
+
+        final int screenHalfHeight = getScreenHeightPixels(context) / 2;
+        final int paletteItemHeight =
+                max(screenHalfHeight / paletteData.size(), getTextLineHeight(context));
+
+        for (int i = 0; i < paletteData.size(); ++i) {
+            final TextView textView = new TextView(context);
+            textView.setText(paletteData.get(i));
+            textView.setHeight(paletteItemHeight);
+            textView.setPaddingRelative(Math.round(textPadding), 0, 0, 0);
+            textView.setGravity(Gravity.CENTER_VERTICAL);
+            textView.setBackground(createGradientDrawable(rootView, paletteColors.get(i)));
+
+            rootView.addView(textView);
         }
     }
 
-    private void initPreDrawListener() {
-        mPreDrawListener = new ViewTreeObserver.OnPreDrawListener() {
-            @Override
-            public boolean onPreDraw() {
-                if (mListView == null) {
-                    return false;
-                }
+    private GradientDrawable createGradientDrawable(ViewGroup rootView, @ColorInt int color) {
+        mGradientColors.set(Position.END, color);
 
-                final int listViewHeight = mListView.getMeasuredHeight();
-                final int listViewWidth = mListView.getMeasuredWidth();
+        final GradientDrawable gradientDrawable = new GradientDrawable();
+        final Orientation orientation =
+                rootView.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL
+                        ? Orientation.RIGHT_LEFT
+                        : Orientation.LEFT_RIGHT;
+        gradientDrawable.setOrientation(orientation);
+        gradientDrawable.setColors(Ints.toArray(mGradientColors), Floats.toArray(mGradientOffsets));
 
-                // Removes the callback after get result of measure view.
-                final ViewTreeObserver viewTreeObserver = mListView.getViewTreeObserver();
-                if (viewTreeObserver.isAlive()) {
-                    viewTreeObserver.removeOnPreDrawListener(this);
-                }
-                mPreDrawListener = null;
+        return gradientDrawable;
+    }
 
-                // Resets layout parameters to display whole items from listView.
-                final FrameLayout.LayoutParams layoutParams =
-                        (FrameLayout.LayoutParams) mListView.getLayoutParams();
-                layoutParams.height = listViewHeight * mListView.getAdapter().getCount();
-                layoutParams.width = listViewWidth;
-                mListView.setLayoutParams(layoutParams);
+    private List<Integer> getPaletteColors(Context context) {
+        final int[] paletteResources =
+                context.getResources().getIntArray(R.array.setting_palette_colors);
+        return Arrays.stream(paletteResources).boxed().collect(Collectors.toList());
+    }
 
-                return true;
-            }
-        };
+    private List<String> getPaletteData(Context context) {
+        final String[] paletteResources =
+                context.getResources().getStringArray(R.array.setting_palette_data);
+        return Arrays.asList(paletteResources);
+    }
+
+    private int getTextWidth(Context context, String text) {
+        final TextView tempView = new TextView(context);
+        return Math.round(tempView.getPaint().measureText(text));
+    }
+
+    private int getTextLineHeight(Context context) {
+        final TextView tempView = new TextView(context);
+        final FontMetrics fontMetrics = tempView.getPaint().getFontMetrics();
+        return Math.round(fontMetrics.bottom - fontMetrics.top);
     }
 }
diff --git a/src/com/android/settings/accessibility/PaletteListView.java b/src/com/android/settings/accessibility/PaletteListView.java
deleted file mode 100644
index ef010e2..0000000
--- a/src/com/android/settings/accessibility/PaletteListView.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.accessibility;
-
-import android.annotation.NonNull;
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.Color;
-import android.graphics.drawable.GradientDrawable;
-import android.graphics.drawable.GradientDrawable.Orientation;
-import android.util.AttributeSet;
-import android.util.DisplayMetrics;
-import android.view.Display;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.WindowManager;
-import android.widget.BaseAdapter;
-import android.widget.ListView;
-import android.widget.TextView;
-
-import androidx.annotation.VisibleForTesting;
-
-import com.android.settings.R;
-
-import com.google.common.collect.Iterables;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-/**
- * Custom ListView {@link ListView} which displays palette to deploy the color code preview.
- *
- * <p>The preview shows gradient from color white to specific color code on each list view item, in
- * addition, text view adjusts the attribute of width for adapting the text length.
- *
- * <p>The text cannot fills the whole view for ensuring the gradient color preview can purely
- * display also the view background shows the color beside the text variable end point.
- */
-public class PaletteListView extends ListView {
-    private final Context mContext;
-    private final DisplayAdapter mDisplayAdapter;
-    private final LayoutInflater mLayoutInflater;
-    private final String mDefaultGradientColorCodeString;
-    private final int mDefaultGradientColor;
-    private float mTextBound;
-    private static final float LANDSCAPE_MAX_WIDTH_PERCENTAGE = 100f;
-
-    public PaletteListView(Context context) {
-        this(context, null);
-    }
-
-    public PaletteListView(Context context, AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
-    public PaletteListView(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        mContext = context;
-        mDisplayAdapter = new DisplayAdapter();
-        mLayoutInflater = LayoutInflater.from(context);
-        mDefaultGradientColorCodeString =
-                getResources().getString(R.color.palette_list_gradient_background);
-        mDefaultGradientColor =
-                getResources().getColor(R.color.palette_list_gradient_background, null);
-        mTextBound = 0.0f;
-        init();
-    }
-
-    private static int getScreenWidth(WindowManager windowManager) {
-        final Display display = windowManager.getDefaultDisplay();
-        final DisplayMetrics displayMetrics = new DisplayMetrics();
-        display.getMetrics(displayMetrics);
-        return displayMetrics.widthPixels;
-    }
-
-    private void init() {
-        final TypedArray colorNameArray = getResources().obtainTypedArray(
-                R.array.setting_palette_colors);
-        final TypedArray colorCodeArray = getResources().obtainTypedArray(
-                R.array.setting_palette_data);
-        final int colorNameArrayLength = colorNameArray.length();
-        final List<ColorAttributes> colorList = new ArrayList<>();
-        computeTextWidthBounds(colorNameArray);
-
-        for (int index = 0; index < colorNameArrayLength; index++) {
-            colorList.add(
-                    new ColorAttributes(
-                            /* colorName= */ colorNameArray.getString(index),
-                            /* colorCode= */ colorCodeArray.getColor(index, mDefaultGradientColor),
-                            /* textBound= */ mTextBound,
-                            /* gradientDrawable= */
-                            new GradientDrawable(Orientation.LEFT_RIGHT, null)));
-        }
-
-        mDisplayAdapter.setColorList(colorList);
-        setAdapter(mDisplayAdapter);
-        setDividerHeight(/* height= */ 0);
-    }
-
-    /**
-     * Sets string array that required the color name and color code for deploy the new color
-     * preview.
-     *
-     * <p>The parameters not allow null define but two array length inconsistent are acceptable, in
-     * addition, to prevent IndexOutOfBoundsException the algorithm will check array data, and base
-     * on the array size to display data, or fills color code array if length less than other.
-     *
-     * @param colorNames a string array of color name
-     * @param colorCodes a string array of color code
-     * @return true if new array data apply successful
-     */
-    @VisibleForTesting
-    boolean setPaletteListColors(@NonNull String[] colorNames, @NonNull String[] colorCodes) {
-        if (colorNames == null || colorCodes == null) {
-            return false;
-        }
-
-        final int colorNameArrayLength = colorNames.length;
-        final int colorCodeArrayLength = colorCodes.length;
-        final List<ColorAttributes> colorList = new ArrayList<>();
-        final String[] colorCodeArray = fillColorCodeArray(colorCodes, colorNameArrayLength,
-                colorCodeArrayLength);
-        computeTextWidthBounds(colorNames);
-
-        for (int index = 0; index < colorNameArrayLength; index++) {
-            colorList.add(
-                    new ColorAttributes(
-                            /* colorName= */ colorNames[index],
-                            /* colorCode= */ Color.parseColor(colorCodeArray[index]),
-                            /* textBound= */ mTextBound,
-                            /* gradientDrawable= */
-                            new GradientDrawable(Orientation.LEFT_RIGHT, null)));
-        }
-
-        mDisplayAdapter.setColorList(colorList);
-        mDisplayAdapter.notifyDataSetChanged();
-        return true;
-    }
-
-    private String[] fillColorCodeArray(String[] colorCodes, int colorNameArrayLength,
-            int colorCodeArrayLength) {
-        if (colorNameArrayLength == colorCodeArrayLength
-                || colorNameArrayLength < colorCodeArrayLength) {
-            return colorCodes;
-        }
-
-        final String[] colorCodeArray = new String[colorNameArrayLength];
-        for (int index = 0; index < colorNameArrayLength; index++) {
-            if (index < colorCodeArrayLength) {
-                colorCodeArray[index] = colorCodes[index];
-            } else {
-                colorCodeArray[index] = mDefaultGradientColorCodeString;
-            }
-        }
-        return colorCodeArray;
-    }
-
-    private void computeTextWidthBounds(TypedArray colorNameTypedArray) {
-        final int colorNameArrayLength = colorNameTypedArray.length();
-        final String[] colorNames = new String[colorNameArrayLength];
-        for (int index = 0; index < colorNameArrayLength; index++) {
-            colorNames[index] = colorNameTypedArray.getString(index);
-        }
-
-        measureBound(colorNames);
-    }
-
-    private void computeTextWidthBounds(String[] colorNameArray) {
-        final int colorNameArrayLength = colorNameArray.length;
-        final String[] colorNames = new String[colorNameArrayLength];
-        for (int index = 0; index < colorNameArrayLength; index++) {
-            colorNames[index] = colorNameArray[index];
-        }
-
-        measureBound(colorNames);
-    }
-
-    private void measureBound(String[] dataArray) {
-        final WindowManager windowManager = (WindowManager) mContext.getSystemService(
-                Context.WINDOW_SERVICE);
-        final View view = mLayoutInflater.inflate(R.layout.palette_listview_item, null);
-        final TextView textView = view.findViewById(R.id.item_textview);
-        final List<String> colorNameList = new ArrayList<>(Arrays.asList(dataArray));
-        Collections.sort(colorNameList, Comparator.comparing(String::length));
-        // Gets the last index of list which sort by text length.
-        textView.setText(Iterables.getLast(colorNameList));
-
-        final float textWidth = textView.getPaint().measureText(textView.getText().toString());
-        // Computes rate of text width compare to screen width, and measures the round the double
-        // to two decimal places manually.
-        final float textBound = Math.round(
-                textWidth / getScreenWidth(windowManager) * LANDSCAPE_MAX_WIDTH_PERCENTAGE)
-                / LANDSCAPE_MAX_WIDTH_PERCENTAGE;
-
-        // Left padding and right padding with color preview.
-        final float paddingPixel = getResources().getDimension(
-                R.dimen.accessibility_layout_margin_start_end);
-        final float paddingWidth =
-                Math.round(paddingPixel / getScreenWidth(windowManager)
-                        * LANDSCAPE_MAX_WIDTH_PERCENTAGE) / LANDSCAPE_MAX_WIDTH_PERCENTAGE;
-        mTextBound = textBound + paddingWidth + paddingWidth;
-    }
-
-    private static class ViewHolder {
-        public TextView textView;
-    }
-
-    /** An adapter that converts color text title and color code to text views. */
-    private final class DisplayAdapter extends BaseAdapter {
-
-        private List<ColorAttributes> mColorList;
-
-        @Override
-        public int getCount() {
-            return mColorList.size();
-        }
-
-        @Override
-        public Object getItem(int position) {
-            return mColorList.get(position);
-        }
-
-        @Override
-        public long getItemId(int position) {
-            return position;
-        }
-
-        @Override
-        public View getView(int position, View convertView, ViewGroup parent) {
-            final ViewHolder viewHolder;
-            final ColorAttributes paletteAttribute = mColorList.get(position);
-            final String colorName = paletteAttribute.getColorName();
-            final GradientDrawable gradientDrawable = paletteAttribute.getGradientDrawable();
-
-            if (convertView == null) {
-                convertView = mLayoutInflater.inflate(R.layout.palette_listview_item, null);
-                viewHolder = new ViewHolder();
-                viewHolder.textView = convertView.findViewById(R.id.item_textview);
-                convertView.setTag(viewHolder);
-            } else {
-                viewHolder = (ViewHolder) convertView.getTag();
-            }
-
-            viewHolder.textView.setText(colorName);
-            viewHolder.textView.setBackground(gradientDrawable);
-            return convertView;
-        }
-
-        protected void setColorList(List<ColorAttributes> colorList) {
-            mColorList = colorList;
-        }
-    }
-
-    private final class ColorAttributes {
-        private final int mColorIndex = 2; // index for inject color.
-        private final int mColorOffsetIndex = 1; // index for offset effect.
-        private final String mColorName;
-        private final GradientDrawable mGradientDrawable;
-        private final int[] mGradientColors =
-                {/* startColor=*/ mDefaultGradientColor, /* centerColor=*/ mDefaultGradientColor,
-                        /* endCode= */ 0};
-        private final float[] mGradientOffsets =
-                {/* starOffset= */ 0.0f, /* centerOffset= */ 0.5f, /* endOffset= */ 1.0f};
-
-        ColorAttributes(
-                String colorName, int colorCode, float textBound,
-                GradientDrawable gradientDrawable) {
-            mGradientColors[mColorIndex] = colorCode;
-            mGradientOffsets[mColorOffsetIndex] = textBound;
-            gradientDrawable.setColors(mGradientColors, mGradientOffsets);
-            mColorName = colorName;
-            mGradientDrawable = gradientDrawable;
-        }
-
-        public String getColorName() {
-            return mColorName;
-        }
-
-        public GradientDrawable getGradientDrawable() {
-            return mGradientDrawable;
-        }
-    }
-}
diff --git a/src/com/android/settings/accessibility/MasterMonoPreferenceController.java b/src/com/android/settings/accessibility/PrimaryMonoPreferenceController.java
similarity index 86%
rename from src/com/android/settings/accessibility/MasterMonoPreferenceController.java
rename to src/com/android/settings/accessibility/PrimaryMonoPreferenceController.java
index 6082f14..bf12bde 100644
--- a/src/com/android/settings/accessibility/MasterMonoPreferenceController.java
+++ b/src/com/android/settings/accessibility/PrimaryMonoPreferenceController.java
@@ -22,9 +22,12 @@
 
 import com.android.settings.core.TogglePreferenceController;
 
-public class MasterMonoPreferenceController extends TogglePreferenceController {
+/**
+ * A toggle preference controller for Primary Mono
+ */
+public class PrimaryMonoPreferenceController extends TogglePreferenceController {
 
-    public MasterMonoPreferenceController(Context context, String preferenceKey) {
+    public PrimaryMonoPreferenceController(Context context, String preferenceKey) {
         super(context, preferenceKey);
     }
 
diff --git a/src/com/android/settings/accessibility/ShortcutPreference.java b/src/com/android/settings/accessibility/ShortcutPreference.java
index 05c8a15..a9b542a 100644
--- a/src/com/android/settings/accessibility/ShortcutPreference.java
+++ b/src/com/android/settings/accessibility/ShortcutPreference.java
@@ -62,7 +62,7 @@
     ShortcutPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
         setLayoutResource(R.layout.accessibility_shortcut_secondary_action);
-        setWidgetLayoutResource(R.layout.preference_widget_master_switch);
+        setWidgetLayoutResource(R.layout.preference_widget_primary_switch);
         setIconSpaceReserved(true);
     }
 
diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
index 05147a8..f892c50 100644
--- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
@@ -200,7 +200,7 @@
     protected void updateToggleServiceTitle(SwitchPreference switchPreference) {
         final AccessibilityServiceInfo info = getAccessibilityServiceInfo();
         final String switchBarText = (info == null) ? "" :
-                getString(R.string.accessibility_service_master_switch_title,
+                getString(R.string.accessibility_service_primary_switch_title,
                         info.getResolveInfo().loadLabel(getPackageManager()));
         switchPreference.setTitle(switchBarText);
     }
diff --git a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
index 8a4b7f8..6c47dc3 100644
--- a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
@@ -180,7 +180,7 @@
 
     @Override
     protected void updateToggleServiceTitle(SwitchPreference switchPreference) {
-        switchPreference.setTitle(R.string.accessibility_daltonizer_master_switch_title);
+        switchPreference.setTitle(R.string.accessibility_daltonizer_primary_switch_title);
     }
 
     @Override
diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
index d0b83b6..56f6733 100644
--- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
@@ -144,6 +144,21 @@
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
+        // Need to be called as early as possible. Protected variables will be assigned here.
+        onProcessArguments(getArguments());
+
+        initAnimatedImagePreference();
+        initToggleServiceDividerSwitchPreference();
+        initGeneralCategory();
+        initShortcutPreference(savedInstanceState);
+        initSettingsPreference();
+        initHtmlTextPreference();
+        initFooterPreference();
+
+        installActionBarToggleSwitch();
+
+        updateToggleServiceTitle(mToggleServiceDividerSwitchPreference);
+
         mTouchExplorationStateChangeListener = isTouchExplorationEnabled -> {
             removeDialog(DialogEnums.EDIT_SHORTCUT);
             mShortcutPreference.setSummary(getShortcutTypeSummary(getPrefContext()));
@@ -158,84 +173,6 @@
         final SettingsActivity activity = (SettingsActivity) getActivity();
         final SwitchBar switchBar = activity.getSwitchBar();
         switchBar.hide();
-
-        // Need to be called as early as possible. Protected variables will be assigned here.
-        onProcessArguments(getArguments());
-
-        PreferenceScreen preferenceScreen = getPreferenceScreen();
-        if (mImageUri != null) {
-            final int screenHalfHeight = getScreenHeightPixels(getPrefContext()) / /* half */ 2;
-            final AnimatedImagePreference animatedImagePreference = new AnimatedImagePreference(
-                    getPrefContext());
-            animatedImagePreference.setImageUri(mImageUri);
-            animatedImagePreference.setSelectable(false);
-            animatedImagePreference.setMaxHeight(screenHalfHeight);
-            preferenceScreen.addPreference(animatedImagePreference);
-        }
-
-        mToggleServiceDividerSwitchPreference = new DividerSwitchPreference(getPrefContext());
-        mToggleServiceDividerSwitchPreference.setKey(KEY_USE_SERVICE_PREFERENCE);
-        if (getArguments().containsKey(AccessibilitySettings.EXTRA_CHECKED)) {
-            final boolean enabled = getArguments().getBoolean(AccessibilitySettings.EXTRA_CHECKED);
-            mToggleServiceDividerSwitchPreference.setChecked(enabled);
-        }
-
-        preferenceScreen.addPreference(mToggleServiceDividerSwitchPreference);
-
-        updateToggleServiceTitle(mToggleServiceDividerSwitchPreference);
-
-        final PreferenceCategory groupCategory = new PreferenceCategory(getPrefContext());
-        groupCategory.setKey(KEY_GENERAL_CATEGORY);
-        groupCategory.setTitle(R.string.accessibility_screen_option);
-        preferenceScreen.addPreference(groupCategory);
-
-        initShortcutPreference(savedInstanceState);
-        groupCategory.addPreference(mShortcutPreference);
-
-        // Show the "Settings" menu as if it were a preference screen.
-        if (mSettingsTitle != null && mSettingsIntent != null) {
-            mSettingsPreference = new Preference(getPrefContext());
-            mSettingsPreference.setTitle(mSettingsTitle);
-            mSettingsPreference.setIconSpaceReserved(true);
-            mSettingsPreference.setIntent(mSettingsIntent);
-        }
-
-        // The downloaded app may not show Settings. The framework app has Settings.
-        if (mSettingsPreference != null) {
-            groupCategory.addPreference(mSettingsPreference);
-        }
-
-        if (!TextUtils.isEmpty(mHtmlDescription)) {
-            final PreferenceCategory introductionCategory = new PreferenceCategory(
-                    getPrefContext());
-            final CharSequence title = getString(R.string.accessibility_introduction_title,
-                    mPackageName);
-            introductionCategory.setKey(KEY_INTRODUCTION_CATEGORY);
-            introductionCategory.setTitle(title);
-            preferenceScreen.addPreference(introductionCategory);
-
-            final HtmlTextPreference htmlTextPreference = new HtmlTextPreference(getPrefContext());
-            htmlTextPreference.setSummary(mHtmlDescription);
-            htmlTextPreference.setImageGetter(mImageGetter);
-            htmlTextPreference.setSelectable(false);
-            introductionCategory.addPreference(htmlTextPreference);
-        }
-
-        if (!TextUtils.isEmpty(mDescription)) {
-            createFooterPreference(mDescription);
-        }
-
-        if (TextUtils.isEmpty(mHtmlDescription) && TextUtils.isEmpty(mDescription)) {
-            final CharSequence defaultDescription = getText(
-                    R.string.accessibility_service_default_description);
-            createFooterPreference(defaultDescription);
-        }
-    }
-
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-        installActionBarToggleSwitch();
     }
 
     @Override
@@ -365,7 +302,7 @@
     abstract int getUserShortcutTypes();
 
     protected void updateToggleServiceTitle(SwitchPreference switchPreference) {
-        switchPreference.setTitle(R.string.accessibility_service_master_switch_title);
+        switchPreference.setTitle(R.string.accessibility_service_primary_switch_title);
     }
 
     protected abstract void onPreferenceToggled(String preferenceKey, boolean enabled);
@@ -444,6 +381,93 @@
         return drawable;
     }
 
+    private void initAnimatedImagePreference() {
+        if (mImageUri == null) {
+            return;
+        }
+
+        final int screenHalfHeight = getScreenHeightPixels(getPrefContext()) / /* half */ 2;
+        final AnimatedImagePreference animatedImagePreference =
+                new AnimatedImagePreference(getPrefContext());
+        animatedImagePreference.setImageUri(mImageUri);
+        animatedImagePreference.setSelectable(false);
+        animatedImagePreference.setMaxHeight(screenHalfHeight);
+
+        getPreferenceScreen().addPreference(animatedImagePreference);
+    }
+
+    private void initToggleServiceDividerSwitchPreference() {
+        mToggleServiceDividerSwitchPreference = new DividerSwitchPreference(getPrefContext());
+        mToggleServiceDividerSwitchPreference.setKey(KEY_USE_SERVICE_PREFERENCE);
+        if (getArguments().containsKey(AccessibilitySettings.EXTRA_CHECKED)) {
+            final boolean enabled = getArguments().getBoolean(AccessibilitySettings.EXTRA_CHECKED);
+            mToggleServiceDividerSwitchPreference.setChecked(enabled);
+        }
+
+        getPreferenceScreen().addPreference(mToggleServiceDividerSwitchPreference);
+    }
+
+    private void initGeneralCategory() {
+        final PreferenceCategory generalCategory = new PreferenceCategory(getPrefContext());
+        generalCategory.setKey(KEY_GENERAL_CATEGORY);
+        generalCategory.setTitle(R.string.accessibility_screen_option);
+
+        getPreferenceScreen().addPreference(generalCategory);
+    }
+
+    protected void initSettingsPreference() {
+        if (mSettingsTitle == null || mSettingsIntent == null) {
+            return;
+        }
+
+        // Show the "Settings" menu as if it were a preference screen.
+        mSettingsPreference = new Preference(getPrefContext());
+        mSettingsPreference.setTitle(mSettingsTitle);
+        mSettingsPreference.setIconSpaceReserved(true);
+        mSettingsPreference.setIntent(mSettingsIntent);
+
+        final PreferenceCategory generalCategory = findPreference(KEY_GENERAL_CATEGORY);
+        generalCategory.addPreference(mSettingsPreference);
+    }
+
+    private void initIntroductionCategory() {
+        final PreferenceCategory introductionCategory = new PreferenceCategory(getPrefContext());
+        final CharSequence title =
+                getString(R.string.accessibility_introduction_title, mPackageName);
+        introductionCategory.setKey(KEY_INTRODUCTION_CATEGORY);
+        introductionCategory.setTitle(title);
+
+        getPreferenceScreen().addPreference(introductionCategory);
+    }
+
+    private void initHtmlTextPreference() {
+        if (TextUtils.isEmpty(mHtmlDescription)) {
+            return;
+        }
+
+        initIntroductionCategory();
+
+        final HtmlTextPreference htmlTextPreference = new HtmlTextPreference(getPrefContext());
+        htmlTextPreference.setSummary(mHtmlDescription);
+        htmlTextPreference.setImageGetter(mImageGetter);
+        htmlTextPreference.setSelectable(false);
+
+        final PreferenceCategory introductionCategory = findPreference(KEY_INTRODUCTION_CATEGORY);
+        introductionCategory.addPreference(htmlTextPreference);
+    }
+
+    private void initFooterPreference() {
+        if (!TextUtils.isEmpty(mDescription)) {
+            createFooterPreference(mDescription);
+        }
+
+        if (TextUtils.isEmpty(mHtmlDescription) && TextUtils.isEmpty(mDescription)) {
+            final CharSequence defaultDescription =
+                    getText(R.string.accessibility_service_default_description);
+            createFooterPreference(defaultDescription);
+        }
+    }
+
     static final class AccessibilityUserShortcutType {
         private static final char COMPONENT_NAME_SEPARATOR = ':';
         private static final TextUtils.SimpleStringSplitter sStringColonSplitter =
@@ -653,7 +677,7 @@
         }
     }
 
-    private void initShortcutPreference(Bundle savedInstanceState) {
+    protected void initShortcutPreference(Bundle savedInstanceState) {
         // Restore the user shortcut type.
         if (savedInstanceState != null && savedInstanceState.containsKey(EXTRA_SHORTCUT_TYPE)) {
             mUserShortcutTypesCache = savedInstanceState.getInt(EXTRA_SHORTCUT_TYPE,
@@ -668,6 +692,9 @@
 
         final CharSequence title = getString(R.string.accessibility_shortcut_title, mPackageName);
         mShortcutPreference.setTitle(title);
+
+        final PreferenceCategory generalCategory = findPreference(KEY_GENERAL_CATEGORY);
+        generalCategory.addPreference(mShortcutPreference);
     }
 
     protected void updateShortcutPreference() {
@@ -682,7 +709,7 @@
         mShortcutPreference.setSummary(getShortcutTypeSummary(getPrefContext()));
     }
 
-    private String getShortcutPreferenceKey() {
+    protected String getShortcutPreferenceKey() {
         return KEY_SHORTCUT_PREFERENCE;
     }
 
diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
index 0b221e5..6a6df33 100644
--- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
@@ -38,6 +38,8 @@
 import android.widget.CheckBox;
 
 import androidx.appcompat.app.AlertDialog;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.settings.R;
@@ -59,7 +61,6 @@
         ToggleFeaturePreferenceFragment {
 
     private static final String EXTRA_SHORTCUT_TYPE = "shortcut_type";
-    private static final String KEY_SHORTCUT_PREFERENCE = "shortcut_preference";
     private TouchExplorationStateChangeListener mTouchExplorationStateChangeListener;
     private int mUserShortcutType = UserShortcutType.EMPTY;
     private CheckBox mSoftwareTypeCheckBox;
@@ -95,13 +96,6 @@
     }
 
     @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        initShortcutPreference();
-
-        super.onViewCreated(view, savedInstanceState);
-    }
-
-    @Override
     public void onSaveInstanceState(Bundle outState) {
         outState.putInt(EXTRA_SHORTCUT_TYPE, mUserShortcutTypesCache);
         super.onSaveInstanceState(outState);
@@ -114,9 +108,6 @@
         final AccessibilityManager am = getPrefContext().getSystemService(
                 AccessibilityManager.class);
         am.addTouchExplorationStateChangeListener(mTouchExplorationStateChangeListener);
-
-        updateShortcutPreferenceData();
-        updateShortcutPreference();
     }
 
     @Override
@@ -156,6 +147,17 @@
         });
     }
 
+    @Override
+    protected void initSettingsPreference() {
+        mSettingsPreference = new Preference(getPrefContext());
+        mSettingsPreference.setTitle(R.string.accessibility_menu_item_settings);
+        mSettingsPreference.setFragment(MagnificationSettingsFragment.class.getName());
+        mSettingsPreference.setPersistent(false);
+
+        final PreferenceCategory generalCategory = findPreference(KEY_GENERAL_CATEGORY);
+        generalCategory.addPreference(mSettingsPreference);
+    }
+
     private void initializeDialogCheckBox(AlertDialog dialog) {
         final View dialogSoftwareView = dialog.findViewById(R.id.software_shortcut);
         mSoftwareTypeCheckBox = dialogSoftwareView.findViewById(R.id.checkbox);
@@ -172,11 +174,6 @@
         final View advancedView = dialog.findViewById(R.id.advanced_shortcut);
         updateAlertDialogCheckState();
 
-        // Window magnification mode doesn't support advancedView.
-        if (isWindowMagnification(getPrefContext())) {
-            advancedView.setVisibility(View.GONE);
-            return;
-        }
         // Shows the triple tap checkbox directly if clicked.
         if (mTripleTapTypeCheckBox.isChecked()) {
             advancedView.setVisibility(View.GONE);
@@ -373,15 +370,19 @@
         }
     }
 
-    private void initShortcutPreference() {
+    @Override
+    protected void initShortcutPreference(Bundle savedInstanceState) {
         mShortcutPreference = new ShortcutPreference(getPrefContext(), null);
         mShortcutPreference.setPersistent(false);
-        mShortcutPreference.setKey(KEY_SHORTCUT_PREFERENCE);
+        mShortcutPreference.setKey(getShortcutPreferenceKey());
         mShortcutPreference.setSummary(getShortcutTypeSummary(getPrefContext()));
         mShortcutPreference.setOnClickCallback(this);
 
         final CharSequence title = getString(R.string.accessibility_shortcut_title, mPackageName);
         mShortcutPreference.setTitle(title);
+
+        final PreferenceCategory generalCategory = findPreference(KEY_GENERAL_CATEGORY);
+        generalCategory.addPreference(mShortcutPreference);
     }
 
     @Override
diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java
index 3b786ff..bea528a 100644
--- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java
+++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java
@@ -18,6 +18,7 @@
 
 import android.app.settings.SettingsEnums;
 import android.os.Bundle;
+import android.view.View;
 
 public class ToggleScreenMagnificationPreferenceFragmentForSetupWizard
         extends ToggleScreenMagnificationPreferenceFragment {
@@ -42,4 +43,12 @@
         }
         super.onStop();
     }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        // Hide the setting from the vision settings.
+        mSettingsPreference.setVisible(false);
+    }
 }
diff --git a/src/com/android/settings/accounts/AccountSyncSettings.java b/src/com/android/settings/accounts/AccountSyncSettings.java
index a56dc94..23b6157 100644
--- a/src/com/android/settings/accounts/AccountSyncSettings.java
+++ b/src/com/android/settings/accounts/AccountSyncSettings.java
@@ -294,7 +294,7 @@
                     }
                     // if we're enabling sync, this will request a sync as well
                     ContentResolver.setSyncAutomaticallyAsUser(account, authority, syncOn, userId);
-                    // if the master sync switch is off, the request above will
+                    // if the primary sync switch is off, the request above will
                     // get dropped.  when the user clicks on this toggle,
                     // we want to force the sync, however.
                     if (!ContentResolver.getMasterSyncAutomaticallyAsUser(userId) || !syncOn) {
diff --git a/src/com/android/settings/accounts/AddAccountSettings.java b/src/com/android/settings/accounts/AddAccountSettings.java
index d4d93dd..64bb201 100644
--- a/src/com/android/settings/accounts/AddAccountSettings.java
+++ b/src/com/android/settings/accounts/AddAccountSettings.java
@@ -163,11 +163,13 @@
         } else {
             // If the user is locked by fbe: we couldn't start the authenticator. So we must ask the
             // user to unlock it first.
-            ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(this);
-            if (!helper.launchConfirmationActivity(UNLOCK_WORK_PROFILE_REQUEST,
-                    getString(R.string.unlock_set_unlock_launch_picker_title),
-                    false,
-                    mUserHandle.getIdentifier())) {
+            final ChooseLockSettingsHelper.Builder builder =
+                    new ChooseLockSettingsHelper.Builder(this);
+            final boolean launched = builder.setRequestCode(UNLOCK_WORK_PROFILE_REQUEST)
+                    .setTitle(getString(R.string.unlock_set_unlock_launch_picker_title))
+                    .setUserId(mUserHandle.getIdentifier())
+                    .show();
+            if (!launched) {
                 requestChooseAccount();
             }
         }
@@ -237,7 +239,7 @@
          * or broadcasts.
          *
          * Unfortunately for legacy reasons we still need to support this. But
-         * we can cripple the intent so that 3rd party authenticators can't
+         * we can disable the intent so that 3rd party authenticators can't
          * fill in addressing information and launch arbitrary actions.
          */
         Intent identityIntent = new Intent();
diff --git a/src/com/android/settings/applications/AppStatePowerBridge.java b/src/com/android/settings/applications/AppStatePowerBridge.java
index 31412a7..e5236f0 100644
--- a/src/com/android/settings/applications/AppStatePowerBridge.java
+++ b/src/com/android/settings/applications/AppStatePowerBridge.java
@@ -21,20 +21,20 @@
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
 import com.android.settingslib.applications.ApplicationsState.AppFilter;
 import com.android.settingslib.applications.ApplicationsState.CompoundFilter;
-import com.android.settingslib.fuelgauge.PowerWhitelistBackend;
+import com.android.settingslib.fuelgauge.PowerAllowlistBackend;
 
 import java.util.ArrayList;
 
 /**
- * Connects data from the PowerWhitelistBackend to ApplicationsState.
+ * Connects data from the PowerAllowlistBackend to ApplicationsState.
  */
 public class AppStatePowerBridge extends AppStateBaseBridge {
 
-    private final PowerWhitelistBackend mBackend;
+    private final PowerAllowlistBackend mBackend;
 
     public AppStatePowerBridge(Context context, ApplicationsState appState, Callback callback) {
         super(appState, callback);
-        mBackend = PowerWhitelistBackend.getInstance(context);
+        mBackend = PowerAllowlistBackend.getInstance(context);
     }
 
     @Override
@@ -43,17 +43,17 @@
         final int N = apps.size();
         for (int i = 0; i < N; i++) {
             AppEntry app = apps.get(i);
-            app.extraInfo = mBackend.isWhitelisted(app.info.packageName)
+            app.extraInfo = mBackend.isAllowlisted(app.info.packageName)
                     ? Boolean.TRUE : Boolean.FALSE;
         }
     }
 
     @Override
     protected void updateExtraInfo(AppEntry app, String pkg, int uid) {
-        app.extraInfo = mBackend.isWhitelisted(pkg) ? Boolean.TRUE : Boolean.FALSE;
+        app.extraInfo = mBackend.isAllowlisted(pkg) ? Boolean.TRUE : Boolean.FALSE;
     }
 
-    public static final AppFilter FILTER_POWER_WHITELISTED = new CompoundFilter(
+    public static final AppFilter FILTER_POWER_ALLOWLISTED = new CompoundFilter(
             ApplicationsState.FILTER_WITHOUT_DISABLED_UNTIL_USED, new AppFilter() {
         @Override
         public void init() {
diff --git a/src/com/android/settings/applications/AppStorageSettings.java b/src/com/android/settings/applications/AppStorageSettings.java
index 8a54c73..d095e37 100644
--- a/src/com/android/settings/applications/AppStorageSettings.java
+++ b/src/com/android/settings/applications/AppStorageSettings.java
@@ -312,13 +312,9 @@
             if (appHasSpaceManagementUI) {
                 mButtonsPref.setButton1Text(R.string.manage_space_text);
             } else {
-                mButtonsPref
-                        .setButton1Text(R.string.clear_user_data_text)
-                        .setButton1Icon(R.drawable.ic_settings_delete);
+                mButtonsPref.setButton1Text(R.string.clear_user_data_text);
             }
-            mButtonsPref
-                    .setButton1Text(R.string.clear_user_data_text)
-                    .setButton1Icon(R.drawable.ic_settings_delete)
+            mButtonsPref.setButton1Icon(R.drawable.ic_settings_delete)
                     .setButton1OnClickListener(v -> handleClearDataClick());
         }
 
diff --git a/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java b/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
index ac8146a..52b1a8d 100644
--- a/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
+++ b/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
@@ -159,7 +159,7 @@
             keepEnabledPackages.add(euicc.packageName);
         }
 
-        keepEnabledPackages.addAll(getEnabledPackageWhitelist());
+        keepEnabledPackages.addAll(getEnabledPackageAllowlist());
 
         final LocationManager locationManager =
                 (LocationManager) mContext.getSystemService(Context.LOCATION_SERVICE);
@@ -170,7 +170,7 @@
         return keepEnabledPackages;
     }
 
-    private Set<String> getEnabledPackageWhitelist() {
+    private Set<String> getEnabledPackageAllowlist() {
         final Set<String> keepEnabledPackages = new ArraySet<>();
 
         // Keep Settings intelligence enabled, otherwise search feature will be disabled.
diff --git a/src/com/android/settings/applications/ConvertToFbe.java b/src/com/android/settings/applications/ConvertToFbe.java
index 2a6bdaf..d470011 100644
--- a/src/com/android/settings/applications/ConvertToFbe.java
+++ b/src/com/android/settings/applications/ConvertToFbe.java
@@ -39,9 +39,11 @@
 
     private boolean runKeyguardConfirmation(int request) {
         Resources res = getActivity().getResources();
-        return new ChooseLockSettingsHelper(getActivity(), this)
-                .launchConfirmationActivity(request,
-                        res.getText(R.string.convert_to_file_encryption));
+        final ChooseLockSettingsHelper.Builder builder =
+                new ChooseLockSettingsHelper.Builder(getActivity(), this);
+        return builder.setRequestCode(request)
+                .setTitle(res.getText(R.string.convert_to_file_encryption))
+                .show();
     }
 
     @Override
diff --git a/src/com/android/settings/applications/RunningState.java b/src/com/android/settings/applications/RunningState.java
index d4abe6c..5429b05 100644
--- a/src/com/android/settings/applications/RunningState.java
+++ b/src/com/android/settings/applications/RunningState.java
@@ -92,27 +92,27 @@
     // entry.
     final SparseArray<HashMap<String, ProcessItem>> mServiceProcessesByName
             = new SparseArray<HashMap<String, ProcessItem>>();
-    
+
     // Processes that are hosting a service we are interested in, organized
     // by their pid.  These disappear and re-appear as services are restarted.
     final SparseArray<ProcessItem> mServiceProcessesByPid
             = new SparseArray<ProcessItem>();
-    
+
     // Used to sort the interesting processes.
     final ServiceProcessComparator mServiceProcessComparator
             = new ServiceProcessComparator();
-    
+
     // Additional interesting processes to be shown to the user, even if
     // there is no service running in them.
     final ArrayList<ProcessItem> mInterestingProcesses = new ArrayList<ProcessItem>();
-    
+
     // All currently running processes, for finding dependencies etc.
     final SparseArray<ProcessItem> mRunningProcesses
             = new SparseArray<ProcessItem>();
-    
+
     // The processes associated with services, in sorted order.
     final ArrayList<ProcessItem> mProcessItems = new ArrayList<ProcessItem>();
-    
+
     // All processes, used for retrieving memory information.
     final ArrayList<ProcessItem> mAllProcessItems = new ArrayList<ProcessItem>();
 
@@ -139,69 +139,74 @@
 
     int mSequence = 0;
 
-    final Comparator<RunningState.MergedItem> mBackgroundComparator
-        = new Comparator<RunningState.MergedItem>() {
-            @Override
-            public int compare(MergedItem lhs, MergedItem rhs) {
-                if (DEBUG_COMPARE) {
-                    Log.i(TAG, "Comparing " + lhs + " with " + rhs);
-                    Log.i(TAG, "     Proc " + lhs.mProcess + " with " + rhs.mProcess);
-                    Log.i(TAG, "   UserId " + lhs.mUserId + " with " + rhs.mUserId);
-                }
-                if (lhs.mUserId != rhs.mUserId) {
-                    if (lhs.mUserId == mMyUserId) return -1;
-                    if (rhs.mUserId == mMyUserId) return 1;
-                    return lhs.mUserId < rhs.mUserId ? -1 : 1;
-                }
-                if (lhs.mProcess == rhs.mProcess) {
-                    if (lhs.mLabel == rhs.mLabel) {
+    final Comparator<RunningState.MergedItem> mBackgroundComparator =
+            new Comparator<RunningState.MergedItem>() {
+                @Override
+                public int compare(MergedItem lhs, MergedItem rhs) {
+                    if (DEBUG_COMPARE) {
+                        Log.i(TAG, "Comparing " + lhs + " with " + rhs);
+                        Log.i(TAG, "     Proc " + lhs.mProcess + " with " + rhs.mProcess);
+                        Log.i(TAG, "   UserId " + lhs.mUserId + " with " + rhs.mUserId);
+                    }
+                    if (lhs.mUserId != rhs.mUserId) {
+                        if (lhs.mUserId == mMyUserId) return -1;
+                        if (rhs.mUserId == mMyUserId) return 1;
+                        return lhs.mUserId < rhs.mUserId ? -1 : 1;
+                    }
+                    if (lhs.mProcess == rhs.mProcess) {
+                        if (lhs.mLabel == rhs.mLabel) {
+                            return 0;
+                        }
+                        return lhs.mLabel != null ? lhs.mLabel.compareTo(rhs.mLabel) : -1;
+                    }
+                    if (lhs.mProcess == null) return -1;
+                    if (rhs.mProcess == null) return 1;
+                    if (DEBUG_COMPARE) {
+                        Log.i(TAG, "    Label " + lhs.mProcess.mLabel
+                                + " with " + rhs.mProcess.mLabel);
+                    }
+                    final ActivityManager.RunningAppProcessInfo lhsInfo =
+                            lhs.mProcess.mRunningProcessInfo;
+                    final ActivityManager.RunningAppProcessInfo rhsInfo =
+                            rhs.mProcess.mRunningProcessInfo;
+                    final boolean lhsBg = lhsInfo.importance
+                            >= ActivityManager.RunningAppProcessInfo.IMPORTANCE_BACKGROUND;
+                    final boolean rhsBg = rhsInfo.importance
+                            >= ActivityManager.RunningAppProcessInfo.IMPORTANCE_BACKGROUND;
+                    if (DEBUG_COMPARE) Log.i(TAG, "       Bg " + lhsBg + " with " + rhsBg);
+                    if (lhsBg != rhsBg) {
+                        return lhsBg ? 1 : -1;
+                    }
+                    final boolean lhsA = (lhsInfo.flags
+                            & ActivityManager.RunningAppProcessInfo.FLAG_HAS_ACTIVITIES) != 0;
+                    final boolean rhsA = (rhsInfo.flags
+                            & ActivityManager.RunningAppProcessInfo.FLAG_HAS_ACTIVITIES) != 0;
+                    if (DEBUG_COMPARE) Log.i(TAG, "      Act " + lhsA + " with " + rhsA);
+                    if (lhsA != rhsA) {
+                        return lhsA ? -1 : 1;
+                    }
+                    if (DEBUG_COMPARE) {
+                        Log.i(TAG,
+                                "      Lru " + lhsInfo.lru + " with " + rhsInfo.lru);
+                    }
+                    if (lhsInfo.lru != rhsInfo.lru) {
+                        return lhsInfo.lru < rhsInfo.lru ? -1 : 1;
+                    }
+                    if (lhs.mProcess.mLabel == rhs.mProcess.mLabel) {
                         return 0;
                     }
-                    return lhs.mLabel != null ? lhs.mLabel.compareTo(rhs.mLabel) : -1;
+                    if (lhs.mProcess.mLabel == null) return 1;
+                    if (rhs.mProcess.mLabel == null) return -1;
+                    return lhs.mProcess.mLabel.compareTo(rhs.mProcess.mLabel);
                 }
-                if (lhs.mProcess == null) return -1;
-                if (rhs.mProcess == null) return 1;
-                if (DEBUG_COMPARE) Log.i(TAG, "    Label " + lhs.mProcess.mLabel
-                        + " with " + rhs.mProcess.mLabel);
-                final ActivityManager.RunningAppProcessInfo lhsInfo
-                        = lhs.mProcess.mRunningProcessInfo;
-                final ActivityManager.RunningAppProcessInfo rhsInfo
-                        = rhs.mProcess.mRunningProcessInfo;
-                final boolean lhsBg = lhsInfo.importance
-                        >= ActivityManager.RunningAppProcessInfo.IMPORTANCE_BACKGROUND;
-                final boolean rhsBg = rhsInfo.importance
-                        >= ActivityManager.RunningAppProcessInfo.IMPORTANCE_BACKGROUND;
-                        if (DEBUG_COMPARE) Log.i(TAG, "       Bg " + lhsBg + " with " + rhsBg);
-                if (lhsBg != rhsBg) {
-                    return lhsBg ? 1 : -1;
-                }
-                final boolean lhsA = (lhsInfo.flags
-                        & ActivityManager.RunningAppProcessInfo.FLAG_HAS_ACTIVITIES) != 0;
-                final boolean rhsA = (rhsInfo.flags
-                        & ActivityManager.RunningAppProcessInfo.FLAG_HAS_ACTIVITIES) != 0;
-                if (DEBUG_COMPARE) Log.i(TAG, "      Act " + lhsA + " with " + rhsA);
-                if (lhsA != rhsA) {
-                    return lhsA ? -1 : 1;
-                }
-                if (DEBUG_COMPARE) Log.i(TAG, "      Lru " + lhsInfo.lru + " with " + rhsInfo.lru);
-                if (lhsInfo.lru != rhsInfo.lru) {
-                    return lhsInfo.lru < rhsInfo.lru ? -1 : 1;
-                }
-                if (lhs.mProcess.mLabel == rhs.mProcess.mLabel) {
-                    return 0;
-                }
-                if (lhs.mProcess.mLabel == null) return 1;
-                if (rhs.mProcess.mLabel == null) return -1;
-                return lhs.mProcess.mLabel.compareTo(rhs.mProcess.mLabel);
-            }
-    };
+            };
 
     // ----- following protected by mLock -----
-    
+
     // Lock for protecting the state that will be shared between the
     // background update thread and the UI thread.
     final Object mLock = new Object();
-    
+
     boolean mResumed;
     boolean mHaveData;
     boolean mWatchingBackgroundItems;
@@ -210,7 +215,7 @@
     ArrayList<MergedItem> mMergedItems = new ArrayList<MergedItem>();
     ArrayList<MergedItem> mBackgroundItems = new ArrayList<MergedItem>();
     ArrayList<MergedItem> mUserBackgroundItems = new ArrayList<MergedItem>();
-    
+
     int mNumBackgroundProcesses;
     long mBackgroundProcessMemory;
     int mNumForegroundProcesses;
@@ -221,6 +226,7 @@
     // ----- BACKGROUND MONITORING THREAD -----
 
     final HandlerThread mBackgroundThread;
+
     final class BackgroundHandler extends Handler {
         public BackgroundHandler(Looper looper) {
             super(looper);
@@ -372,9 +378,9 @@
         ActivityManager.RunningServiceInfo mRunningService;
         ServiceInfo mServiceInfo;
         boolean mShownAsStarted;
-        
+
         MergedItem mMergedItem;
-        
+
         public ServiceItem(int userId) {
             super(false, userId);
         }
@@ -385,17 +391,17 @@
                 = new HashMap<ComponentName, ServiceItem>();
         final SparseArray<ProcessItem> mDependentProcesses
                 = new SparseArray<ProcessItem>();
-        
+
         final int mUid;
         final String mProcessName;
         int mPid;
-        
+
         ProcessItem mClient;
         int mLastNumDependentProcesses;
-        
+
         int mRunningSeq;
         ActivityManager.RunningAppProcessInfo mRunningProcessInfo;
-        
+
         MergedItem mMergedItem;
 
         boolean mInteresting;
@@ -404,7 +410,7 @@
         boolean mIsSystem;
         boolean mIsStarted;
         long mActiveSince;
-        
+
         public ProcessItem(Context context, int uid, String processName) {
             super(true, UserHandle.getUserId(uid));
             mDescription = context.getResources().getString(
@@ -412,12 +418,12 @@
             mUid = uid;
             mProcessName = processName;
         }
-        
+
         void ensureLabel(PackageManager pm) {
             if (mLabel != null) {
                 return;
             }
-            
+
             try {
                 ApplicationInfo ai = pm.getApplicationInfo(mProcessName,
                         PackageManager.MATCH_ANY_USER);
@@ -429,11 +435,11 @@
                 }
             } catch (PackageManager.NameNotFoundException e) {
             }
-            
+
             // If we couldn't get information about the overall
             // process, try to find something about the uid.
             String[] pkgs = pm.getPackagesForUid(mUid);
-            
+
             // If there is one package with this uid, that is what we want.
             if (pkgs.length == 1) {
                 try {
@@ -446,7 +452,7 @@
                 } catch (PackageManager.NameNotFoundException e) {
                 }
             }
-            
+
             // If there are multiple, see if one gives us the official name
             // for this uid.
             for (String name : pkgs) {
@@ -465,7 +471,7 @@
                 } catch (PackageManager.NameNotFoundException e) {
                 }
             }
-            
+
             // If still don't have anything to display, just use the
             // service info.
             if (mServices.size() > 0) {
@@ -476,7 +482,7 @@
                 mLabel = mDisplayLabel.toString();
                 return;
             }
-            
+
             // Finally... whatever, just pick the first package's name.
             try {
                 ApplicationInfo ai = pm.getApplicationInfo(pkgs[0],
@@ -544,16 +550,16 @@
                 si.mDescription = context.getResources().getString(
                         R.string.service_started_by_app);
             }
-            
+
             return changed;
         }
-        
+
         boolean updateSize(Context context, long pss, int curSeq) {
             mSize = pss * 1024;
             if (mCurSeq == curSeq) {
                 String sizeStr = Formatter.formatShortFileSize(
                         context, mSize);
-                if (!sizeStr.equals(mSizeStr)){
+                if (!sizeStr.equals(mSizeStr)) {
                     mSizeStr = sizeStr;
                     // We update this on the second tick where we update just
                     // the text in the current items, so no need to say we
@@ -563,11 +569,11 @@
             }
             return false;
         }
-        
+
         boolean buildDependencyChain(Context context, PackageManager pm, int curSeq) {
             final int NP = mDependentProcesses.size();
             boolean changed = false;
-            for (int i=0; i<NP; i++) {
+            for (int i = 0; i < NP; i++) {
                 ProcessItem proc = mDependentProcesses.valueAt(i);
                 if (proc.mClient != this) {
                     changed = true;
@@ -577,19 +583,19 @@
                 proc.ensureLabel(pm);
                 changed |= proc.buildDependencyChain(context, pm, curSeq);
             }
-            
+
             if (mLastNumDependentProcesses != mDependentProcesses.size()) {
                 changed = true;
                 mLastNumDependentProcesses = mDependentProcesses.size();
             }
-            
+
             return changed;
         }
-        
+
         void addDependentProcesses(ArrayList<BaseItem> dest,
                 ArrayList<ProcessItem> destProc) {
             final int NP = mDependentProcesses.size();
-            for (int i=0; i<NP; i++) {
+            for (int i = 0; i < NP; i++) {
                 ProcessItem proc = mDependentProcesses.valueAt(i);
                 proc.addDependentProcesses(dest, destProc);
                 dest.add(proc);
@@ -606,7 +612,7 @@
         final ArrayList<ProcessItem> mOtherProcesses = new ArrayList<ProcessItem>();
         final ArrayList<ServiceItem> mServices = new ArrayList<ServiceItem>();
         final ArrayList<MergedItem> mChildren = new ArrayList<MergedItem>();
-        
+
         private int mLastNumProcesses = -1, mLastNumServices = -1;
 
         MergedItem(int userId) {
@@ -646,7 +652,7 @@
                 int numProcesses = 0;
                 int numServices = 0;
                 mActiveSince = -1;
-                for (int i=0; i<mChildren.size(); i++) {
+                for (int i = 0; i < mChildren.size(); i++) {
                     MergedItem child = mChildren.get(i);
                     numProcesses += child.mLastNumProcesses;
                     numServices += child.mLastNumServices;
@@ -661,14 +667,14 @@
                 mPackageInfo = mProcess.mPackageInfo;
                 mDisplayLabel = mProcess.mDisplayLabel;
                 mLabel = mProcess.mLabel;
-                
+
                 if (!mBackground) {
                     setDescription(context, (mProcess.mPid > 0 ? 1 : 0) + mOtherProcesses.size(),
                             mServices.size());
                 }
-                
+
                 mActiveSince = -1;
-                for (int i=0; i<mServices.size(); i++) {
+                for (int i = 0; i < mServices.size(); i++) {
                     ServiceItem si = mServices.get(i);
                     if (si.mActiveSince >= 0 && mActiveSince < si.mActiveSince) {
                         mActiveSince = si.mActiveSince;
@@ -678,25 +684,25 @@
 
             return false;
         }
-        
+
         boolean updateSize(Context context) {
             if (mUser != null) {
                 mSize = 0;
-                for (int i=0; i<mChildren.size(); i++) {
+                for (int i = 0; i < mChildren.size(); i++) {
                     MergedItem child = mChildren.get(i);
                     child.updateSize(context);
                     mSize += child.mSize;
                 }
             } else {
                 mSize = mProcess.mSize;
-                for (int i=0; i<mOtherProcesses.size(); i++) {
+                for (int i = 0; i < mOtherProcesses.size(); i++) {
                     mSize += mOtherProcesses.get(i).mSize;
                 }
             }
-            
+
             String sizeStr = Formatter.formatShortFileSize(
                     context, mSize);
-            if (!sizeStr.equals(mSizeStr)){
+            if (!sizeStr.equals(mSizeStr)) {
                 mSizeStr = sizeStr;
                 // We update this on the second tick where we update just
                 // the text in the current items, so no need to say we
@@ -746,7 +752,7 @@
             return 0;
         }
     }
-    
+
     static CharSequence makeLabel(PackageManager pm,
             String className, PackageItemInfo item) {
         if (item != null && (item.labelRes != 0
@@ -756,15 +762,15 @@
                 return label;
             }
         }
-        
+
         String label = className;
         int tail = label.lastIndexOf('.');
         if (tail >= 0) {
-            label = label.substring(tail+1, label.length());
+            label = label.substring(tail + 1, label.length());
         }
         return label;
     }
-    
+
     static RunningState getInstance(Context context) {
         synchronized (sGlobalLock) {
             if (sInstance == null) {
@@ -776,9 +782,9 @@
 
     private RunningState(Context context) {
         mApplicationContext = context.getApplicationContext();
-        mAm = (ActivityManager)mApplicationContext.getSystemService(Context.ACTIVITY_SERVICE);
+        mAm = mApplicationContext.getSystemService(ActivityManager.class);
         mPm = mApplicationContext.getPackageManager();
-        mUm = (UserManager)mApplicationContext.getSystemService(Context.USER_SERVICE);
+        mUm = mApplicationContext.getSystemService(UserManager.class);
         mMyUserId = UserHandle.myUserId();
         UserInfo userInfo = mUm.getUserInfo(mMyUserId);
         mHideManagedProfiles = userInfo == null || !userInfo.canHaveProfile();
@@ -842,14 +848,14 @@
     }
 
     private boolean isInterestingProcess(ActivityManager.RunningAppProcessInfo pi) {
-        if ((pi.flags&ActivityManager.RunningAppProcessInfo.FLAG_CANT_SAVE_STATE) != 0) {
+        if ((pi.flags & ActivityManager.RunningAppProcessInfo.FLAG_CANT_SAVE_STATE) != 0) {
             return true;
         }
-        if ((pi.flags&ActivityManager.RunningAppProcessInfo.FLAG_PERSISTENT) == 0
+        if ((pi.flags & ActivityManager.RunningAppProcessInfo.FLAG_PERSISTENT) == 0
                 && pi.importance >= ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND
                 && pi.importance < ActivityManager.RunningAppProcessInfo.IMPORTANCE_CANT_SAVE_STATE
                 && pi.importanceReasonCode
-                        == ActivityManager.RunningAppProcessInfo.REASON_UNKNOWN) {
+                == ActivityManager.RunningAppProcessInfo.REASON_UNKNOWN) {
             return true;
         }
         return false;
@@ -897,15 +903,15 @@
         final PackageManager pm = context.getPackageManager();
 
         mSequence++;
-        
+
         boolean changed = false;
 
         // Retrieve list of services, filtering out anything that definitely
         // won't be shown in the UI.
-        List<ActivityManager.RunningServiceInfo> services 
+        List<ActivityManager.RunningServiceInfo> services
                 = am.getRunningServices(MAX_SERVICES);
         int NS = services != null ? services.size() : 0;
-        for (int i=0; i<NS; i++) {
+        for (int i = 0; i < NS; i++) {
             ActivityManager.RunningServiceInfo si = services.get(i);
             // We are not interested in services that have not been started
             // and don't have a known client, because
@@ -918,7 +924,7 @@
             }
             // We likewise don't care about services running in a
             // persistent process like the system or phone.
-            if ((si.flags&ActivityManager.RunningServiceInfo.FLAG_PERSISTENT_PROCESS)
+            if ((si.flags & ActivityManager.RunningServiceInfo.FLAG_PERSISTENT_PROCESS)
                     != 0) {
                 services.remove(i);
                 i--;
@@ -933,14 +939,14 @@
                 = am.getRunningAppProcesses();
         final int NP = processes != null ? processes.size() : 0;
         mTmpAppProcesses.clear();
-        for (int i=0; i<NP; i++) {
+        for (int i = 0; i < NP; i++) {
             ActivityManager.RunningAppProcessInfo pi = processes.get(i);
             mTmpAppProcesses.put(pi.pid, new AppProcessInfo(pi));
         }
 
         // Initial iteration through running services to collect per-process
         // info about them.
-        for (int i=0; i<NS; i++) {
+        for (int i = 0; i < NS; i++) {
             ActivityManager.RunningServiceInfo si = services.get(i);
             if (si.restarting == 0 && si.pid > 0) {
                 AppProcessInfo ainfo = mTmpAppProcesses.get(si.pid);
@@ -954,7 +960,7 @@
         }
 
         // Update state we are maintaining about process that are running services.
-        for (int i=0; i<NS; i++) {
+        for (int i = 0; i < NS; i++) {
             ActivityManager.RunningServiceInfo si = services.get(i);
 
             // If this service's process is in use at a higher importance
@@ -1001,7 +1007,7 @@
                 proc = new ProcessItem(context, si.uid, si.process);
                 procs.put(si.process, proc);
             }
-            
+
             if (proc.mCurSeq != mSequence) {
                 int pid = si.restarting == 0 ? si.pid : 0;
                 if (pid != proc.mPid) {
@@ -1021,10 +1027,10 @@
             }
             changed |= proc.updateService(context, si);
         }
-        
+
         // Now update the map of other processes that are running (but
         // don't have services actively running inside them).
-        for (int i=0; i<NP; i++) {
+        for (int i = 0; i < NP; i++) {
             ActivityManager.RunningAppProcessInfo pi = processes.get(i);
             ProcessItem proc = mServiceProcessesByPid.get(pi.pid);
             if (proc == null) {
@@ -1040,7 +1046,7 @@
                 }
                 proc.mDependentProcesses.clear();
             }
-            
+
             if (isInterestingProcess(pi)) {
                 if (!mInterestingProcesses.contains(proc)) {
                     changed = true;
@@ -1052,7 +1058,7 @@
             } else {
                 proc.mInteresting = false;
             }
-            
+
             proc.mRunningSeq = mSequence;
             proc.mRunningProcessInfo = pi;
         }
@@ -1060,7 +1066,7 @@
         // Build the chains from client processes to the process they are
         // dependent on; also remove any old running processes.
         int NRP = mRunningProcesses.size();
-        for (int i = 0; i < NRP;) {
+        for (int i = 0; i < NRP; ) {
             ProcessItem proc = mRunningProcesses.valueAt(i);
             if (proc.mRunningSeq == mSequence) {
                 int clientPid = proc.mRunningProcessInfo.importanceReasonPid;
@@ -1085,10 +1091,10 @@
                 NRP--;
             }
         }
-        
+
         // Remove any old interesting processes.
         int NHP = mInterestingProcesses.size();
-        for (int i=0; i<NHP; i++) {
+        for (int i = 0; i < NHP; i++) {
             ProcessItem proc = mInterestingProcesses.get(i);
             if (!proc.mInteresting || mRunningProcesses.get(proc.mPid) == null) {
                 changed = true;
@@ -1097,21 +1103,21 @@
                 NHP--;
             }
         }
-        
+
         // Follow the tree from all primary service processes to all
         // processes they are dependent on, marking these processes as
         // still being active and determining if anything has changed.
         final int NAP = mServiceProcessesByPid.size();
-        for (int i=0; i<NAP; i++) {
+        for (int i = 0; i < NAP; i++) {
             ProcessItem proc = mServiceProcessesByPid.valueAt(i);
             if (proc.mCurSeq == mSequence) {
                 changed |= proc.buildDependencyChain(context, pm, mSequence);
             }
         }
-        
+
         // Look for services and their primary processes that no longer exist...
         ArrayList<Integer> uidToDelete = null;
-        for (int i=0; i<mServiceProcessesByName.size(); i++) {
+        for (int i = 0; i < mServiceProcessesByName.size(); i++) {
             HashMap<String, ProcessItem> procs = mServiceProcessesByName.valueAt(i);
             Iterator<ProcessItem> pit = procs.values().iterator();
             while (pit.hasNext()) {
@@ -1119,8 +1125,7 @@
                 if (pi.mCurSeq == mSequence) {
                     pi.ensureLabel(pm);
                     if (pi.mPid == 0) {
-                        // Sanity: a non-process can't be dependent on
-                        // anything.
+                        // Validation: a non-process can't be dependent on anything.
                         pi.mDependentProcesses.clear();
                     }
                 } else {
@@ -1147,7 +1152,7 @@
                 }
             }
         }
-        
+
         if (uidToDelete != null) {
             for (int i = 0; i < uidToDelete.size(); i++) {
                 int uid = uidToDelete.get(i);
@@ -1158,7 +1163,7 @@
         if (changed) {
             // First determine an order for the services.
             ArrayList<ProcessItem> sortedProcesses = new ArrayList<ProcessItem>();
-            for (int i=0; i<mServiceProcessesByName.size(); i++) {
+            for (int i = 0; i < mServiceProcessesByName.size(); i++) {
                 for (ProcessItem pi : mServiceProcessesByName.valueAt(i).values()) {
                     pi.mIsSystem = false;
                     pi.mIsStarted = true;
@@ -1166,7 +1171,7 @@
                     for (ServiceItem si : pi.mServices.values()) {
                         if (si.mServiceInfo != null
                                 && (si.mServiceInfo.applicationInfo.flags
-                                        & ApplicationInfo.FLAG_SYSTEM) != 0) {
+                                & ApplicationInfo.FLAG_SYSTEM) != 0) {
                             pi.mIsSystem = true;
                         }
                         if (si.mRunningService != null
@@ -1180,16 +1185,16 @@
                     sortedProcesses.add(pi);
                 }
             }
-            
+
             Collections.sort(sortedProcesses, mServiceProcessComparator);
-            
+
             ArrayList<BaseItem> newItems = new ArrayList<BaseItem>();
             ArrayList<MergedItem> newMergedItems = new ArrayList<MergedItem>();
             mProcessItems.clear();
-            for (int i=0; i<sortedProcesses.size(); i++) {
+            for (int i = 0; i < sortedProcesses.size(); i++) {
                 ProcessItem pi = sortedProcesses.get(i);
                 pi.mNeedDivider = false;
-                
+
                 int firstProc = mProcessItems.size();
                 // First add processes we are dependent on.
                 pi.addDependentProcesses(newItems, mProcessItems);
@@ -1198,7 +1203,7 @@
                 if (pi.mPid > 0) {
                     mProcessItems.add(pi);
                 }
-                
+
                 // Now add the services running in it.
                 MergedItem mergedItem = null;
                 boolean haveAllMerged = false;
@@ -1216,7 +1221,7 @@
                         haveAllMerged = false;
                     }
                 }
-                
+
                 if (!haveAllMerged || mergedItem == null
                         || mergedItem.mServices.size() != pi.mServices.size()) {
                     // Whoops, we need to build a new MergedItem!
@@ -1227,11 +1232,11 @@
                     }
                     mergedItem.mProcess = pi;
                     mergedItem.mOtherProcesses.clear();
-                    for (int mpi=firstProc; mpi<(mProcessItems.size()-1); mpi++) {
+                    for (int mpi = firstProc; mpi < (mProcessItems.size() - 1); mpi++) {
                         mergedItem.mOtherProcesses.add(mProcessItems.get(mpi));
                     }
                 }
-                
+
                 mergedItem.update(context, false);
                 if (mergedItem.mUserId != mMyUserId) {
                     addOtherUserItem(context, newMergedItems, mOtherUserMergedItems, mergedItem);
@@ -1243,7 +1248,7 @@
             // Finally, interesting processes need to be shown and will
             // go at the top.
             NHP = mInterestingProcesses.size();
-            for (int i=0; i<NHP; i++) {
+            for (int i = 0; i < NHP; i++) {
                 ProcessItem proc = mInterestingProcesses.get(i);
                 if (proc.mClient == null && proc.mServices.size() <= 0) {
                     if (proc.mMergedItem == null) {
@@ -1264,7 +1269,7 @@
             // Finally finally, user aggregated merged items need to be
             // updated now that they have all of their children.
             final int NU = mOtherUserMergedItems.size();
-            for (int i=0; i<NU; i++) {
+            for (int i = 0; i < NU; i++) {
                 MergedItem user = mOtherUserMergedItems.valueAt(i);
                 if (user.mCurSeq == mSequence) {
                     user.update(context, false);
@@ -1276,7 +1281,7 @@
                 mMergedItems = newMergedItems;
             }
         }
-        
+
         // Count number of interesting other (non-active) processes, and
         // build a list of all processes we will retrieve memory for.
         mAllProcessItems.clear();
@@ -1285,7 +1290,7 @@
         int numForegroundProcesses = 0;
         int numServiceProcesses = 0;
         NRP = mRunningProcesses.size();
-        for (int i=0; i<NRP; i++) {
+        for (int i = 0; i < NRP; i++) {
             ProcessItem proc = mRunningProcesses.valueAt(i);
             if (proc.mCurSeq != mSequence) {
                 // We didn't hit this process as a dependency on one
@@ -1306,7 +1311,7 @@
                 numServiceProcesses++;
             }
         }
-        
+
         long backgroundProcessMemory = 0;
         long foregroundProcessMemory = 0;
         long serviceProcessMemory = 0;
@@ -1316,13 +1321,13 @@
         try {
             final int numProc = mAllProcessItems.size();
             int[] pids = new int[numProc];
-            for (int i=0; i<numProc; i++) {
+            for (int i = 0; i < numProc; i++) {
                 pids[i] = mAllProcessItems.get(i).mPid;
             }
             long[] pss = ActivityManager.getService()
                     .getProcessPss(pids);
             int bgIndex = 0;
-            for (int i=0; i<pids.length; i++) {
+            for (int i = 0; i < pids.length; i++) {
                 ProcessItem proc = mAllProcessItems.get(i);
                 changed |= proc.updateSize(context, pss[i], mSequence);
                 if (proc.mCurSeq == mSequence) {
@@ -1340,7 +1345,7 @@
                         if (bgIndex >= mBackgroundItems.size()
                                 || mBackgroundItems.get(bgIndex).mProcess != proc) {
                             newBackgroundItems = new ArrayList<MergedItem>(numBackgroundProcesses);
-                            for (int bgi=0; bgi<bgIndex; bgi++) {
+                            for (int bgi = 0; bgi < bgIndex; bgi++) {
                                 mergedItem = mBackgroundItems.get(bgi);
                                 diffUsers |= mergedItem.mUserId != mMyUserId;
                                 newBackgroundItems.add(mergedItem);
@@ -1363,12 +1368,12 @@
             }
         } catch (RemoteException e) {
         }
-        
+
         if (newBackgroundItems == null) {
             // One or more at the bottom may no longer exist.
             if (mBackgroundItems.size() > numBackgroundProcesses) {
                 newBackgroundItems = new ArrayList<MergedItem>(numBackgroundProcesses);
-                for (int bgi=0; bgi<numBackgroundProcesses; bgi++) {
+                for (int bgi = 0; bgi < numBackgroundProcesses; bgi++) {
                     MergedItem mergedItem = mBackgroundItems.get(bgi);
                     diffUsers |= mergedItem.mUserId != mMyUserId;
                     newBackgroundItems.add(mergedItem);
@@ -1387,7 +1392,7 @@
                 // items for users are collapsed together.
                 newUserBackgroundItems = new ArrayList<MergedItem>();
                 final int NB = newBackgroundItems.size();
-                for (int i=0; i<NB; i++) {
+                for (int i = 0; i < NB; i++) {
                     MergedItem mergedItem = newBackgroundItems.get(i);
                     if (mergedItem.mUserId != mMyUserId) {
                         addOtherUserItem(context, newUserBackgroundItems,
@@ -1399,7 +1404,7 @@
                 // And user aggregated merged items need to be
                 // updated now that they have all of their children.
                 final int NU = mOtherUserBackgroundItems.size();
-                for (int i=0; i<NU; i++) {
+                for (int i = 0; i < NU; i++) {
                     MergedItem user = mOtherUserBackgroundItems.valueAt(i);
                     if (user.mCurSeq == mSequence) {
                         user.update(context, true);
@@ -1409,10 +1414,10 @@
             }
         }
 
-        for (int i=0; i<mMergedItems.size(); i++) {
+        for (int i = 0; i < mMergedItems.size(); i++) {
             mMergedItems.get(i).updateSize(context);
         }
-        
+
         synchronized (mLock) {
             mNumBackgroundProcesses = numBackgroundProcesses;
             mNumForegroundProcesses = numForegroundProcesses;
@@ -1432,10 +1437,10 @@
                 mLock.notifyAll();
             }
         }
-        
+
         return changed;
     }
-    
+
     void setWatchingBackgroundItems(boolean watching) {
         synchronized (mLock) {
             mWatchingBackgroundItems = watching;
diff --git a/src/com/android/settings/applications/SpecialAppAccessPreferenceController.java b/src/com/android/settings/applications/SpecialAppAccessPreferenceController.java
index 752c6ce..19b8f50 100644
--- a/src/com/android/settings/applications/SpecialAppAccessPreferenceController.java
+++ b/src/com/android/settings/applications/SpecialAppAccessPreferenceController.java
@@ -110,7 +110,7 @@
                 continue;
             }
             if (entry.extraInfo instanceof DataUsageState
-                    && ((DataUsageState) entry.extraInfo).isDataSaverWhitelisted) {
+                    && ((DataUsageState) entry.extraInfo).isDataSaverAllowlisted) {
                 count++;
             }
         }
diff --git a/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java b/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java
index 7aad245..6817bd6 100755
--- a/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java
+++ b/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java
@@ -526,7 +526,7 @@
 
     @VisibleForTesting
     int getNumberOfUserWithPackageInstalled(String packageName) {
-        final List<UserInfo> userInfos = mUserManager.getUsers(true);
+        final List<UserInfo> userInfos = mUserManager.getAliveUsers();
         int count = 0;
 
         for (final UserInfo userInfo : userInfos) {
diff --git a/src/com/android/settings/applications/appinfo/AppNotificationPreferenceController.java b/src/com/android/settings/applications/appinfo/AppNotificationPreferenceController.java
index eab9a56..bc87b44 100644
--- a/src/com/android/settings/applications/appinfo/AppNotificationPreferenceController.java
+++ b/src/com/android/settings/applications/appinfo/AppNotificationPreferenceController.java
@@ -72,6 +72,9 @@
 
     private CharSequence getNotificationSummary(ApplicationsState.AppEntry appEntry,
             Context context, NotificationBackend backend) {
+        if (appEntry == null) {
+            return "";
+        }
         NotificationBackend.AppRow appRow =
                 backend.loadAppRow(context, context.getPackageManager(), appEntry.info);
         return getNotificationSummary(appRow, context);
diff --git a/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceController.java b/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceController.java
index 34c67f1..86b9fcf 100644
--- a/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceController.java
+++ b/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceController.java
@@ -51,7 +51,7 @@
         final String[] handledDomains =
                 handledDomainSet.toArray(new String[handledDomainSet.size()]);
         instantAppDomainsPreference.setTitles(handledDomains);
-        // Dummy values, unused in the implementation
+        // placeholder values, unused in the implementation
         instantAppDomainsPreference.setValues(new int[handledDomains.length]);
     }
 
diff --git a/src/com/android/settings/applications/appops/AppOpsState.java b/src/com/android/settings/applications/appops/AppOpsState.java
index cbffe47..eab3dda 100644
--- a/src/com/android/settings/applications/appops/AppOpsState.java
+++ b/src/com/android/settings/applications/appops/AppOpsState.java
@@ -588,7 +588,7 @@
             if (appEntry == null) {
                 continue;
             }
-            List<AppOpsManager.OpEntry> dummyOps = null;
+            List<AppOpsManager.OpEntry> stubOps = null;
             AppOpsManager.PackageOps pkgOps = null;
             if (appInfo.requestedPermissions != null) {
                 for (int j=0; j<appInfo.requestedPermissions.length; j++) {
@@ -611,15 +611,15 @@
                         if (appEntry.hasOp(permOps.get(k))) {
                             continue;
                         }
-                        if (dummyOps == null) {
-                            dummyOps = new ArrayList<AppOpsManager.OpEntry>();
+                        if (stubOps == null) {
+                            stubOps = new ArrayList<AppOpsManager.OpEntry>();
                             pkgOps = new AppOpsManager.PackageOps(
-                                    appInfo.packageName, appInfo.applicationInfo.uid, dummyOps);
+                                    appInfo.packageName, appInfo.applicationInfo.uid, stubOps);
 
                         }
                         AppOpsManager.OpEntry opEntry = new AppOpsManager.OpEntry(
                                 permOps.get(k), AppOpsManager.MODE_ALLOWED, Collections.emptyMap());
-                        dummyOps.add(opEntry);
+                        stubOps.add(opEntry);
                         addOp(entries, pkgOps, appEntry, opEntry, packageName == null,
                                 packageName == null ? 0 : opToOrder[opEntry.getOp()]);
                     }
diff --git a/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java b/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java
index 58907a7..b370ad2 100644
--- a/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java
+++ b/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java
@@ -35,8 +35,8 @@
 public class AppFilterRegistry {
 
     @IntDef(value = {
-            FILTER_APPS_POWER_WHITELIST,
-            FILTER_APPS_POWER_WHITELIST_ALL,
+            FILTER_APPS_POWER_ALLOWLIST,
+            FILTER_APPS_POWER_ALLOWLIST_ALL,
             FILTER_APPS_ALL,
             FILTER_APPS_ENABLED,
             FILTER_APPS_INSTANT,
@@ -56,14 +56,14 @@
 
     // Filter options used for displayed list of applications
     // Filters will appear sorted based on their value defined here.
-    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_INSTANT = 4;
-    public static final int FILTER_APPS_DISABLED = 5;
-    public static final int FILTER_APPS_RECENT = 6;
-    public static final int FILTER_APPS_FREQUENT = 7;
+    public static final int FILTER_APPS_POWER_ALLOWLIST = 0;
+    public static final int FILTER_APPS_POWER_ALLOWLIST_ALL = 1;
+    public static final int FILTER_APPS_RECENT = 2;
+    public static final int FILTER_APPS_FREQUENT = 3;
+    public static final int FILTER_APPS_ALL = 4;
+    public static final int FILTER_APPS_ENABLED = 5;
+    public static final int FILTER_APPS_INSTANT = 6;
+    public static final int FILTER_APPS_DISABLED = 7;
     public static final int FILTER_APPS_PERSONAL = 8;
     public static final int FILTER_APPS_WORK = 9;
     public static final int FILTER_APPS_USAGE_ACCESS = 10;
@@ -82,20 +82,20 @@
     private AppFilterRegistry() {
         mFilters = new AppFilterItem[18];
 
-        // High power whitelist, on
-        mFilters[FILTER_APPS_POWER_WHITELIST] = new AppFilterItem(
+        // High power allowlist, on
+        mFilters[FILTER_APPS_POWER_ALLOWLIST] = new AppFilterItem(
                 new ApplicationsState.CompoundFilter(
-                        AppStatePowerBridge.FILTER_POWER_WHITELISTED,
+                        AppStatePowerBridge.FILTER_POWER_ALLOWLISTED,
                         ApplicationsState.FILTER_ALL_ENABLED),
-                FILTER_APPS_POWER_WHITELIST,
+                FILTER_APPS_POWER_ALLOWLIST,
                 R.string.high_power_filter_on);
 
         // Without disabled until used
-        mFilters[FILTER_APPS_POWER_WHITELIST_ALL] = new AppFilterItem(
+        mFilters[FILTER_APPS_POWER_ALLOWLIST_ALL] = new AppFilterItem(
                 new ApplicationsState.CompoundFilter(
                         ApplicationsState.FILTER_WITHOUT_DISABLED_UNTIL_USED,
                         ApplicationsState.FILTER_ALL_ENABLED),
-                FILTER_APPS_POWER_WHITELIST_ALL,
+                FILTER_APPS_POWER_ALLOWLIST_ALL,
                 R.string.filter_all_apps);
 
         // All apps
@@ -200,7 +200,7 @@
             case ManageApplications.LIST_TYPE_USAGE_ACCESS:
                 return FILTER_APPS_USAGE_ACCESS;
             case ManageApplications.LIST_TYPE_HIGH_POWER:
-                return FILTER_APPS_POWER_WHITELIST;
+                return FILTER_APPS_POWER_ALLOWLIST;
             case ManageApplications.LIST_TYPE_OVERLAY:
                 return FILTER_APPS_WITH_OVERLAY;
             case ManageApplications.LIST_TYPE_WRITE_SETTINGS:
diff --git a/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java b/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java
index bd08236..b072047 100644
--- a/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java
+++ b/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java
@@ -70,7 +70,7 @@
         if (twoTarget) {
             if (widgetFrame != null) {
                 LayoutInflater.from(parent.getContext())
-                        .inflate(R.layout.preference_widget_master_switch, widgetFrame, true);
+                        .inflate(R.layout.preference_widget_primary_switch, widgetFrame, true);
 
                 View divider = LayoutInflater.from(parent.getContext()).inflate(
                         R.layout.preference_two_target_divider, view, false);
diff --git a/src/com/android/settings/applications/manageapplications/ManageApplications.java b/src/com/android/settings/applications/manageapplications/ManageApplications.java
index 5ef1232..d41864e 100644
--- a/src/com/android/settings/applications/manageapplications/ManageApplications.java
+++ b/src/com/android/settings/applications/manageapplications/ManageApplications.java
@@ -25,8 +25,8 @@
 import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_FREQUENT;
 import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_INSTANT;
 import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_PERSONAL;
-import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_POWER_WHITELIST;
-import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_POWER_WHITELIST_ALL;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_POWER_ALLOWLIST;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_POWER_ALLOWLIST_ALL;
 import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_RECENT;
 import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_WORK;
 import static com.android.settings.search.actionbar.SearchMenuController.MENU_SEARCH;
@@ -125,7 +125,7 @@
 import com.android.settingslib.applications.ApplicationsState.CompoundFilter;
 import com.android.settingslib.applications.ApplicationsState.VolumeFilter;
 import com.android.settingslib.applications.StorageStatsSource;
-import com.android.settingslib.fuelgauge.PowerWhitelistBackend;
+import com.android.settingslib.fuelgauge.PowerAllowlistBackend;
 import com.android.settingslib.utils.ThreadUtils;
 import com.android.settingslib.widget.settingsspinner.SettingsSpinnerAdapter;
 
@@ -476,10 +476,10 @@
             mFilterAdapter.enableFilter(FILTER_APPS_RECENT);
             mFilterAdapter.enableFilter(FILTER_APPS_FREQUENT);
             mFilterAdapter.enableFilter(FILTER_APPS_BLOCKED);
-            mFilterAdapter.disableFilter(FILTER_APPS_ALL);
+            mFilterAdapter.enableFilter(FILTER_APPS_ALL);
         }
         if (mListType == LIST_TYPE_HIGH_POWER) {
-            mFilterAdapter.enableFilter(FILTER_APPS_POWER_WHITELIST_ALL);
+            mFilterAdapter.enableFilter(FILTER_APPS_POWER_ALLOWLIST_ALL);
         }
 
         setCompositeFilter();
@@ -1011,7 +1011,7 @@
         private boolean mHasReceivedBridgeCallback;
         private FileViewHolderController mExtraViewController;
         private SearchFilter mSearchFilter;
-        private PowerWhitelistBackend mBackend;
+        private PowerAllowlistBackend mBackend;
 
         // This is to remember and restore the last scroll position when this
         // fragment is paused. We need this special handling because app entries are added gradually
@@ -1036,7 +1036,7 @@
             mContext = manageApplications.getActivity();
             mIconDrawableFactory = IconDrawableFactory.newInstance(mContext);
             mAppFilter = appFilter;
-            mBackend = PowerWhitelistBackend.getInstance(mContext);
+            mBackend = PowerAllowlistBackend.getInstance(mContext);
             if (mManageApplications.mListType == LIST_TYPE_NOTIFICATION) {
                 mExtraInfoBridge = new AppStateNotificationBridge(mContext, mState, this,
                         manageApplications.mUsageStatsManager,
@@ -1089,12 +1089,16 @@
             mAppFilter = appFilter;
 
             // Notification filters require resorting the list
-            if (FILTER_APPS_FREQUENT == appFilter.getFilterType()) {
-                rebuild(R.id.sort_order_frequent_notification);
-            } else if (FILTER_APPS_RECENT == appFilter.getFilterType()) {
-                rebuild(R.id.sort_order_recent_notification);
-            } else if (FILTER_APPS_BLOCKED == appFilter.getFilterType()) {
-                rebuild(R.id.sort_order_alpha);
+            if (mManageApplications.mListType == LIST_TYPE_NOTIFICATION) {
+                if (FILTER_APPS_FREQUENT == appFilter.getFilterType()) {
+                    rebuild(R.id.sort_order_frequent_notification);
+                } else if (FILTER_APPS_RECENT == appFilter.getFilterType()) {
+                    rebuild(R.id.sort_order_recent_notification);
+                } else if (FILTER_APPS_BLOCKED == appFilter.getFilterType()) {
+                    rebuild(R.id.sort_order_alpha);
+                } else {
+                    rebuild(R.id.sort_order_alpha);
+                }
             } else {
                 rebuild();
             }
@@ -1288,8 +1292,8 @@
                 Log.d(TAG, "onRebuildComplete size=" + entries.size());
             }
             final int filterType = mAppFilter.getFilterType();
-            if (filterType == FILTER_APPS_POWER_WHITELIST ||
-                    filterType == FILTER_APPS_POWER_WHITELIST_ALL) {
+            if (filterType == FILTER_APPS_POWER_ALLOWLIST
+                    || filterType == FILTER_APPS_POWER_ALLOWLIST_ALL) {
                 entries = removeDuplicateIgnoringUser(entries);
             }
             mEntries = entries;
@@ -1447,7 +1451,7 @@
             }
             ApplicationsState.AppEntry entry = mEntries.get(position);
 
-            return !mBackend.isSysWhitelisted(entry.info.packageName)
+            return !mBackend.isSysAllowlisted(entry.info.packageName)
                     && !mBackend.isDefaultActiveApp(entry.info.packageName);
         }
 
diff --git a/src/com/android/settings/applications/manageapplications/ResetAppsHelper.java b/src/com/android/settings/applications/manageapplications/ResetAppsHelper.java
index 270a5c8..670b5a8 100644
--- a/src/com/android/settings/applications/manageapplications/ResetAppsHelper.java
+++ b/src/com/android/settings/applications/manageapplications/ResetAppsHelper.java
@@ -112,13 +112,13 @@
             public void run() {
                 final List<ApplicationInfo> apps = mPm.getInstalledApplications(
                         PackageManager.GET_DISABLED_COMPONENTS);
-                final List<String> whiteList = Arrays.asList(
+                final List<String> allowList = Arrays.asList(
                         mContext.getResources().getStringArray(
                                 R.array.config_skip_reset_apps_package_name));
 
                 for (int i = 0; i < apps.size(); i++) {
                     ApplicationInfo app = apps.get(i);
-                    if (whiteList.contains(app.packageName)) {
+                    if (allowList.contains(app.packageName)) {
                         continue;
                     }
                     try {
diff --git a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
index 9afb2b4..7c8b96f 100644
--- a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
+++ b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
@@ -288,7 +288,7 @@
             // setup.
             final String supervisor = getString(
                     com.android.internal.R.string.config_defaultSupervisionProfileOwnerComponent);
-            if (supervisor == null) {
+            if (TextUtils.isEmpty(supervisor)) {
                 Log.w(TAG, "Unable to set profile owner post-setup, no default supervisor"
                         + "profile owner defined");
                 finish();
@@ -297,7 +297,7 @@
 
             final ComponentName supervisorComponent = ComponentName.unflattenFromString(
                     supervisor);
-            if (who.compareTo(supervisorComponent) != 0) {
+            if (supervisorComponent == null || who.compareTo(supervisorComponent) != 0) {
                 Log.w(TAG, "Unable to set non-default profile owner post-setup " + who);
                 finish();
                 return;
diff --git a/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesDetails.java b/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesDetails.java
index 71d9d13..61af4f6 100644
--- a/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesDetails.java
+++ b/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesDetails.java
@@ -142,7 +142,7 @@
     }
 
     private void logNonConfigurableAppMetrics() {
-        if (!isCrossProfilePackageWhitelisted(mPackageName)) {
+        if (!isCrossProfilePackageAllowlisted(mPackageName)) {
             logEvent(DevicePolicyEnums.CROSS_PROFILE_SETTINGS_PAGE_ADMIN_RESTRICTED);
             return;
         }
@@ -382,7 +382,7 @@
     private boolean refreshUiForNonConfigurableApps() {
         mSwitchPref.setChecked(false);
         mSwitchPref.setTitle(R.string.interact_across_profiles_switch_disabled);
-        if (!isCrossProfilePackageWhitelisted(mPackageName)) {
+        if (!isCrossProfilePackageAllowlisted(mPackageName)) {
             mInstallBanner.setVisible(false);
             mSwitchPref.setDisabledByAdmin(RestrictedLockUtils.getProfileOrDeviceOwner(
                     mContext, mWorkProfile));
@@ -417,7 +417,7 @@
         return false;
     }
 
-    private boolean isCrossProfilePackageWhitelisted(String packageName) {
+    private boolean isCrossProfilePackageAllowlisted(String packageName) {
         return mContext.getSystemService(DevicePolicyManager.class)
                 .getAllCrossProfilePackages().contains(packageName);
     }
diff --git a/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessController.java b/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessController.java
index 727870c..e6b389a 100644
--- a/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessController.java
+++ b/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessController.java
@@ -40,20 +40,13 @@
 
     private static final String TAG = "ZenAccessController";
 
-    private final ActivityManager mActivityManager;
-
     public ZenAccessController(Context context, String preferenceKey) {
         super(context, preferenceKey);
-        mActivityManager = (ActivityManager) mContext.getSystemService(Context.ACTIVITY_SERVICE);
     }
 
     @Override
     public int getAvailabilityStatus() {
-        return isSupported(mActivityManager) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
-    }
-
-    public static boolean isSupported(ActivityManager activityManager) {
-        return !activityManager.isLowRamDevice();
+        return AVAILABLE;
     }
 
     public static Set<String> getPackagesRequestingNotificationPolicyAccess() {
diff --git a/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessDetails.java b/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessDetails.java
index a18e7d6..ba6bb1d 100644
--- a/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessDetails.java
+++ b/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessDetails.java
@@ -50,9 +50,6 @@
     @Override
     protected boolean refreshUi() {
         final Context context = getContext();
-        if (!ZenAccessController.isSupported(context.getSystemService(ActivityManager.class))) {
-            return false;
-        }
         // If this app didn't declare this permission in their manifest, don't bother showing UI.
         final Set<String> needAccessApps =
                 ZenAccessController.getPackagesRequestingNotificationPolicyAccess();
diff --git a/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessSettingObserverMixin.java b/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessSettingObserverMixin.java
index 30507ef..da238f6 100644
--- a/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessSettingObserverMixin.java
+++ b/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessSettingObserverMixin.java
@@ -53,9 +53,6 @@
 
     @Override
     public void onStart() {
-        if (!ZenAccessController.isSupported(mContext.getSystemService(ActivityManager.class))) {
-            return;
-        }
         mContext.getContentResolver().registerContentObserver(
                 Settings.Secure.getUriFor(
                         Settings.Secure.ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES),
@@ -69,9 +66,6 @@
 
     @Override
     public void onStop() {
-        if (!ZenAccessController.isSupported(mContext.getSystemService(ActivityManager.class))) {
-            return;
-        }
         mContext.getContentResolver().unregisterContentObserver(this /* observer */);
     }
 }
diff --git a/src/com/android/settings/backup/OWNERS b/src/com/android/settings/backup/OWNERS
index d5a95be..5b676b9 100644
--- a/src/com/android/settings/backup/OWNERS
+++ b/src/com/android/settings/backup/OWNERS
@@ -1,14 +1,15 @@
+# Bug component: 656484
 # Use this reviewer by default.
-br-framework-team+reviews@google.com
+br-platform-dev@google.com
 
 # People who can approve changes for submission.
-alsutton@google.com
-anniemeng@google.com
-nathch@google.com
 rthakohov@google.com
+tobiast@google.com
+jstemmer@google.com
+aabhinav@google.com
+philippov@google.com
+niagra@google.com
+niamhfw@google.com
 
 # Others (in case above are not available).
 bryanmawhinney@google.com
-jorlow@google.com
-philippov@google.com
-stefanot@google.com
diff --git a/src/com/android/settings/backup/SettingsBackupHelper.java b/src/com/android/settings/backup/SettingsBackupHelper.java
index 92612b0..6437b78 100644
--- a/src/com/android/settings/backup/SettingsBackupHelper.java
+++ b/src/com/android/settings/backup/SettingsBackupHelper.java
@@ -59,7 +59,7 @@
 
             try (FileOutputStream out = new FileOutputStream(newState.getFileDescriptor())) {
                 if (getVersionCode(oldState) != VERSION_CODE) {
-                    data.writeEntityHeader("dummy", 1);
+                    data.writeEntityHeader("placeholder", 1);
                     data.writeEntityData(new byte[1], 1);
                 }
 
diff --git a/src/com/android/settings/biometrics/BiometricEnrollActivity.java b/src/com/android/settings/biometrics/BiometricEnrollActivity.java
index 4179ea3..35a4546 100644
--- a/src/com/android/settings/biometrics/BiometricEnrollActivity.java
+++ b/src/com/android/settings/biometrics/BiometricEnrollActivity.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.biometrics;
 
+import android.annotation.NonNull;
 import android.app.admin.DevicePolicyManager;
 import android.app.settings.SettingsEnums;
 import android.content.Intent;
@@ -48,6 +49,8 @@
 
     private static final String TAG = "BiometricEnrollActivity";
 
+    // Intent extra. If true, biometric enrollment should skip introductory screens. Currently
+    // this only applies to fingerprint.
     public static final String EXTRA_SKIP_INTRO = "skip_intro";
 
     public static final class InternalActivity extends BiometricEnrollActivity {}
@@ -62,59 +65,103 @@
 
         Log.d(TAG, "Authenticators: " + authenticators);
 
-        final BiometricManager bm = getSystemService(BiometricManager.class);
         final PackageManager pm = getApplicationContext().getPackageManager();
-        Intent intent = null;
+        final boolean hasFeatureFingerprint =
+                pm.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT);
+        final boolean hasFeatureFace = pm.hasSystemFeature(PackageManager.FEATURE_FACE);
+        final boolean isSetupWizard = WizardManagerHelper.isAnySetupWizard(getIntent());
 
-        final int result = bm.canAuthenticate(authenticators);
-
-        if (!WizardManagerHelper.isAnySetupWizard(getIntent())) {
-            if (result == BiometricManager.BIOMETRIC_SUCCESS
-                    || result == BiometricManager.BIOMETRIC_ERROR_NO_HARDWARE) {
+        if (isSetupWizard) {
+            if (hasFeatureFace && hasFeatureFingerprint) {
+                // TODO(b/162341940, b/152242790) this should show a multi-biometric selection
+                //  screen
+                launchFingerprintOnlyEnroll();
+            } else if (hasFeatureFace) {
+                launchFaceOnlyEnroll();
+            } else if (hasFeatureFingerprint) {
+                launchFingerprintOnlyEnroll();
+            } else {
+                Log.e(TAG, "No biometrics but started by SUW?");
+                finish();
+            }
+        } else {
+            // If the caller is not setup wizard, and the user has something enrolled, finish.
+            final BiometricManager bm = getSystemService(BiometricManager.class);
+            final @BiometricManager.BiometricError int result = bm.canAuthenticate(authenticators);
+            if (result != BiometricManager.BIOMETRIC_ERROR_NONE_ENROLLED) {
                 Log.e(TAG, "Unexpected result: " + result);
                 finish();
                 return;
             }
-        }
 
-        if (authenticators == BiometricManager.Authenticators.DEVICE_CREDENTIAL) {
-            // If only device credential was specified, ask the user to only set that up.
-            intent = new Intent(this, ChooseLockGeneric.class);
-            intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY,
-                    DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);
-        } else if (pm.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT)) {
-            // This logic may have to be modified on devices with multiple biometrics.
-            // ChooseLockGeneric can request to start fingerprint enroll bypassing the intro screen.
-            if (getIntent().getBooleanExtra(EXTRA_SKIP_INTRO, false)
-                    && this instanceof InternalActivity) {
-                intent = getFingerprintFindSensorIntent();
+            // This will need to be updated if the device has sensors other than BIOMETRIC_STRONG
+            if (authenticators == BiometricManager.Authenticators.DEVICE_CREDENTIAL) {
+                launchCredentialOnlyEnroll();
+            } else if (hasFeatureFace && hasFeatureFingerprint) {
+                // TODO(b/162341940, b/152242790) this should show a multi-biometric selection
+                //  screen
+                launchFingerprintOnlyEnroll();
+            } else if (hasFeatureFingerprint) {
+                launchFingerprintOnlyEnroll();
+            } else if (hasFeatureFace) {
+                launchFaceOnlyEnroll();
             } else {
-                intent = getFingerprintIntroIntent();
+                Log.e(TAG, "Unknown state, finishing");
+                finish();
             }
-        } else if (pm.hasSystemFeature(PackageManager.FEATURE_FACE)) {
-            intent = getFaceIntroIntent();
+        }
+    }
+
+    /**
+     * @param intent Enrollment activity that should be started (e.g. FaceEnrollIntroduction.class,
+     *               etc).
+     */
+    private void launchEnrollActivity(@NonNull Intent intent) {
+        intent.setFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
+        if (this instanceof InternalActivity) {
+            // Propagate challenge and user Id from ChooseLockGeneric.
+            final byte[] token = getIntent()
+                    .getByteArrayExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
+            final int userId = getIntent()
+                    .getIntExtra(Intent.EXTRA_USER_ID, UserHandle.USER_NULL);
+            final long gkPwHandle = getIntent().getLongExtra(
+                    ChooseLockSettingsHelper.EXTRA_KEY_GK_PW_HANDLE, 0L);
+
+            intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, token);
+            intent.putExtra(Intent.EXTRA_USER_ID, userId);
+            if (gkPwHandle != 0L) {
+                intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_GK_PW_HANDLE, gkPwHandle);
+            }
         }
 
-        if (intent != null) {
-            intent.setFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
+        startActivity(intent);
+        finish();
+    }
 
-            if (this instanceof InternalActivity) {
-                // Propagate challenge and user Id from ChooseLockGeneric.
-                final byte[] token = getIntent()
-                        .getByteArrayExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
-                final int userId = getIntent()
-                        .getIntExtra(Intent.EXTRA_USER_ID, UserHandle.USER_NULL);
+    private void launchCredentialOnlyEnroll() {
+        final Intent intent;
+        // If only device credential was specified, ask the user to only set that up.
+        intent = new Intent(this, ChooseLockGeneric.class);
+        intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY,
+                DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);
+        launchEnrollActivity(intent);
+    }
 
-                intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, token);
-                intent.putExtra(Intent.EXTRA_USER_ID, userId);
-            }
-
-            startActivity(intent);
-            finish();
+    private void launchFingerprintOnlyEnroll() {
+        final Intent intent;
+        // ChooseLockGeneric can request to start fingerprint enroll bypassing the intro screen.
+        if (getIntent().getBooleanExtra(EXTRA_SKIP_INTRO, false)
+                && this instanceof InternalActivity) {
+            intent = getFingerprintFindSensorIntent();
         } else {
-            Log.e(TAG, "Intent was null, finishing");
-            finish();
+            intent = getFingerprintIntroIntent();
         }
+        launchEnrollActivity(intent);
+    }
+
+    private void launchFaceOnlyEnroll() {
+        final Intent intent = getFaceIntroIntent();
+        launchEnrollActivity(intent);
     }
 
     private Intent getFingerprintFindSensorIntent() {
diff --git a/src/com/android/settings/biometrics/BiometricEnrollBase.java b/src/com/android/settings/biometrics/BiometricEnrollBase.java
index 308878f..ecb2192 100644
--- a/src/com/android/settings/biometrics/BiometricEnrollBase.java
+++ b/src/com/android/settings/biometrics/BiometricEnrollBase.java
@@ -88,7 +88,13 @@
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        mToken = getIntent().getByteArrayExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
+        // Don't need to retrieve the HAT if it already exists. In some cases, the extras do not
+        // contain EXTRA_KEY_CHALLENGE_TOKEN but contain EXTRA_KEY_GK_PW, in which case enrollment
+        // classes may request a HAT to be created (as opposed to being passed in)
+        if (mToken == null) {
+            mToken = getIntent().getByteArrayExtra(
+                    ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
+        }
         mFromSettingsSummary = getIntent().getBooleanExtra(EXTRA_FROM_SETTINGS_SUMMARY, false);
         if (savedInstanceState != null && mToken == null) {
             mLaunchedConfirmLock = savedInstanceState.getBoolean(EXTRA_KEY_LAUNCHED_CONFIRM);
@@ -180,19 +186,20 @@
         return intent;
     }
 
-    protected void launchConfirmLock(int titleResId, long challenge) {
-        ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(this);
-        boolean launchedConfirmationActivity;
-        if (mUserId == UserHandle.USER_NULL) {
-            launchedConfirmationActivity = helper.launchConfirmationActivity(CONFIRM_REQUEST,
-                    getString(titleResId),
-                    null, null, challenge, true /* foregroundOnly */);
-        } else {
-            launchedConfirmationActivity = helper.launchConfirmationActivity(CONFIRM_REQUEST,
-                    getString(titleResId),
-                    null, null, challenge, mUserId, true /* foregroundOnly */);
+    protected void launchConfirmLock(int titleResId) {
+        final ChooseLockSettingsHelper.Builder builder = new ChooseLockSettingsHelper.Builder(this);
+        builder.setRequestCode(CONFIRM_REQUEST)
+                .setTitle(getString(titleResId))
+                .setRequestGatekeeperPasswordHandle(true)
+                .setForegroundOnly(true)
+                .setReturnCredentials(true);
+
+        if (mUserId != UserHandle.USER_NULL) {
+            builder.setUserId(mUserId);
         }
-        if (!launchedConfirmationActivity) {
+
+        final boolean launched = builder.show();
+        if (!launched) {
             // This shouldn't happen, as we should only end up at this step if a lock thingy is
             // already set.
             finish();
diff --git a/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java b/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java
index d815f57..8cd5a70 100644
--- a/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java
+++ b/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java
@@ -43,6 +43,8 @@
 public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase
         implements LinkSpan.OnClickListener {
 
+    private static final String KEY_CONFIRMING_CREDENTIALS = "confirming_credentials";
+
     private UserManager mUserManager;
     private boolean mHasPassword;
     private boolean mBiometricUnlockDisabledByAdmin;
@@ -99,7 +101,7 @@
     /**
      * @return the challenge generated by the biometric hardware
      */
-    protected abstract long getChallenge();
+    protected abstract void getChallenge(GenerateChallengeCallback callback);
 
     /**
      * @return one of the ChooseLockSettingsHelper#EXTRA_KEY_FOR_* constants
@@ -123,10 +125,18 @@
      */
     public abstract void onClick(LinkSpan span);
 
+    protected interface GenerateChallengeCallback {
+        void onChallengeGenerated(int sensorId, long challenge);
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        if (savedInstanceState != null) {
+            mConfirmingCredentials = savedInstanceState.getBoolean(KEY_CONFIRMING_CREDENTIALS);
+        }
+
         Intent intent = getIntent();
         if (intent.getStringExtra(WizardManagerHelper.EXTRA_THEME) == null) {
             // Put the theme in the intent so it gets propagated to other activities in the flow
@@ -149,15 +159,17 @@
         mUserManager = UserManager.get(this);
         updatePasswordQuality();
 
-        if (!mHasPassword) {
-            // No password registered, launch into enrollment wizard.
-            mConfirmingCredentials = true;
-            launchChooseLock();
-        } else if (mToken == null) {
-            // It's possible to have a token but mLaunchedConfirmLock == false, since
-            // ChooseLockGeneric can pass us a token.
-            mConfirmingCredentials = true;
-            launchConfirmLock(getConfirmLockTitleResId(), getChallenge());
+        if (!mConfirmingCredentials) {
+            if (!mHasPassword) {
+                // No password registered, launch into enrollment wizard.
+                mConfirmingCredentials = true;
+                launchChooseLock();
+            } else if (!BiometricUtils.containsGatekeeperPassword(getIntent()) && mToken == null) {
+                // It's possible to have a token but mLaunchedConfirmLock == false, since
+                // ChooseLockGeneric can pass us a token.
+                mConfirmingCredentials = true;
+                launchConfirmLock(getConfirmLockTitleResId());
+            }
         }
     }
 
@@ -179,12 +191,18 @@
     }
 
     @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putBoolean(KEY_CONFIRMING_CREDENTIALS, mConfirmingCredentials);
+    }
+
+    @Override
     protected boolean shouldFinishWhenBackgrounded() {
         return super.shouldFinishWhenBackgrounded() && !mConfirmingCredentials && !mNextClicked;
     }
 
     private void updatePasswordQuality() {
-        final int passwordQuality = new ChooseLockSettingsHelper(this).utils()
+        final int passwordQuality = new LockPatternUtils(this)
                 .getActivePasswordQuality(mUserManager.getCredentialOwnerProfile(mUserId));
         mHasPassword = passwordQuality != DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
     }
@@ -203,12 +221,10 @@
 
     private void launchChooseLock() {
         Intent intent = getChooseLockIntent();
-        long challenge = getChallenge();
         intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY,
                 DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);
         intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.HIDE_DISABLED_PREFS, true);
-        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, true);
-        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, challenge);
+        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE, true);
         intent.putExtra(getExtraKeyForBiometric(), true);
         if (mUserId != UserHandle.USER_NULL) {
             intent.putExtra(Intent.EXTRA_USER_ID, mUserId);
@@ -255,13 +271,16 @@
                 return;
             }
         } else if (requestCode == CHOOSE_LOCK_GENERIC_REQUEST) {
+            mConfirmingCredentials = false;
             if (resultCode == RESULT_FINISHED) {
                 updatePasswordQuality();
-                mToken = data.getByteArrayExtra(
-                        ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
                 overridePendingTransition(R.anim.sud_slide_next_in, R.anim.sud_slide_next_out);
-                mConfirmingCredentials = false;
-                return;
+                getNextButton().setEnabled(false);
+                getChallenge(((sensorId, challenge) -> {
+                    mToken = BiometricUtils.requestGatekeeperHat(this, data, mUserId, challenge);
+                    BiometricUtils.removeGatekeeperPasswordHandle(this, data);
+                    getNextButton().setEnabled(true);
+                }));
             } else {
                 setResult(resultCode, data);
                 finish();
@@ -269,8 +288,13 @@
         } else if (requestCode == CONFIRM_REQUEST) {
             mConfirmingCredentials = false;
             if (resultCode == RESULT_OK && data != null) {
-                mToken = data.getByteArrayExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
                 overridePendingTransition(R.anim.sud_slide_next_in, R.anim.sud_slide_next_out);
+                getNextButton().setEnabled(false);
+                getChallenge(((sensorId, challenge) -> {
+                    mToken = BiometricUtils.requestGatekeeperHat(this, data, mUserId, challenge);
+                    BiometricUtils.removeGatekeeperPasswordHandle(this, data);
+                    getNextButton().setEnabled(true);
+                }));
             } else {
                 setResult(resultCode, data);
                 finish();
diff --git a/src/com/android/settings/biometrics/BiometricUtils.java b/src/com/android/settings/biometrics/BiometricUtils.java
new file mode 100644
index 0000000..e458f03
--- /dev/null
+++ b/src/com/android/settings/biometrics/BiometricUtils.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.biometrics;
+
+import android.content.Context;
+import android.content.Intent;
+
+import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.password.ChooseLockSettingsHelper;
+
+/**
+ * Common biometric utilities.
+ */
+public class BiometricUtils {
+    /**
+     * Given the result from confirming or choosing a credential, request Gatekeeper to generate
+     * a HardwareAuthToken with the Gatekeeper Password together with a biometric challenge.
+     *
+     * @param context Caller's context
+     * @param result The onActivityResult intent from ChooseLock* or ConfirmLock*
+     * @param userId User ID that the credential/biometric operation applies to
+     * @param challenge Unique biometric challenge from FingerprintManager/FaceManager
+     * @return
+     */
+    public static byte[] requestGatekeeperHat(Context context, Intent result, int userId,
+            long challenge) {
+        final long gatekeeperPasswordHandle = result.getLongExtra(
+                ChooseLockSettingsHelper.EXTRA_KEY_GK_PW_HANDLE, 0L);
+        if (gatekeeperPasswordHandle == 0L) {
+            throw new IllegalStateException("Gatekeeper Password is missing!!");
+        }
+
+        final LockPatternUtils utils = new LockPatternUtils(context);
+        return utils.verifyGatekeeperPasswordHandle(gatekeeperPasswordHandle, challenge, userId)
+                .getGatekeeperHAT();
+    }
+
+    public static boolean containsGatekeeperPassword(Intent data) {
+        if (data == null) {
+            return false;
+        }
+        return data.getLongExtra(ChooseLockSettingsHelper.EXTRA_KEY_GK_PW_HANDLE, 0L) != 0L;
+    }
+
+    /**
+     * Requests {@link com.android.server.locksettings.LockSettingsService} to remove the
+     * gatekeeper password associated with a previous
+     * {@link ChooseLockSettingsHelper.Builder#setRequestGatekeeperPasswordHandle(boolean)}
+     *
+     * @param context Caller's context
+     * @param data The onActivityResult intent from ChooseLock* or ConfirmLock*
+     */
+    public static void removeGatekeeperPasswordHandle(Context context, Intent data) {
+        if (data == null) {
+            return;
+        }
+        final long gatekeeperPasswordsHandle = data.getLongExtra(
+                ChooseLockSettingsHelper.EXTRA_KEY_GK_PW_HANDLE, 0L);
+        if (gatekeeperPasswordsHandle == 0L) {
+            return;
+        }
+        final LockPatternUtils utils = new LockPatternUtils(context);
+        utils.removeGatekeeperPasswordHandle(gatekeeperPasswordsHandle);
+    }
+}
diff --git a/src/com/android/settings/biometrics/face/FaceEnrollAccessibilityDialog.java b/src/com/android/settings/biometrics/face/FaceEnrollAccessibilityDialog.java
new file mode 100644
index 0000000..7042870
--- /dev/null
+++ b/src/com/android/settings/biometrics/face/FaceEnrollAccessibilityDialog.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.biometrics.face;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.settings.SettingsEnums;
+import android.os.Bundle;
+
+import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+
+/**
+ * Confirmation dialog shown to users with accessibility enabled who are trying to start the
+ * non-accessibility enrollment flow.
+ */
+public class FaceEnrollAccessibilityDialog extends InstrumentedDialogFragment {
+    private AlertDialog.OnClickListener mPositiveButtonListener;
+
+    /**
+     * @return new instance of the dialog
+     */
+    public static FaceEnrollAccessibilityDialog newInstance() {
+        return new FaceEnrollAccessibilityDialog();
+    }
+
+    public void setPositiveButtonListener(AlertDialog.OnClickListener listener) {
+        mPositiveButtonListener = listener;
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+
+        final int titleResId =
+                R.string.security_settings_face_enroll_education_accessibility_dialog_message;
+        final int negativeButtonResId =
+                R.string.security_settings_face_enroll_education_accessibility_dialog_negative;
+        final int positiveButtonResId =
+                R.string.security_settings_face_enroll_education_accessibility_dialog_positive;
+
+        builder.setMessage(titleResId)
+                .setNegativeButton(negativeButtonResId, (dialog, which) -> {
+                    dialog.cancel();
+                })
+                .setPositiveButton(positiveButtonResId, (dialog, which) -> {
+                    mPositiveButtonListener.onClick(dialog, which);
+                });
+
+        return builder.create();
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return SettingsEnums.FACE_ENROLL_INTRO;
+    }
+}
diff --git a/src/com/android/settings/biometrics/face/FaceEnrollEducation.java b/src/com/android/settings/biometrics/face/FaceEnrollEducation.java
index 3b84c35..4c4fa11 100644
--- a/src/com/android/settings/biometrics/face/FaceEnrollEducation.java
+++ b/src/com/android/settings/biometrics/face/FaceEnrollEducation.java
@@ -55,6 +55,7 @@
     private Intent mResultIntent;
     private TextView mDescriptionText;
     private boolean mNextClicked;
+    private boolean mAccessibilityEnabled;
 
     private CompoundButton.OnCheckedChangeListener mSwitchDiversityListener =
             new CompoundButton.OnCheckedChangeListener() {
@@ -123,13 +124,12 @@
                 .setTheme(R.style.SudGlifButton_Primary)
                 .build();
 
-        boolean accessibilityEnabled = false;
         final AccessibilityManager accessibilityManager = getApplicationContext().getSystemService(
                 AccessibilityManager.class);
         if (accessibilityManager != null) {
             // Add additional check for touch exploration. This prevents other accessibility
             // features such as Live Transcribe from defaulting to the accessibility setup.
-            accessibilityEnabled = accessibilityManager.isEnabled()
+            mAccessibilityEnabled = accessibilityManager.isEnabled()
                     && accessibilityManager.isTouchExplorationEnabled();
         }
         mFooterBarMixin.setPrimaryButton(footerButton);
@@ -147,7 +147,7 @@
             mSwitchDiversity.getSwitch().toggle();
         });
 
-        if (accessibilityEnabled) {
+        if (mAccessibilityEnabled) {
             accessibilityButton.callOnClick();
         }
     }
@@ -194,9 +194,20 @@
         if (mResultIntent != null) {
             intent.putExtras(mResultIntent);
         }
-        mNextClicked = true;
+
         intent.putExtra(EXTRA_KEY_REQUIRE_DIVERSITY, !mSwitchDiversity.isChecked());
-        startActivityForResult(intent, BIOMETRIC_FIND_SENSOR_REQUEST);
+
+        if (!mSwitchDiversity.isChecked() && mAccessibilityEnabled) {
+            FaceEnrollAccessibilityDialog dialog = FaceEnrollAccessibilityDialog.newInstance();
+            dialog.setPositiveButtonListener((dialog1, which) -> {
+                startActivityForResult(intent, BIOMETRIC_FIND_SENSOR_REQUEST);
+                mNextClicked = true;
+            });
+            dialog.show(getSupportFragmentManager(), FaceEnrollAccessibilityDialog.class.getName());
+        } else {
+            startActivityForResult(intent, BIOMETRIC_FIND_SENSOR_REQUEST);
+            mNextClicked = true;
+        }
     }
 
     protected void onSkipButtonClick(View view) {
diff --git a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
index 6709a6a..59d1a60 100644
--- a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
+++ b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
@@ -26,6 +26,7 @@
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.biometrics.BiometricEnrollIntroduction;
+import com.android.settings.biometrics.BiometricUtils;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.password.ChooseLockSettingsHelper;
 import com.android.settingslib.RestrictedLockUtilsInternal;
@@ -38,7 +39,7 @@
 
 public class FaceEnrollIntroduction extends BiometricEnrollIntroduction {
 
-    private static final String TAG = "FaceIntro";
+    private static final String TAG = "FaceEnrollIntroduction";
 
     private FaceManager mFaceManager;
     private FaceFeatureProvider mFaceFeatureProvider;
@@ -86,9 +87,7 @@
                     RequireScrollMixin.class);
             requireScrollMixin.requireScrollWithButton(this, agreeButton,
                     R.string.security_settings_face_enroll_introduction_more,
-                    button -> {
-                        onNextButtonClick(button);
-                    });
+                    this::onNextButtonClick);
         }
 
         final TextView footer2 = findViewById(R.id.face_enroll_introduction_footer_part_2);
@@ -97,6 +96,19 @@
                         ? R.string.security_settings_face_enroll_introduction_footer_part_2
                         : R.string.security_settings_face_settings_footer_attention_not_supported;
         footer2.setText(footer2TextResource);
+
+        // This path is an entry point for SetNewPasswordController, e.g.
+        // adb shell am start -a android.app.action.SET_NEW_PASSWORD
+        if (mToken == null && BiometricUtils.containsGatekeeperPassword(getIntent())) {
+            mFooterBarMixin.getPrimaryButton().setEnabled(false);
+            // We either block on generateChallenge, or need to gray out the "next" button until
+            // the challenge is ready. Let's just do this for now.
+            mFaceManager.generateChallenge((sensorId, challenge) -> {
+                mToken = BiometricUtils.requestGatekeeperHat(this, getIntent(), mUserId, challenge);
+                BiometricUtils.removeGatekeeperPasswordHandle(this, getIntent());
+                mFooterBarMixin.getPrimaryButton().setEnabled(true);
+            });
+        }
     }
 
     @Override
@@ -171,12 +183,13 @@
     }
 
     @Override
-    protected long getChallenge() {
+    protected void getChallenge(GenerateChallengeCallback callback) {
         mFaceManager = Utils.getFaceManagerOrNull(this);
         if (mFaceManager == null) {
-            return 0;
+            callback.onChallengeGenerated(0, 0L);
+            return;
         }
-        return mFaceManager.generateChallenge();
+        mFaceManager.generateChallenge(callback::onChallengeGenerated);
     }
 
     @Override
diff --git a/src/com/android/settings/biometrics/face/FaceEnrollSidecar.java b/src/com/android/settings/biometrics/face/FaceEnrollSidecar.java
index 512d8fe..6d2c301 100644
--- a/src/com/android/settings/biometrics/face/FaceEnrollSidecar.java
+++ b/src/com/android/settings/biometrics/face/FaceEnrollSidecar.java
@@ -48,10 +48,6 @@
     @Override
     public void startEnrollment() {
         super.startEnrollment();
-        if (mUserId != UserHandle.USER_NULL) {
-            mFaceManager.setActiveUser(mUserId);
-        }
-
         mFaceManager.enroll(mUserId, mToken, mEnrollmentCancel,
                 mEnrollmentCallback, mDisabledFeatures);
     }
diff --git a/src/com/android/settings/biometrics/face/FaceSettings.java b/src/com/android/settings/biometrics/face/FaceSettings.java
index 04df11a..7251230 100644
--- a/src/com/android/settings/biometrics/face/FaceSettings.java
+++ b/src/com/android/settings/biometrics/face/FaceSettings.java
@@ -37,6 +37,7 @@
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.Utils;
+import com.android.settings.biometrics.BiometricUtils;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.password.ChooseLockSettingsHelper;
@@ -202,16 +203,18 @@
         super.onResume();
 
         if (mToken == null && !mConfirmingPassword) {
-            // Generate challenge in onResume instead of onCreate, since FaceSettings can be
-            // created while Keyguard is showing, in which case the resetLockout revokeChallenge
-            // will invalidate the too-early created challenge here.
-            final long challenge = mFaceManager.generateChallenge();
-            ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(getActivity(), this);
+            final ChooseLockSettingsHelper.Builder builder =
+                    new ChooseLockSettingsHelper.Builder(getActivity(), this);
+            final boolean launched = builder.setRequestCode(CONFIRM_REQUEST)
+                    .setTitle(getString(R.string.security_settings_face_preference_title))
+                    .setRequestGatekeeperPasswordHandle(true)
+                    .setUserId(mUserId)
+                    .setForegroundOnly(true)
+                    .setReturnCredentials(true)
+                    .show();
 
             mConfirmingPassword = true;
-            if (!helper.launchConfirmationActivity(CONFIRM_REQUEST,
-                    getString(R.string.security_settings_face_preference_title),
-                    null, null, challenge, mUserId, true /* foregroundOnly */)) {
+            if (!launched) {
                 Log.e(TAG, "Password not set");
                 finish();
             }
@@ -232,19 +235,23 @@
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
+
+        if (mToken == null && !BiometricUtils.containsGatekeeperPassword(data)) {
+            Log.e(TAG, "No credential");
+            finish();
+        }
+
         if (requestCode == CONFIRM_REQUEST) {
-            mConfirmingPassword = false;
             if (resultCode == RESULT_FINISHED || resultCode == RESULT_OK) {
-                mFaceManager.setActiveUser(mUserId);
                 // The pin/pattern/password was set.
-                if (data != null) {
-                    mToken = data.getByteArrayExtra(
-                            ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
-                    if (mToken != null) {
-                        mAttentionController.setToken(mToken);
-                        mEnrollController.setToken(mToken);
-                    }
-                }
+                mFaceManager.generateChallenge((sensorId, challenge) -> {
+                    mToken = BiometricUtils.requestGatekeeperHat(getPrefContext(), data, mUserId,
+                            challenge);
+                    BiometricUtils.removeGatekeeperPasswordHandle(getPrefContext(), data);
+                    mAttentionController.setToken(mToken);
+                    mEnrollController.setToken(mToken);
+                    mConfirmingPassword = false;
+                });
             }
         } else if (requestCode == ENROLL_REQUEST) {
             if (resultCode == RESULT_TIMEOUT) {
@@ -252,11 +259,6 @@
                 finish();
             }
         }
-
-        if (mToken == null) {
-            // Didn't get an authentication, finishing
-            finish();
-        }
     }
 
     @Override
@@ -267,10 +269,7 @@
                 && !mConfirmingPassword) {
             // Revoke challenge and finish
             if (mToken != null) {
-                final int result = mFaceManager.revokeChallenge();
-                if (result < 0) {
-                    Log.w(TAG, "revokeChallenge failed, result: " + result);
-                }
+                mFaceManager.revokeChallenge();
                 mToken = null;
             }
             finish();
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintAuthenticateSidecar.java b/src/com/android/settings/biometrics/fingerprint/FingerprintAuthenticateSidecar.java
index f5aae12..4264056 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintAuthenticateSidecar.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintAuthenticateSidecar.java
@@ -103,8 +103,8 @@
 
     public void startAuthentication(int userId) {
         mCancellationSignal = new CancellationSignal();
-        mFingerprintManager.authenticate(null, mCancellationSignal, 0 /* flags */,
-                mAuthenticationCallback, null, userId);
+        mFingerprintManager.authenticate(null /* crypto */, mCancellationSignal,
+                mAuthenticationCallback, null /* handler */, userId);
     }
 
     public void stopAuthentication() {
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
index 3831b07..7b65924 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
@@ -62,8 +62,8 @@
     private static final int FINISH_DELAY = 250;
 
     /**
-     * If we don't see progress during this time, we show an error message to remind the user that
-     * he needs to lift the finger and touch again.
+     * If we don't see progress during this time, we show an error message to remind the users that
+     * they need to lift the finger and touch again.
      */
     private static final int HINT_TIMEOUT_DURATION = 2500;
 
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
index dbedb4a..8029c7d 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
@@ -28,6 +28,7 @@
 import com.android.settings.Utils;
 import com.android.settings.biometrics.BiometricEnrollBase;
 import com.android.settings.biometrics.BiometricEnrollSidecar.Listener;
+import com.android.settings.biometrics.BiometricUtils;
 import com.android.settings.password.ChooseLockSettingsHelper;
 
 import com.google.android.setupcompat.template.FooterBarMixin;
@@ -60,8 +61,25 @@
 
         setHeaderText(R.string.security_settings_fingerprint_enroll_find_sensor_title);
 
+        // This is an entry point for SetNewPasswordController, e.g.
+        // adb shell am start -a android.app.action.SET_NEW_PASSWORD
+        if (mToken == null && BiometricUtils.containsGatekeeperPassword(getIntent())) {
+            final FingerprintManager fpm = getSystemService(FingerprintManager.class);
+            fpm.generateChallenge((sensorId, challenge) -> {
+                mToken = BiometricUtils.requestGatekeeperHat(this, getIntent(), mUserId, challenge);
+                BiometricUtils.removeGatekeeperPasswordHandle(this, getIntent());
 
-        startLookingForFingerprint(); // already confirmed, so start looking for fingerprint
+                // Put this into the intent. This is really just to work around the fact that the
+                // enrollment sidecar gets the HAT from the activity's intent, rather than having
+                // it passed in.
+                getIntent().putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, mToken);
+
+                startLookingForFingerprint();
+            });
+        } else if (mToken != null) {
+            // HAT passed in from somewhere else, such as FingerprintEnrollIntroduction
+            startLookingForFingerprint();
+        }
 
         View animationView = findViewById(R.id.fingerprint_sensor_location_animation);
         if (animationView instanceof FingerprintFindSensorAnimation) {
@@ -160,10 +178,13 @@
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == CONFIRM_REQUEST) {
             if (resultCode == RESULT_OK && data != null) {
+                throw new IllegalStateException("Pretty sure this is dead code");
+                /*
                 mToken = data.getByteArrayExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
                 overridePendingTransition(R.anim.sud_slide_next_in, R.anim.sud_slide_next_out);
                 getIntent().putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, mToken);
                 startLookingForFingerprint();
+                */
             } else {
                 finish();
             }
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java
index 179de67..9a12290 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java
@@ -140,10 +140,7 @@
     private void postEnroll() {
         final FingerprintManager fpm = Utils.getFingerprintManagerOrNull(this);
         if (fpm != null) {
-            int result = fpm.postEnroll();
-            if (result < 0) {
-                Log.w(TAG, "postEnroll failed: result = " + result);
-            }
+            fpm.revokeChallenge();
         }
     }
 
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
index d3618db..78bb978 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
@@ -131,12 +131,13 @@
     }
 
     @Override
-    protected long getChallenge() {
+    protected void getChallenge(GenerateChallengeCallback callback) {
         mFingerprintManager = Utils.getFingerprintManagerOrNull(this);
         if (mFingerprintManager == null) {
-            return 0;
+            callback.onChallengeGenerated(0, 0L);
+            return;
         }
-        return mFingerprintManager.preEnroll();
+        mFingerprintManager.generateChallenge(callback::onChallengeGenerated);
     }
 
     @Override
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java
index b72a802..cbd9d4d 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java
@@ -40,11 +40,7 @@
     @Override
     protected void startEnrollment() {
         super.startEnrollment();
-        if (mUserId != UserHandle.USER_NULL) {
-            mFingerprintManager.setActiveUser(mUserId);
-        }
-        mFingerprintManager.enroll(mToken, mEnrollmentCancel,
-                0 /* flags */, mUserId, mEnrollmentCallback);
+        mFingerprintManager.enroll(mToken, mEnrollmentCancel, mUserId, mEnrollmentCallback);
     }
 
     private FingerprintManager.EnrollmentCallback mEnrollmentCallback
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintRemoveSidecar.java b/src/com/android/settings/biometrics/fingerprint/FingerprintRemoveSidecar.java
index 19d0518..b356103 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintRemoveSidecar.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintRemoveSidecar.java
@@ -79,9 +79,6 @@
             Log.e(TAG, "Remove already in progress");
             return;
         }
-        if (userId != UserHandle.USER_NULL) {
-            mFingerprintManager.setActiveUser(userId);
-        }
         mFingerprintRemoving = fingerprint;
         mFingerprintManager.remove(fingerprint, userId, mRemoveCallback);;
     }
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
index 8b16aee..a653169 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
@@ -33,6 +33,8 @@
 import android.os.Handler;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.text.InputFilter;
+import android.text.Spanned;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
@@ -52,6 +54,7 @@
 import com.android.settings.SubSettings;
 import com.android.settings.Utils;
 import com.android.settings.biometrics.BiometricEnrollBase;
+import com.android.settings.biometrics.BiometricUtils;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 import com.android.settings.password.ChooseLockGeneric;
 import com.android.settings.password.ChooseLockSettingsHelper;
@@ -408,6 +411,8 @@
         private void updateAddPreference() {
             if (getActivity() == null) return; // Activity went away
 
+            final Preference addPreference = findPreference(KEY_FINGERPRINT_ADD);
+
             /* Disable preference if too many fingerprints added */
             final int max = getContext().getResources().getInteger(
                     com.android.internal.R.integer.config_fingerprintMaxTemplatesPerUser);
@@ -417,9 +422,8 @@
             final boolean removalInProgress = mRemovalSidecar.inProgress();
             CharSequence maxSummary = tooMany ?
                     getContext().getString(R.string.fingerprint_add_max, max) : "";
-            Preference addPreference = findPreference(KEY_FINGERPRINT_ADD);
             addPreference.setSummary(maxSummary);
-            addPreference.setEnabled(!tooMany && !removalInProgress);
+            addPreference.setEnabled(!tooMany && !removalInProgress && mToken != null);
         }
 
         private void createFooterPreference(PreferenceGroup root) {
@@ -563,15 +567,23 @@
         @Override
         public void onActivityResult(int requestCode, int resultCode, Intent data) {
             super.onActivityResult(requestCode, resultCode, data);
-            if (requestCode == CHOOSE_LOCK_GENERIC_REQUEST
-                    || requestCode == CONFIRM_REQUEST) {
+            if (requestCode == CONFIRM_REQUEST || requestCode == CHOOSE_LOCK_GENERIC_REQUEST) {
                 mLaunchedConfirm = false;
                 if (resultCode == RESULT_FINISHED || resultCode == RESULT_OK) {
-                    // The lock pin/pattern/password was set. Start enrolling!
-                    if (data != null) {
-                        mToken = data.getByteArrayExtra(
-                                ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
+                    if (data != null && BiometricUtils.containsGatekeeperPassword(data)) {
+                        mFingerprintManager.generateChallenge((sensorId, challenge) -> {
+                            mToken = BiometricUtils.requestGatekeeperHat(getActivity(), data,
+                                    mUserId, challenge);
+                            BiometricUtils.removeGatekeeperPasswordHandle(getActivity(), data);
+                            updateAddPreference();
+                        });
+                    } else {
+                        Log.d(TAG, "Data null or GK PW missing");
+                        finish();
                     }
+                } else {
+                    Log.d(TAG, "Password not confirmed");
+                    finish();
                 }
             } else if (requestCode == ADD_FINGERPRINT_REQUEST) {
                 mEnrollClicked = false;
@@ -581,21 +593,13 @@
                     activity.finish();
                 }
             }
-
-            if (mToken == null) {
-                // Didn't get an authentication, finishing
-                getActivity().finish();
-            }
         }
 
         @Override
         public void onDestroy() {
             super.onDestroy();
             if (getActivity().isFinishing()) {
-                int result = mFingerprintManager.postEnroll();
-                if (result < 0) {
-                    Log.w(TAG, "postEnroll failed: result = " + result);
-                }
+                mFingerprintManager.revokeChallenge();
             }
         }
 
@@ -635,20 +639,27 @@
         }
 
         private void launchChooseOrConfirmLock() {
-            Intent intent = new Intent();
-            long challenge = mFingerprintManager.preEnroll();
-            ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(getActivity(), this);
-            if (!helper.launchConfirmationActivity(CONFIRM_REQUEST,
-                    getString(R.string.security_settings_fingerprint_preference_title),
-                    null, null, challenge, mUserId, true /* foregroundOnly */)) {
+            final Intent intent = new Intent();
+            final ChooseLockSettingsHelper.Builder builder =
+                    new ChooseLockSettingsHelper.Builder(getActivity(), this);
+            final boolean launched = builder.setRequestCode(CONFIRM_REQUEST)
+                    .setTitle(getString(R.string.security_settings_fingerprint_preference_title))
+                    .setRequestGatekeeperPasswordHandle(true)
+                    .setUserId(mUserId)
+                    .setForegroundOnly(true)
+                    .setReturnCredentials(true)
+                    .show();
+
+            if (!launched) {
+                // TODO: This should be cleaned up. ChooseLockGeneric should provide a way of
+                //  specifying arguments/requests, instead of relying on callers setting extras.
                 intent.setClassName(SETTINGS_PACKAGE_NAME, ChooseLockGeneric.class.getName());
                 intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY,
                         DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);
                 intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.HIDE_DISABLED_PREFS,
                         true);
-                intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, true);
                 intent.putExtra(Intent.EXTRA_USER_ID, mUserId);
-                intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, challenge);
+                intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE, true);
                 intent.putExtra(Intent.EXTRA_USER_ID, mUserId);
                 startActivityForResult(intent, CHOOSE_LOCK_GENERIC_REQUEST);
             }
@@ -732,6 +743,25 @@
             }
         }
 
+        private static InputFilter[] getFilters() {
+            InputFilter filter = new InputFilter() {
+                @Override
+                public CharSequence filter(CharSequence source, int start, int end,
+                        Spanned dest, int dstart, int dend) {
+                    for (int index = start; index < end; index++) {
+                        final char c = source.charAt(index);
+                        // KXMLSerializer does not allow these characters,
+                        // see KXmlSerializer.java:162.
+                        if (c < 0x20) {
+                            return "";
+                        }
+                    }
+                    return null;
+                }
+            };
+            return new InputFilter[]{filter};
+        }
+
         public static class RenameDialog extends InstrumentedDialogFragment {
 
             private Fingerprint mFp;
@@ -788,6 +818,7 @@
                         mDialogTextField = mAlertDialog.findViewById(R.id.fingerprint_rename_field);
                         CharSequence name = fingerName == null ? mFp.getName() : fingerName;
                         mDialogTextField.setText(name);
+                        mDialogTextField.setFilters(getFilters());
                         if (textSelectionStart != -1 && textSelectionEnd != -1) {
                             mDialogTextField.setSelection(textSelectionStart, textSelectionEnd);
                         } else {
diff --git a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
index 86b72ec..2e4654c 100644
--- a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
+++ b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
@@ -96,7 +96,6 @@
         }
 
         mCachedDevice = cachedDevice;
-        mCachedDevice.registerCallback(this);
         mCurrentTime = System.currentTimeMillis();
         mType = type;
 
@@ -127,13 +126,24 @@
     @Override
     protected void onPrepareForRemoval() {
         super.onPrepareForRemoval();
-        mCachedDevice.unregisterCallback(this);
         if (mDisconnectDialog != null) {
             mDisconnectDialog.dismiss();
             mDisconnectDialog = null;
         }
     }
 
+    @Override
+    public void onAttached() {
+        super.onAttached();
+        mCachedDevice.registerCallback(this);
+    }
+
+    @Override
+    public void onDetached() {
+        super.onDetached();
+        mCachedDevice.unregisterCallback(this);
+    }
+
     public CachedBluetoothDevice getBluetoothDevice() {
         return mCachedDevice;
     }
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingController.java b/src/com/android/settings/bluetooth/BluetoothPairingController.java
index a1d86be..ca3dda6 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingController.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingController.java
@@ -60,6 +60,7 @@
     private String mUserInput;
     private String mPasskeyFormatted;
     private int mPasskey;
+    private int mInitiator;
     private String mDeviceName;
     private LocalBluetoothProfile mPbapClientProfile;
     private boolean mPbapAllowed;
@@ -84,6 +85,8 @@
 
         mType = intent.getIntExtra(BluetoothDevice.EXTRA_PAIRING_VARIANT, BluetoothDevice.ERROR);
         mPasskey = intent.getIntExtra(BluetoothDevice.EXTRA_PAIRING_KEY, BluetoothDevice.ERROR);
+        mInitiator =
+                intent.getIntExtra(BluetoothDevice.EXTRA_PAIRING_INITIATOR, BluetoothDevice.ERROR);
         mDeviceName = mBluetoothManager.getCachedDeviceManager().getName(mDevice);
         mPbapClientProfile = mBluetoothManager.getProfileManager().getPbapClientProfile();
         mPasskeyFormatted = formatKey(mPasskey);
@@ -177,7 +180,7 @@
             default:
                 if (mDevice.getBluetoothClass().getDeviceClass()
                         == BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE) {
-                    return true;
+                    return BluetoothDevice.EXTRA_PAIRING_INITIATOR_FOREGROUND == mInitiator;
                 }
                 return false;
         }
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingRequest.java b/src/com/android/settings/bluetooth/BluetoothPairingRequest.java
index 7da6342..0e4ed74 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingRequest.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingRequest.java
@@ -34,12 +34,9 @@
   @Override
   public void onReceive(Context context, Intent intent) {
     String action = intent.getAction();
-    if (!action.equals(BluetoothDevice.ACTION_PAIRING_REQUEST)) {
+    if (action == null || !action.equals(BluetoothDevice.ACTION_PAIRING_REQUEST)) {
       return;
     }
-    // convert broadcast intent into activity intent (same action string)
-    Intent pairingIntent = BluetoothPairingService.getPairingDialogIntent(context, intent);
-
     PowerManager powerManager =
         (PowerManager)context.getSystemService(Context.POWER_SERVICE);
     BluetoothDevice device =
@@ -51,6 +48,10 @@
     if (powerManager.isInteractive() && shouldShowDialog) {
       // Since the screen is on and the BT-related activity is in the foreground,
       // just open the dialog
+      // convert broadcast intent into activity intent (same action string)
+      Intent pairingIntent = BluetoothPairingService.getPairingDialogIntent(context, intent,
+              BluetoothDevice.EXTRA_PAIRING_INITIATOR_FOREGROUND);
+
       context.startActivityAsUser(pairingIntent, UserHandle.CURRENT);
     } else {
       // Put up a notification that leads to the dialog
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingService.java b/src/com/android/settings/bluetooth/BluetoothPairingService.java
index 53e93d9..10d5ca8 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingService.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingService.java
@@ -51,7 +51,7 @@
 
     private BluetoothDevice mDevice;
 
-    public static Intent getPairingDialogIntent(Context context, Intent intent) {
+    public static Intent getPairingDialogIntent(Context context, Intent intent, int initiator) {
         BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
         int type = intent.getIntExtra(BluetoothDevice.EXTRA_PAIRING_VARIANT,
                 BluetoothDevice.ERROR);
@@ -65,6 +65,7 @@
             int pairingKey = intent.getIntExtra(BluetoothDevice.EXTRA_PAIRING_KEY,
                     BluetoothDevice.ERROR);
             pairingIntent.putExtra(BluetoothDevice.EXTRA_PAIRING_KEY, pairingKey);
+            pairingIntent.putExtra(BluetoothDevice.EXTRA_PAIRING_INITIATOR, initiator);
         }
         pairingIntent.setAction(BluetoothDevice.ACTION_PAIRING_REQUEST);
         pairingIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -124,7 +125,8 @@
                 .setLocalOnly(true);
 
         PendingIntent pairIntent = PendingIntent.getActivity(this, 0,
-                getPairingDialogIntent(this, intent),
+                getPairingDialogIntent(this, intent,
+                        BluetoothDevice.EXTRA_PAIRING_INITIATOR_BACKGROUND),
                 PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_UPDATE_CURRENT);
 
         PendingIntent dismissIntent = PendingIntent.getBroadcast(this, 0,
diff --git a/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java
index 466d60e..dab4f23 100644
--- a/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java
+++ b/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java
@@ -24,6 +24,7 @@
 import androidx.preference.Preference;
 
 import com.android.settings.connecteddevice.DevicePreferenceCallback;
+import com.android.settings.connecteddevice.PreviouslyConnectedDeviceDashboardFragment;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
 import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;
@@ -42,13 +43,15 @@
 
     private static final String PREF_KEY = "saved_bt";
 
+    private final boolean mDisplayConnected;
+
     @VisibleForTesting
     BluetoothAdapter mBluetoothAdapter;
 
     public SavedBluetoothDeviceUpdater(Context context, DashboardFragment fragment,
             DevicePreferenceCallback devicePreferenceCallback) {
         super(context, fragment, devicePreferenceCallback);
-
+        mDisplayConnected = (fragment instanceof PreviouslyConnectedDeviceDashboardFragment);
         mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
     }
 
@@ -101,7 +104,8 @@
                     ", is connected : " + device.isConnected() + ", is profile connected : "
                     + cachedDevice.isConnected());
         }
-        return device.getBondState() == BluetoothDevice.BOND_BONDED && !device.isConnected();
+        return device.getBondState() == BluetoothDevice.BOND_BONDED
+                && (mDisplayConnected || !device.isConnected());
     }
 
     @Override
@@ -109,6 +113,9 @@
         mMetricsFeatureProvider.logClickedPreference(preference, mFragment.getMetricsCategory());
         final CachedBluetoothDevice device = ((BluetoothDevicePreference) preference)
                 .getBluetoothDevice();
+        if (device.isConnected()) {
+            return device.setActive();
+        }
         device.connect();
         return true;
     }
diff --git a/src/com/android/settings/bugreporthandler/BugReportHandlerUtil.java b/src/com/android/settings/bugreporthandler/BugReportHandlerUtil.java
index f4acc7d..266a449 100644
--- a/src/com/android/settings/bugreporthandler/BugReportHandlerUtil.java
+++ b/src/com/android/settings/bugreporthandler/BugReportHandlerUtil.java
@@ -76,14 +76,14 @@
         int handlerUser = getCustomBugReportHandlerUser(context);
 
         boolean needToResetOutdatedSettings = false;
-        if (!isBugreportWhitelistedApp(handlerApp)) {
+        if (!isBugreportAllowlistedApp(handlerApp)) {
             handlerApp = getDefaultBugReportHandlerApp(context);
             handlerUser = UserHandle.USER_SYSTEM;
         } else if (getBugReportHandlerAppReceivers(context, handlerApp, handlerUser).isEmpty()) {
             // It looks like the settings are outdated, need to reset outdated settings.
             //
             // i.e.
-            // If user chooses which profile and which bugreport-whitelisted app in that
+            // If user chooses which profile and which bugreport-allowlisted app in that
             // profile to handle a bugreport, then user remove the profile.
             // === RESULT ===
             // The chosen bugreport handler app is outdated because the profile is removed,
@@ -93,7 +93,7 @@
             needToResetOutdatedSettings = true;
         }
 
-        if (!isBugreportWhitelistedApp(handlerApp)
+        if (!isBugreportAllowlistedApp(handlerApp)
                 || getBugReportHandlerAppReceivers(context, handlerApp, handlerUser).isEmpty()) {
             // It looks like current handler app may be too old and doesn't support to handle a
             // bugreport, so change to let shell to handle a bugreport and need to reset
@@ -136,7 +136,7 @@
      */
     public boolean setCurrentBugReportHandlerAppAndUser(Context context, String handlerApp,
             int handlerUser) {
-        if (!isBugreportWhitelistedApp(handlerApp)) {
+        if (!isBugreportAllowlistedApp(handlerApp)) {
             return false;
         } else if (getBugReportHandlerAppReceivers(context, handlerApp, handlerUser).isEmpty()) {
             return false;
@@ -155,17 +155,17 @@
     public List<Pair<ApplicationInfo, Integer>> getValidBugReportHandlerInfos(Context context) {
         final List<Pair<ApplicationInfo, Integer>> validBugReportHandlerApplicationInfos =
                 new ArrayList<>();
-        List<String> bugreportWhitelistedPackages;
+        List<String> bugreportAllowlistedPackages;
         try {
-            bugreportWhitelistedPackages =
+            bugreportAllowlistedPackages =
                     ActivityManager.getService().getBugreportWhitelistedPackages();
         } catch (RemoteException e) {
-            Log.e(TAG, "Failed to get bugreportWhitelistedPackages:", e);
+            Log.e(TAG, "Failed to get bugreportAllowlistedPackages:", e);
             return validBugReportHandlerApplicationInfos;
         }
 
         // Add "Shell with system user" as System default preference on top of screen
-        if (bugreportWhitelistedPackages.contains(SHELL_APP_PACKAGE)
+        if (bugreportAllowlistedPackages.contains(SHELL_APP_PACKAGE)
                 && !getBugReportHandlerAppReceivers(context, SHELL_APP_PACKAGE,
                 UserHandle.USER_SYSTEM).isEmpty()) {
             try {
@@ -181,7 +181,7 @@
         final UserManager userManager = context.getSystemService(UserManager.class);
         final List<UserInfo> profileList = userManager.getProfiles(UserHandle.getCallingUserId());
         // Only add non-Shell app as normal preference
-        final List<String> nonShellPackageList = bugreportWhitelistedPackages.stream()
+        final List<String> nonShellPackageList = bugreportAllowlistedPackages.stream()
                 .filter(pkg -> !SHELL_APP_PACKAGE.equals(pkg)).collect(Collectors.toList());
         Collections.sort(nonShellPackageList);
         for (String pkg : nonShellPackageList) {
@@ -202,15 +202,15 @@
         return validBugReportHandlerApplicationInfos;
     }
 
-    private boolean isBugreportWhitelistedApp(String app) {
-        // Verify the app is bugreport-whitelisted
+    private boolean isBugreportAllowlistedApp(String app) {
+        // Verify the app is bugreport-allowlisted
         if (TextUtils.isEmpty(app)) {
             return false;
         }
         try {
             return ActivityManager.getService().getBugreportWhitelistedPackages().contains(app);
         } catch (RemoteException e) {
-            Log.e(TAG, "Failed to get bugreportWhitelistedPackages:", e);
+            Log.e(TAG, "Failed to get bugreportAllowlistedPackages:", e);
             return false;
         }
     }
diff --git a/src/com/android/settings/connecteddevice/PreviouslyConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/PreviouslyConnectedDeviceDashboardFragment.java
index d3f5c28..05a17cc 100644
--- a/src/com/android/settings/connecteddevice/PreviouslyConnectedDeviceDashboardFragment.java
+++ b/src/com/android/settings/connecteddevice/PreviouslyConnectedDeviceDashboardFragment.java
@@ -16,7 +16,11 @@
 package com.android.settings.connecteddevice;
 
 import android.app.settings.SettingsEnums;
+import android.bluetooth.BluetoothAdapter;
 import android.content.Context;
+import android.os.Bundle;
+
+import androidx.annotation.VisibleForTesting;
 
 import com.android.settings.R;
 import com.android.settings.dashboard.DashboardFragment;
@@ -32,6 +36,9 @@
     private static final String TAG = "PreConnectedDeviceFrag";
     static final String KEY_PREVIOUSLY_CONNECTED_DEVICES = "saved_device_list";
 
+    @VisibleForTesting
+    BluetoothAdapter mBluetoothAdapter;
+
     @Override
     public int getHelpResource() {
         return R.string.help_url_previously_connected_devices;
@@ -53,11 +60,31 @@
     }
 
     @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+    }
+
+    @Override
     public void onAttach(Context context) {
         super.onAttach(context);
         use(SavedDeviceGroupController.class).init(this);
     }
 
+    @Override
+    public void onStart() {
+        super.onStart();
+        enableBluetoothIfNecessary();
+    }
+
+    @VisibleForTesting
+    void enableBluetoothIfNecessary() {
+        if (mBluetoothAdapter != null && !mBluetoothAdapter.isEnabled()) {
+            mBluetoothAdapter.enable();
+        }
+    }
+
     /**
      * For Search.
      */
diff --git a/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java b/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java
index 5b23d69..438a381 100644
--- a/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java
+++ b/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java
@@ -15,14 +15,22 @@
  */
 package com.android.settings.connecteddevice;
 
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothDevice;
+import android.content.BroadcastReceiver;
 import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.pm.PackageManager;
+import android.util.Log;
 
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceGroup;
 import androidx.preference.PreferenceScreen;
 
+import com.android.settings.R;
+import com.android.settings.bluetooth.BluetoothDevicePreference;
 import com.android.settings.bluetooth.BluetoothDeviceUpdater;
 import com.android.settings.bluetooth.SavedBluetoothDeviceUpdater;
 import com.android.settings.connecteddevice.dock.DockUpdater;
@@ -33,21 +41,47 @@
 import com.android.settingslib.core.lifecycle.events.OnStart;
 import com.android.settingslib.core.lifecycle.events.OnStop;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class PreviouslyConnectedDevicePreferenceController extends BasePreferenceController
         implements LifecycleObserver, OnStart, OnStop, DevicePreferenceCallback {
 
+    private static final String TAG = "PreviouslyDevicePreController";
+    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
+
     private static final int MAX_DEVICE_NUM = 3;
+    private static final int DOCK_DEVICE_INDEX = 9;
+    private static final String KEY_SEE_ALL = "previously_connected_devices_see_all";
+
+    private final List<Preference> mDevicesList = new ArrayList<>();
+    private final List<Preference> mDockDevicesList = new ArrayList<>();
 
     private PreferenceGroup mPreferenceGroup;
     private BluetoothDeviceUpdater mBluetoothDeviceUpdater;
     private DockUpdater mSavedDockUpdater;
-    private int mPreferenceSize;
+    private BluetoothAdapter mBluetoothAdapter;
+
+    @VisibleForTesting
+    Preference mSeeAllPreference;
+    @VisibleForTesting
+    IntentFilter mIntentFilter;
+
+    @VisibleForTesting
+    BroadcastReceiver mReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            updatePreferenceVisibility();
+        }
+    };
 
     public PreviouslyConnectedDevicePreferenceController(Context context, String preferenceKey) {
         super(context, preferenceKey);
 
         mSavedDockUpdater = FeatureFactory.getFactory(
                 context).getDockUpdaterFeatureProvider().getSavedDockUpdater(context, this);
+        mIntentFilter = new IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED);
+        mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
     }
 
     @Override
@@ -62,7 +96,8 @@
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
         mPreferenceGroup = screen.findPreference(getPreferenceKey());
-        mPreferenceGroup.setVisible(false);
+        mSeeAllPreference = mPreferenceGroup.findPreference(KEY_SEE_ALL);
+        updatePreferenceVisibility();
 
         if (isAvailable()) {
             final Context context = screen.getContext();
@@ -75,12 +110,14 @@
     public void onStart() {
         mBluetoothDeviceUpdater.registerCallback();
         mSavedDockUpdater.registerCallback();
+        mContext.registerReceiver(mReceiver, mIntentFilter);
     }
 
     @Override
     public void onStop() {
         mBluetoothDeviceUpdater.unregisterCallback();
         mSavedDockUpdater.unregisterCallback();
+        mContext.unregisterReceiver(mReceiver);
     }
 
     public void init(DashboardFragment fragment) {
@@ -90,18 +127,77 @@
 
     @Override
     public void onDeviceAdded(Preference preference) {
-        mPreferenceSize++;
-        if (mPreferenceSize <= MAX_DEVICE_NUM) {
-            mPreferenceGroup.addPreference(preference);
+        final List<BluetoothDevice> bluetoothDevices =
+                mBluetoothAdapter.getMostRecentlyConnectedDevices();
+        final int index = preference instanceof BluetoothDevicePreference
+                ? bluetoothDevices.indexOf(((BluetoothDevicePreference) preference)
+                .getBluetoothDevice().getDevice()) : DOCK_DEVICE_INDEX;
+        if (DEBUG) {
+            Log.d(TAG, "onDeviceAdded() " + preference.getTitle() + ", index of : " + index);
+            for (BluetoothDevice device : bluetoothDevices) {
+                Log.d(TAG, "onDeviceAdded() most recently device : " + device.getName());
+            }
         }
-        updatePreferenceVisiblity();
+        addPreference(index, preference);
+        updatePreferenceVisibility();
+    }
+
+    private void addPreference(int index, Preference preference) {
+        if (preference instanceof BluetoothDevicePreference) {
+            if (mDevicesList.size() >= index) {
+                mDevicesList.add(index, preference);
+            } else {
+                mDevicesList.add(preference);
+            }
+        } else {
+            mDockDevicesList.add(preference);
+        }
+        addPreference();
+    }
+
+    private void addPreference() {
+        mPreferenceGroup.removeAll();
+        mPreferenceGroup.addPreference(mSeeAllPreference);
+        final int size = getDeviceListSize();
+        for (int i = 0; i < size; i++) {
+            if (DEBUG) {
+                Log.d(TAG, "addPreference() add device : " + mDevicesList.get(i).getTitle());
+            }
+            mDevicesList.get(i).setOrder(i);
+            mPreferenceGroup.addPreference(mDevicesList.get(i));
+        }
+        if (mDockDevicesList.size() > 0) {
+            for (int i = 0; i < getDockDeviceListSize(MAX_DEVICE_NUM - size); i++) {
+                if (DEBUG) {
+                    Log.d(TAG, "addPreference() add dock device : "
+                            + mDockDevicesList.get(i).getTitle());
+                }
+                mDockDevicesList.get(i).setOrder(DOCK_DEVICE_INDEX);
+                mPreferenceGroup.addPreference(mDockDevicesList.get(i));
+            }
+        }
+    }
+
+    private int getDeviceListSize() {
+        return mDevicesList.size() >= MAX_DEVICE_NUM
+                ? MAX_DEVICE_NUM : mDevicesList.size();
+    }
+
+    private int getDockDeviceListSize(int availableSize) {
+        return mDockDevicesList.size() >= availableSize
+                ? availableSize : mDockDevicesList.size();
     }
 
     @Override
     public void onDeviceRemoved(Preference preference) {
-        mPreferenceSize--;
-        mPreferenceGroup.removePreference(preference);
-        updatePreferenceVisiblity();
+        if (preference instanceof BluetoothDevicePreference) {
+            mDevicesList.remove(preference);
+        } else {
+            mDockDevicesList.remove(preference);
+        }
+
+        addPreference();
+        updatePreferenceVisibility();
     }
 
     @VisibleForTesting
@@ -120,7 +216,12 @@
     }
 
     @VisibleForTesting
-    void updatePreferenceVisiblity() {
-        mPreferenceGroup.setVisible(mPreferenceSize > 0);
+    void updatePreferenceVisibility() {
+        if (mBluetoothAdapter != null && mBluetoothAdapter.isEnabled()) {
+            mSeeAllPreference.setSummary("");
+        } else {
+            mSeeAllPreference.setSummary(
+                    mContext.getString(R.string.connected_device_see_all_summary));
+        }
     }
 }
diff --git a/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java b/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java
index 1078a21..6a13a96 100644
--- a/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java
+++ b/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java
@@ -97,7 +97,7 @@
             // New version - uses a separate screen.
             new SubSettingLauncher(mFragment.getContext())
                     .setDestination(UsbDetailsFragment.class.getName())
-                    .setTitleRes(R.string.device_details_title)
+                    .setTitleRes(R.string.usb_preference)
                     .setSourceMetricsCategory(mFragment.getMetricsCategory())
                     .launch();
             return true;
diff --git a/src/com/android/settings/core/FeatureFlags.java b/src/com/android/settings/core/FeatureFlags.java
index d2ad30d..49cc53d 100644
--- a/src/com/android/settings/core/FeatureFlags.java
+++ b/src/com/android/settings/core/FeatureFlags.java
@@ -23,10 +23,10 @@
     public static final String AUDIO_SWITCHER_SETTINGS = "settings_audio_switcher";
     public static final String DYNAMIC_SYSTEM = "settings_dynamic_system";
     public static final String HEARING_AID_SETTINGS = "settings_bluetooth_hearing_aid";
-    public static final String SETTINGS_FUSE_FLAG = "settings_fuse";
     public static final String WIFI_DETAILS_DATAUSAGE_HEADER =
             "settings_wifi_details_datausage_header";
     public static final String CONTROLLER_ENHANCEMENT = "settings_controller_loading_enhancement";
     public static final String CONDITIONAL_CARDS = "settings_conditionals";
     public static final String TETHER_ALL_IN_ONE = "settings_tether_all_in_one";
+    public static final String SILKY_HOME = "settings_silky_home";
 }
diff --git a/src/com/android/settings/core/SettingsBaseActivity.java b/src/com/android/settings/core/SettingsBaseActivity.java
index 57697a6..68fa1d3 100644
--- a/src/com/android/settings/core/SettingsBaseActivity.java
+++ b/src/com/android/settings/core/SettingsBaseActivity.java
@@ -55,7 +55,7 @@
 
     // Serves as a temporary list of tiles to ignore until we heard back from the PM that they
     // are disabled.
-    private static ArraySet<ComponentName> sTileBlacklist = new ArraySet<>();
+    private static ArraySet<ComponentName> sTileDenylist = new ArraySet<>();
 
     private final PackageReceiver mPackageReceiver = new PackageReceiver();
     private final List<CategoryListener> mCategoryListeners = new ArrayList<>();
@@ -177,9 +177,9 @@
         boolean isEnabled = state == PackageManager.COMPONENT_ENABLED_STATE_ENABLED;
         if (isEnabled != enabled || state == PackageManager.COMPONENT_ENABLED_STATE_DEFAULT) {
             if (enabled) {
-                sTileBlacklist.remove(component);
+                sTileDenylist.remove(component);
             } else {
-                sTileBlacklist.add(component);
+                sTileDenylist.add(component);
             }
             pm.setComponentEnabledSetting(component, enabled
                             ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED
@@ -217,7 +217,7 @@
 
         @Override
         protected void onPostExecute(Void result) {
-            mCategoryManager.updateCategoryFromBlacklist(sTileBlacklist);
+            mCategoryManager.updateCategoryFromDenylist(sTileDenylist);
             onCategoriesChanged();
         }
     }
diff --git a/src/com/android/settings/core/TogglePreferenceController.java b/src/com/android/settings/core/TogglePreferenceController.java
index 5a2a8b7..c958a93 100644
--- a/src/com/android/settings/core/TogglePreferenceController.java
+++ b/src/com/android/settings/core/TogglePreferenceController.java
@@ -20,7 +20,7 @@
 
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.slices.SliceData;
-import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settings.widget.PrimarySwitchPreference;
 import com.android.settings.widget.TwoStateButtonPreference;
 
 /**
@@ -54,8 +54,8 @@
     public void updateState(Preference preference) {
         if (preference instanceof TwoStatePreference) {
             ((TwoStatePreference) preference).setChecked(isChecked());
-        } else if (preference instanceof MasterSwitchPreference) {
-            ((MasterSwitchPreference) preference).setChecked(isChecked());
+        } else if (preference instanceof PrimarySwitchPreference) {
+            ((PrimarySwitchPreference) preference).setChecked(isChecked());
         } else if (preference instanceof TwoStateButtonPreference) {
             ((TwoStateButtonPreference) preference).setChecked(isChecked());
         } else {
@@ -66,7 +66,7 @@
     @Override
     public final boolean onPreferenceChange(Preference preference, Object newValue) {
         // TwoStatePreference is a regular preference and can be handled by DashboardFragment
-        if (preference instanceof MasterSwitchPreference
+        if (preference instanceof PrimarySwitchPreference
                 || preference instanceof TwoStateButtonPreference) {
             FeatureFactory.getFactory(mContext).getMetricsFeatureProvider()
                     .logClickedPreference(preference, getMetricsCategory());
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index ad4da08..6c6bc90 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -19,7 +19,7 @@
 import com.android.settings.AllInOneTetherSettings;
 import com.android.settings.DisplaySettings;
 import com.android.settings.IccLockSettings;
-import com.android.settings.MasterClear;
+import com.android.settings.MainClear;
 import com.android.settings.Settings;
 import com.android.settings.TestingSettings;
 import com.android.settings.TetherSettings;
@@ -152,11 +152,9 @@
 import com.android.settings.wifi.WifiAPITest;
 import com.android.settings.wifi.WifiInfo;
 import com.android.settings.wifi.WifiSettings;
-import com.android.settings.wifi.WifiSettings2;
 import com.android.settings.wifi.calling.WifiCallingDisclaimerFragment;
 import com.android.settings.wifi.calling.WifiCallingSettings;
 import com.android.settings.wifi.p2p.WifiP2pSettings;
-import com.android.settings.wifi.savedaccesspoints.SavedAccessPointsWifiSettings;
 import com.android.settings.wifi.savedaccesspoints2.SavedAccessPointsWifiSettings2;
 import com.android.settings.wifi.tether.WifiTetherSettings;
 
@@ -170,9 +168,7 @@
             AdvancedConnectedDeviceDashboardFragment.class.getName(),
             CreateShortcut.class.getName(),
             WifiSettings.class.getName(),
-            WifiSettings2.class.getName(),
             ConfigureWifiSettings.class.getName(),
-            SavedAccessPointsWifiSettings.class.getName(),
             SavedAccessPointsWifiSettings2.class.getName(),
             AllInOneTetherSettings.class.getName(),
             TetherSettings.class.getName(),
@@ -277,7 +273,7 @@
             TestingSettings.class.getName(),
             WifiAPITest.class.getName(),
             WifiInfo.class.getName(),
-            MasterClear.class.getName(),
+            MainClear.class.getName(),
             ResetDashboardFragment.class.getName(),
             NightDisplaySettings.class.getName(),
             ManageDomainUrls.class.getName(),
@@ -327,7 +323,6 @@
             SupportDashboardActivity.class.getName(),
             // Home page > Network & Internet
             Settings.WifiSettingsActivity.class.getName(),
-            Settings.WifiSettings2Activity.class.getName(),
             Settings.DataUsageSummaryActivity.class.getName(),
             // Home page > Connected devices
             Settings.BluetoothSettingsActivity.class.getName(),
diff --git a/src/com/android/settings/dashboard/CategoryManager.java b/src/com/android/settings/dashboard/CategoryManager.java
index 525b6f8..51c485a 100644
--- a/src/com/android/settings/dashboard/CategoryManager.java
+++ b/src/com/android/settings/dashboard/CategoryManager.java
@@ -85,15 +85,19 @@
         tryInitCategories(context, forceClearCache);
     }
 
-    public synchronized void updateCategoryFromBlacklist(Set<ComponentName> tileBlacklist) {
+    /**
+     * Update category from deny list
+     * @param tileDenylist
+     */
+    public synchronized void updateCategoryFromDenylist(Set<ComponentName> tileDenylist) {
         if (mCategories == null) {
-            Log.w(TAG, "Category is null, skipping blacklist update");
+            Log.w(TAG, "Category is null, skipping denylist update");
         }
         for (int i = 0; i < mCategories.size(); i++) {
             DashboardCategory category = mCategories.get(i);
             for (int j = 0; j < category.getTilesCount(); j++) {
                 Tile tile = category.getTile(j);
-                if (tileBlacklist.contains(tile.getIntent().getComponent())) {
+                if (tileDenylist.contains(tile.getIntent().getComponent())) {
                     category.removeTile(j--);
                 }
             }
diff --git a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
index 7640079..40d26f7 100644
--- a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
+++ b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
@@ -60,7 +60,7 @@
 import com.android.settings.SettingsActivity;
 import com.android.settings.dashboard.profileselector.ProfileSelectDialog;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settings.widget.PrimarySwitchPreference;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 import com.android.settingslib.drawer.ActivityTile;
 import com.android.settingslib.drawer.DashboardCategory;
@@ -336,16 +336,16 @@
     }
 
     private void setSwitchChecked(Preference pref, boolean checked) {
-        if (pref instanceof MasterSwitchPreference) {
-            ((MasterSwitchPreference) pref).setChecked(checked);
+        if (pref instanceof PrimarySwitchPreference) {
+            ((PrimarySwitchPreference) pref).setChecked(checked);
         } else if (pref instanceof SwitchPreference) {
             ((SwitchPreference) pref).setChecked(checked);
         }
     }
 
     private void setSwitchEnabled(Preference pref, boolean enabled) {
-        if (pref instanceof MasterSwitchPreference) {
-            ((MasterSwitchPreference) pref).setSwitchEnabled(enabled);
+        if (pref instanceof PrimarySwitchPreference) {
+            ((PrimarySwitchPreference) pref).setSwitchEnabled(enabled);
         } else {
             pref.setEnabled(enabled);
         }
@@ -398,26 +398,41 @@
             return;
         }
         ProfileSelectDialog.updateUserHandlesIfNeeded(mContext, tile);
+        mMetricsFeatureProvider.logStartedIntent(intent, sourceMetricCategory);
 
         if (tile.userHandle == null || tile.isPrimaryProfileOnly()) {
-            mMetricsFeatureProvider.logStartedIntent(intent, sourceMetricCategory);
             activity.startActivityForResult(intent, 0);
         } else if (tile.userHandle.size() == 1) {
-            mMetricsFeatureProvider.logStartedIntent(intent, sourceMetricCategory);
             activity.startActivityForResultAsUser(intent, 0, tile.userHandle.get(0));
         } else {
-            mMetricsFeatureProvider.logStartedIntent(intent, sourceMetricCategory);
             final UserHandle userHandle = intent.getParcelableExtra(EXTRA_USER);
             if (userHandle != null && tile.userHandle.contains(userHandle)) {
                 activity.startActivityForResultAsUser(intent, 0, userHandle);
-            } else {
-                ProfileSelectDialog.show(activity.getSupportFragmentManager(), tile,
-                        sourceMetricCategory);
+                return;
             }
+
+            final List<UserHandle> resolvableUsers = getResolvableUsers(intent, tile);
+            if (resolvableUsers.size() == 1) {
+                activity.startActivityForResultAsUser(intent, 0, resolvableUsers.get(0));
+                return;
+            }
+
+            ProfileSelectDialog.show(activity.getSupportFragmentManager(), tile,
+                    sourceMetricCategory);
         }
     }
 
     private boolean isIntentResolvable(Intent intent) {
         return mPackageManager.resolveActivity(intent, 0) != null;
     }
+
+    private List<UserHandle> getResolvableUsers(Intent intent, Tile tile) {
+        final ArrayList<UserHandle> eligibleUsers = new ArrayList<>();
+        for (UserHandle user : tile.userHandle) {
+            if (mPackageManager.resolveActivityAsUser(intent, 0, user.getIdentifier()) != null) {
+                eligibleUsers.add(user);
+            }
+        }
+        return eligibleUsers;
+    }
 }
diff --git a/src/com/android/settings/dashboard/DashboardFragment.java b/src/com/android/settings/dashboard/DashboardFragment.java
index 8084038..a273d6c 100644
--- a/src/com/android/settings/dashboard/DashboardFragment.java
+++ b/src/com/android/settings/dashboard/DashboardFragment.java
@@ -40,7 +40,7 @@
 import com.android.settings.core.PreferenceControllerListHelper;
 import com.android.settings.core.SettingsBaseActivity;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settings.widget.PrimarySwitchPreference;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
@@ -530,7 +530,7 @@
         return tile instanceof ProviderTile
                 ? new SwitchPreference(getPrefContext())
                 : tile.hasSwitch()
-                        ? new MasterSwitchPreference(getPrefContext())
+                        ? new PrimarySwitchPreference(getPrefContext())
                         : new Preference(getPrefContext());
     }
 
diff --git a/src/com/android/settings/dashboard/profileselector/ProfileSelectFragment.java b/src/com/android/settings/dashboard/profileselector/ProfileSelectFragment.java
index 594e553..1e0a8dd 100644
--- a/src/com/android/settings/dashboard/profileselector/ProfileSelectFragment.java
+++ b/src/com/android/settings/dashboard/profileselector/ProfileSelectFragment.java
@@ -142,7 +142,7 @@
 
     @Override
     protected int getPreferenceScreenResId() {
-        return R.xml.dummy_preference_screen;
+        return R.xml.placeholder_preference_screen;
     }
 
     @Override
diff --git a/src/com/android/settings/dashboard/profileselector/ProfileSelectLocationFragment.java b/src/com/android/settings/dashboard/profileselector/ProfileSelectLocationFragment.java
index 0d7c4d0..a3f73fb 100644
--- a/src/com/android/settings/dashboard/profileselector/ProfileSelectLocationFragment.java
+++ b/src/com/android/settings/dashboard/profileselector/ProfileSelectLocationFragment.java
@@ -37,8 +37,8 @@
         super.onActivityCreated(savedInstanceState);
         final SettingsActivity activity = (SettingsActivity) getActivity();
         final SwitchBar switchBar = activity.getSwitchBar();
-        switchBar.setSwitchBarText(R.string.location_settings_master_switch_title,
-                R.string.location_settings_master_switch_title);
+        switchBar.setSwitchBarText(R.string.location_settings_primary_switch_title,
+                R.string.location_settings_primary_switch_title);
         final LocationSwitchBarController switchBarController = new LocationSwitchBarController(
                 activity, switchBar, getSettingsLifecycle());
         switchBar.show();
diff --git a/src/com/android/settings/datausage/AppDataUsage.java b/src/com/android/settings/datausage/AppDataUsage.java
index a86459e..460f390 100644
--- a/src/com/android/settings/datausage/AppDataUsage.java
+++ b/src/com/android/settings/datausage/AppDataUsage.java
@@ -235,11 +235,11 @@
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         if (preference == mRestrictBackground) {
-            mDataSaverBackend.setIsBlacklisted(mAppItem.key, mPackageName, !(Boolean) newValue);
+            mDataSaverBackend.setIsDenylisted(mAppItem.key, mPackageName, !(Boolean) newValue);
             updatePrefs();
             return true;
         } else if (preference == mUnrestrictedData) {
-            mDataSaverBackend.setIsWhitelisted(mAppItem.key, mPackageName, (Boolean) newValue);
+            mDataSaverBackend.setIsAllowlisted(mAppItem.key, mPackageName, (Boolean) newValue);
             return true;
         }
         return false;
@@ -330,7 +330,7 @@
 
     private boolean getUnrestrictData() {
         if (mDataSaverBackend != null) {
-            return mDataSaverBackend.isWhitelisted(mAppItem.key);
+            return mDataSaverBackend.isAllowlisted(mAppItem.key);
         }
         return false;
     }
@@ -464,16 +464,16 @@
     }
 
     @Override
-    public void onWhitelistStatusChanged(int uid, boolean isWhitelisted) {
+    public void onAllowlistStatusChanged(int uid, boolean isAllowlisted) {
         if (mAppItem.uids.get(uid, false)) {
-            updatePrefs(getAppRestrictBackground(), isWhitelisted);
+            updatePrefs(getAppRestrictBackground(), isAllowlisted);
         }
     }
 
     @Override
-    public void onBlacklistStatusChanged(int uid, boolean isBlacklisted) {
+    public void onDenylistStatusChanged(int uid, boolean isDenylisted) {
         if (mAppItem.uids.get(uid, false)) {
-            updatePrefs(isBlacklisted, getUnrestrictData());
+            updatePrefs(isDenylisted, getUnrestrictData());
         }
     }
 }
diff --git a/src/com/android/settings/datausage/AppStateDataUsageBridge.java b/src/com/android/settings/datausage/AppStateDataUsageBridge.java
index 0b535d0..b71953e 100644
--- a/src/com/android/settings/datausage/AppStateDataUsageBridge.java
+++ b/src/com/android/settings/datausage/AppStateDataUsageBridge.java
@@ -37,24 +37,24 @@
         final int N = apps.size();
         for (int i = 0; i < N; i++) {
             AppEntry app = apps.get(i);
-            app.extraInfo = new DataUsageState(mDataSaverBackend.isWhitelisted(app.info.uid),
-                    mDataSaverBackend.isBlacklisted(app.info.uid));
+            app.extraInfo = new DataUsageState(mDataSaverBackend.isAllowlisted(app.info.uid),
+                    mDataSaverBackend.isDenylisted(app.info.uid));
         }
     }
 
     @Override
     protected void updateExtraInfo(AppEntry app, String pkg, int uid) {
-        app.extraInfo = new DataUsageState(mDataSaverBackend.isWhitelisted(uid),
-                mDataSaverBackend.isBlacklisted(uid));
+        app.extraInfo = new DataUsageState(mDataSaverBackend.isAllowlisted(uid),
+                mDataSaverBackend.isDenylisted(uid));
     }
 
     public static class DataUsageState {
-        public boolean isDataSaverWhitelisted;
-        public boolean isDataSaverBlacklisted;
+        public boolean isDataSaverAllowlisted;
+        public boolean isDataSaverDenylisted;
 
-        public DataUsageState(boolean isDataSaverWhitelisted, boolean isDataSaverBlacklisted) {
-            this.isDataSaverWhitelisted = isDataSaverWhitelisted;
-            this.isDataSaverBlacklisted = isDataSaverBlacklisted;
+        public DataUsageState(boolean isDataSaverAllowlisted, boolean isDataSaverDenylisted) {
+            this.isDataSaverAllowlisted = isDataSaverAllowlisted;
+            this.isDataSaverDenylisted = isDataSaverDenylisted;
         }
     }
 }
diff --git a/src/com/android/settings/datausage/DataSaverBackend.java b/src/com/android/settings/datausage/DataSaverBackend.java
index 92b2ef9..b9931e0 100644
--- a/src/com/android/settings/datausage/DataSaverBackend.java
+++ b/src/com/android/settings/datausage/DataSaverBackend.java
@@ -42,8 +42,8 @@
     private final NetworkPolicyManager mPolicyManager;
     private final ArrayList<Listener> mListeners = new ArrayList<>();
     private SparseIntArray mUidPolicies = new SparseIntArray();
-    private boolean mWhitelistInitialized;
-    private boolean mBlacklistInitialized;
+    private boolean mAllowlistInitialized;
+    private boolean mDenylistInitialized;
 
     // TODO: Staticize into only one.
     public DataSaverBackend(Context context) {
@@ -77,63 +77,63 @@
                 mContext, SettingsEnums.ACTION_DATA_SAVER_MODE, enabled ? 1 : 0);
     }
 
-    public void refreshWhitelist() {
-        loadWhitelist();
+    public void refreshAllowlist() {
+        loadAllowlist();
     }
 
-    public void setIsWhitelisted(int uid, String packageName, boolean whitelisted) {
-        final int policy = whitelisted ? POLICY_ALLOW_METERED_BACKGROUND : POLICY_NONE;
+    public void setIsAllowlisted(int uid, String packageName, boolean allowlisted) {
+        final int policy = allowlisted ? POLICY_ALLOW_METERED_BACKGROUND : POLICY_NONE;
         mPolicyManager.setUidPolicy(uid, policy);
         mUidPolicies.put(uid, policy);
-        if (whitelisted) {
+        if (allowlisted) {
             mMetricsFeatureProvider.action(
                     mContext, SettingsEnums.ACTION_DATA_SAVER_WHITELIST, packageName);
         }
     }
 
-    public boolean isWhitelisted(int uid) {
-        loadWhitelist();
+    public boolean isAllowlisted(int uid) {
+        loadAllowlist();
         return mUidPolicies.get(uid, POLICY_NONE) == POLICY_ALLOW_METERED_BACKGROUND;
     }
 
-    private void loadWhitelist() {
-        if (mWhitelistInitialized) {
+    private void loadAllowlist() {
+        if (mAllowlistInitialized) {
             return;
         }
 
         for (int uid : mPolicyManager.getUidsWithPolicy(POLICY_ALLOW_METERED_BACKGROUND)) {
             mUidPolicies.put(uid, POLICY_ALLOW_METERED_BACKGROUND);
         }
-        mWhitelistInitialized = true;
+        mAllowlistInitialized = true;
     }
 
-    public void refreshBlacklist() {
-        loadBlacklist();
+    public void refreshDenylist() {
+        loadDenylist();
     }
 
-    public void setIsBlacklisted(int uid, String packageName, boolean blacklisted) {
-        final int policy = blacklisted ? POLICY_REJECT_METERED_BACKGROUND : POLICY_NONE;
+    public void setIsDenylisted(int uid, String packageName, boolean denylisted) {
+        final int policy = denylisted ? POLICY_REJECT_METERED_BACKGROUND : POLICY_NONE;
         mPolicyManager.setUidPolicy(uid, policy);
         mUidPolicies.put(uid, policy);
-        if (blacklisted) {
+        if (denylisted) {
             mMetricsFeatureProvider.action(
                     mContext, SettingsEnums.ACTION_DATA_SAVER_BLACKLIST, packageName);
         }
     }
 
-    public boolean isBlacklisted(int uid) {
-        loadBlacklist();
+    public boolean isDenylisted(int uid) {
+        loadDenylist();
         return mUidPolicies.get(uid, POLICY_NONE) == POLICY_REJECT_METERED_BACKGROUND;
     }
 
-    private void loadBlacklist() {
-        if (mBlacklistInitialized) {
+    private void loadDenylist() {
+        if (mDenylistInitialized) {
             return;
         }
         for (int uid : mPolicyManager.getUidsWithPolicy(POLICY_REJECT_METERED_BACKGROUND)) {
             mUidPolicies.put(uid, POLICY_REJECT_METERED_BACKGROUND);
         }
-        mBlacklistInitialized = true;
+        mDenylistInitialized = true;
     }
 
     private void handleRestrictBackgroundChanged(boolean isDataSaving) {
@@ -142,21 +142,21 @@
         }
     }
 
-    private void handleWhitelistChanged(int uid, boolean isWhitelisted) {
+    private void handleAllowlistChanged(int uid, boolean isAllowlisted) {
         for (int i = 0; i < mListeners.size(); i++) {
-            mListeners.get(i).onWhitelistStatusChanged(uid, isWhitelisted);
+            mListeners.get(i).onAllowlistStatusChanged(uid, isAllowlisted);
         }
     }
 
-    private void handleBlacklistChanged(int uid, boolean isBlacklisted) {
+    private void handleDenylistChanged(int uid, boolean isDenylisted) {
         for (int i = 0; i < mListeners.size(); i++) {
-            mListeners.get(i).onBlacklistStatusChanged(uid, isBlacklisted);
+            mListeners.get(i).onDenylistStatusChanged(uid, isDenylisted);
         }
     }
 
     private void handleUidPoliciesChanged(int uid, int newPolicy) {
-        loadWhitelist();
-        loadBlacklist();
+        loadAllowlist();
+        loadDenylist();
 
         final int oldPolicy = mUidPolicies.get(uid, POLICY_NONE);
         if (newPolicy == POLICY_NONE) {
@@ -165,17 +165,17 @@
             mUidPolicies.put(uid, newPolicy);
         }
 
-        final boolean wasWhitelisted = oldPolicy == POLICY_ALLOW_METERED_BACKGROUND;
-        final boolean wasBlacklisted = oldPolicy == POLICY_REJECT_METERED_BACKGROUND;
-        final boolean isWhitelisted = newPolicy == POLICY_ALLOW_METERED_BACKGROUND;
-        final boolean isBlacklisted = newPolicy == POLICY_REJECT_METERED_BACKGROUND;
+        final boolean wasAllowlisted = oldPolicy == POLICY_ALLOW_METERED_BACKGROUND;
+        final boolean wasDenylisted = oldPolicy == POLICY_REJECT_METERED_BACKGROUND;
+        final boolean isAllowlisted = newPolicy == POLICY_ALLOW_METERED_BACKGROUND;
+        final boolean isDenylisted = newPolicy == POLICY_REJECT_METERED_BACKGROUND;
 
-        if (wasWhitelisted != isWhitelisted) {
-            handleWhitelistChanged(uid, isWhitelisted);
+        if (wasAllowlisted != isAllowlisted) {
+            handleAllowlistChanged(uid, isAllowlisted);
         }
 
-        if (wasBlacklisted != isBlacklisted) {
-            handleBlacklistChanged(uid, isBlacklisted);
+        if (wasDenylisted != isDenylisted) {
+            handleDenylistChanged(uid, isDenylisted);
         }
 
     }
@@ -211,8 +211,8 @@
     public interface Listener {
         void onDataSaverChanged(boolean isDataSaving);
 
-        void onWhitelistStatusChanged(int uid, boolean isWhitelisted);
+        void onAllowlistStatusChanged(int uid, boolean isAllowlisted);
 
-        void onBlacklistStatusChanged(int uid, boolean isBlacklisted);
+        void onDenylistStatusChanged(int uid, boolean isDenylisted);
     }
 }
diff --git a/src/com/android/settings/datausage/DataSaverPreference.java b/src/com/android/settings/datausage/DataSaverPreference.java
index 79e4c13..305d061 100644
--- a/src/com/android/settings/datausage/DataSaverPreference.java
+++ b/src/com/android/settings/datausage/DataSaverPreference.java
@@ -48,10 +48,10 @@
     }
 
     @Override
-    public void onWhitelistStatusChanged(int uid, boolean isWhitelisted) {
+    public void onAllowlistStatusChanged(int uid, boolean isAllowlisted) {
     }
 
     @Override
-    public void onBlacklistStatusChanged(int uid, boolean isBlacklisted) {
+    public void onDenylistStatusChanged(int uid, boolean isDenylisted) {
     }
 }
diff --git a/src/com/android/settings/datausage/DataSaverSummary.java b/src/com/android/settings/datausage/DataSaverSummary.java
index 0e32bfd..7017fe1 100644
--- a/src/com/android/settings/datausage/DataSaverSummary.java
+++ b/src/com/android/settings/datausage/DataSaverSummary.java
@@ -82,8 +82,8 @@
     @Override
     public void onResume() {
         super.onResume();
-        mDataSaverBackend.refreshWhitelist();
-        mDataSaverBackend.refreshBlacklist();
+        mDataSaverBackend.refreshAllowlist();
+        mDataSaverBackend.refreshDenylist();
         mDataSaverBackend.addListener(this);
         mDataUsageBridge.resume();
     }
@@ -125,11 +125,11 @@
     }
 
     @Override
-    public void onWhitelistStatusChanged(int uid, boolean isWhitelisted) {
+    public void onAllowlistStatusChanged(int uid, boolean isAllowlisted) {
     }
 
     @Override
-    public void onBlacklistStatusChanged(int uid, boolean isBlacklisted) {
+    public void onDenylistStatusChanged(int uid, boolean isDenylisted) {
     }
 
     @Override
@@ -146,7 +146,7 @@
                 continue;
             }
             if (entry.extraInfo != null && ((AppStateDataUsageBridge.DataUsageState)
-                    entry.extraInfo).isDataSaverWhitelisted) {
+                    entry.extraInfo).isDataSaverAllowlisted) {
                 count++;
             }
         }
diff --git a/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java b/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java
index 97cf599..57584e7 100644
--- a/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java
+++ b/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java
@@ -378,11 +378,11 @@
         // First plan in the list is the primary plan
         SubscriptionPlan plan = plans.get(0);
         return plan.getDataLimitBytes() > 0
-                && saneSize(plan.getDataUsageBytes())
+                && validSize(plan.getDataUsageBytes())
                 && plan.getCycleRule() != null ? plan : null;
     }
 
-    private static boolean saneSize(long value) {
+    private static boolean validSize(long value) {
         return value >= 0L && value < PETA;
     }
 
diff --git a/src/com/android/settings/datausage/UnrestrictedDataAccessPreference.java b/src/com/android/settings/datausage/UnrestrictedDataAccessPreference.java
index 97ed5ac..ebd8894 100644
--- a/src/com/android/settings/datausage/UnrestrictedDataAccessPreference.java
+++ b/src/com/android/settings/datausage/UnrestrictedDataAccessPreference.java
@@ -79,15 +79,15 @@
 
     @Override
     protected void onClick() {
-        if (mDataUsageState.isDataSaverBlacklisted) {
-            // app is blacklisted, launch App Data Usage screen
+        if (mDataUsageState.isDataSaverDenylisted) {
+            // app is denylisted, launch App Data Usage screen
             AppInfoDashboardFragment.startAppInfoFragment(AppDataUsage.class,
                     R.string.data_usage_app_summary_title,
                     null /* arguments */,
                     mParentFragment,
                     mEntry);
         } else {
-            // app is not blacklisted, let superclass handle toggle switch
+            // app is not denylisted, let superclass handle toggle switch
             super.onClick();
         }
     }
@@ -119,7 +119,7 @@
             widgetFrame.setVisibility(View.VISIBLE);
         } else {
             widgetFrame.setVisibility(
-                    mDataUsageState != null && mDataUsageState.isDataSaverBlacklisted
+                    mDataUsageState != null && mDataUsageState.isDataSaverDenylisted
                             ? View.INVISIBLE : View.VISIBLE);
         }
         super.onBindViewHolder(holder);
@@ -136,17 +136,17 @@
     }
 
     @Override
-    public void onWhitelistStatusChanged(int uid, boolean isWhitelisted) {
+    public void onAllowlistStatusChanged(int uid, boolean isAllowlisted) {
         if (mDataUsageState != null && mEntry.info.uid == uid) {
-            mDataUsageState.isDataSaverWhitelisted = isWhitelisted;
+            mDataUsageState.isDataSaverAllowlisted = isAllowlisted;
             updateState();
         }
     }
 
     @Override
-    public void onBlacklistStatusChanged(int uid, boolean isBlacklisted) {
+    public void onDenylistStatusChanged(int uid, boolean isDenylisted) {
         if (mDataUsageState != null && mEntry.info.uid == uid) {
-            mDataUsageState.isDataSaverBlacklisted = isBlacklisted;
+            mDataUsageState.isDataSaverDenylisted = isDenylisted;
             updateState();
         }
     }
@@ -167,15 +167,15 @@
         mHelper.setDisabledByAdmin(admin);
     }
 
-    // Sets UI state based on whitelist/blacklist status.
+    // Sets UI state based on allowlist/denylist status.
     public void updateState() {
         setTitle(mEntry.label);
         if (mDataUsageState != null) {
-            setChecked(mDataUsageState.isDataSaverWhitelisted);
+            setChecked(mDataUsageState.isDataSaverAllowlisted);
             if (isDisabledByAdmin()) {
                 setSummary(R.string.disabled_by_admin);
-            } else if (mDataUsageState.isDataSaverBlacklisted) {
-                setSummary(R.string.restrict_background_blacklisted);
+            } else if (mDataUsageState.isDataSaverDenylisted) {
+                setSummary(R.string.restrict_background_blocklisted);
             } else {
                 setSummary("");
             }
diff --git a/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java b/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java
index d8656ca..00f4a7b 100644
--- a/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java
+++ b/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java
@@ -186,11 +186,11 @@
         if (preference instanceof UnrestrictedDataAccessPreference) {
             final UnrestrictedDataAccessPreference
                     accessPreference = (UnrestrictedDataAccessPreference) preference;
-            boolean whitelisted = newValue == Boolean.TRUE;
-            logSpecialPermissionChange(whitelisted, accessPreference.getEntry().info.packageName);
-            mDataSaverBackend.setIsWhitelisted(accessPreference.getEntry().info.uid,
-                    accessPreference.getEntry().info.packageName, whitelisted);
-            accessPreference.getDataUsageState().isDataSaverWhitelisted = whitelisted;
+            boolean allowlisted = newValue == Boolean.TRUE;
+            logSpecialPermissionChange(allowlisted, accessPreference.getEntry().info.packageName);
+            mDataSaverBackend.setIsAllowlisted(accessPreference.getEntry().info.uid,
+                    accessPreference.getEntry().info.packageName, allowlisted);
+            accessPreference.getDataUsageState().isDataSaverAllowlisted = allowlisted;
             return true;
         }
         return false;
@@ -224,8 +224,8 @@
     }
 
     @VisibleForTesting
-    void logSpecialPermissionChange(boolean whitelisted, String packageName) {
-        final int logCategory = whitelisted ? SettingsEnums.APP_SPECIAL_PERMISSION_UNL_DATA_ALLOW
+    void logSpecialPermissionChange(boolean allowlisted, String packageName) {
+        final int logCategory = allowlisted ? SettingsEnums.APP_SPECIAL_PERMISSION_UNL_DATA_ALLOW
                 : SettingsEnums.APP_SPECIAL_PERMISSION_UNL_DATA_DENY;
         FeatureFactory.getFactory(mContext).getMetricsFeatureProvider().action(mContext,
                 logCategory, packageName);
diff --git a/src/com/android/settings/datetime/TimeFormatPreferenceController.java b/src/com/android/settings/datetime/TimeFormatPreferenceController.java
index 3ad879a..900ec7a 100644
--- a/src/com/android/settings/datetime/TimeFormatPreferenceController.java
+++ b/src/com/android/settings/datetime/TimeFormatPreferenceController.java
@@ -41,7 +41,7 @@
     private static final String KEY_TIME_FORMAT = "24 hour";
 
     // Used for showing the current date format, which looks like "12/31/2010", "2010/12/13", etc.
-    // The date value is dummy (independent of actual date).
+    // The date value is stubs (independent of actual date).
     private final Calendar mDummyDate;
     private final boolean mIsFromSUW;
     private final UpdateTimeAndDateCallback mUpdateTimeAndDateCallback;
diff --git a/src/com/android/settings/datetime/timezone/OWNERS b/src/com/android/settings/datetime/timezone/OWNERS
index 02cf23c..7ad770a 100644
--- a/src/com/android/settings/datetime/timezone/OWNERS
+++ b/src/com/android/settings/datetime/timezone/OWNERS
@@ -1,6 +1,5 @@
 # Default reviewers for this and subdirectories.
 vichang@google.com
-tobiast@google.com
 nfuller@google.com
 
 # Emergency approvers in case the above are not available
diff --git a/src/com/android/settings/datetime/timezone/model/FilteredCountryTimeZones.java b/src/com/android/settings/datetime/timezone/model/FilteredCountryTimeZones.java
index 92e9e96..7a38853 100644
--- a/src/com/android/settings/datetime/timezone/model/FilteredCountryTimeZones.java
+++ b/src/com/android/settings/datetime/timezone/model/FilteredCountryTimeZones.java
@@ -16,7 +16,7 @@
 
 package com.android.settings.datetime.timezone.model;
 
-import libcore.timezone.CountryTimeZones;
+import com.android.i18n.timezone.CountryTimeZones;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/src/com/android/settings/datetime/timezone/model/TimeZoneData.java b/src/com/android/settings/datetime/timezone/model/TimeZoneData.java
index 61244f2..335e6e2 100644
--- a/src/com/android/settings/datetime/timezone/model/TimeZoneData.java
+++ b/src/com/android/settings/datetime/timezone/model/TimeZoneData.java
@@ -18,9 +18,9 @@
 import androidx.annotation.VisibleForTesting;
 import androidx.collection.ArraySet;
 
-import libcore.timezone.CountryTimeZones;
-import libcore.timezone.CountryZonesFinder;
-import libcore.timezone.TimeZoneFinder;
+import com.android.i18n.timezone.CountryTimeZones;
+import com.android.i18n.timezone.CountryZonesFinder;
+import com.android.i18n.timezone.TimeZoneFinder;
 
 import java.lang.ref.WeakReference;
 import java.util.Collections;
diff --git a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java
index 0de9f67..495764b 100644
--- a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java
+++ b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java
@@ -83,8 +83,8 @@
     private void initializeSwitchBar() {
         final SettingsActivity activity = (SettingsActivity) getActivity();
         mSwitchBar = activity.getSwitchBar();
-        mSwitchBar.setSwitchBarText(R.string.automatic_storage_manager_master_switch_title,
-                R.string.automatic_storage_manager_master_switch_title);
+        mSwitchBar.setSwitchBarText(R.string.automatic_storage_manager_primary_switch_title,
+                R.string.automatic_storage_manager_primary_switch_title);
         mSwitchBar.show();
         mSwitchController =
                 new AutomaticStorageManagerSwitchBarController(
diff --git a/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceController.java b/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceController.java
index 136ddad..8c307a6 100644
--- a/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceController.java
+++ b/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceController.java
@@ -63,7 +63,7 @@
     public void updateState(Preference preference) {
         final ListPreference listPreference = (ListPreference) preference;
         final String currentValue = SystemProperties.get(BLUETOOTH_AVRCP_VERSION_PROPERTY);
-        int index = 0; // Defaults to AVRCP 1.4
+        int index = 0; // Defaults to AVRCP 1.5
         for (int i = 0; i < mListValues.length; i++) {
             if (TextUtils.equals(currentValue, mListValues[i])) {
                 index = i;
diff --git a/src/com/android/settings/development/DefaultLaunchPreferenceController.java b/src/com/android/settings/development/DefaultLaunchPreferenceController.java
index e76dbeb..c0dcb7a 100644
--- a/src/com/android/settings/development/DefaultLaunchPreferenceController.java
+++ b/src/com/android/settings/development/DefaultLaunchPreferenceController.java
@@ -24,7 +24,7 @@
 /**
  * This controller is used for preference that has fragment or launch intent defined in the
  * preference xml, and do not need any handling to update the preference state, except when the
- * master developer options switch is turned on/off, the preference needs to be enabled/disabled.
+ * primary developer options switch is turned on/off, the preference needs to be enabled/disabled.
  *
  */
 public class DefaultLaunchPreferenceController extends DeveloperOptionsPreferenceController
diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
index 945970e..a3d0c46 100644
--- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
+++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
@@ -189,7 +189,7 @@
             getPreferenceScreen().removeAll();
             return;
         }
-        // Set up master switch
+        // Set up primary switch
         mSwitchBar = ((SettingsActivity) getActivity()).getSwitchBar();
         mSwitchBarController = new DevelopmentSwitchBarController(
                 this /* DevelopmentSettings */, mSwitchBar, mIsAvailable,
@@ -479,7 +479,6 @@
         controllers.add(new BluetoothMapVersionPreferenceController(context));
         controllers.add(new BluetoothA2dpHwOffloadPreferenceController(context, fragment));
         controllers.add(new BluetoothMaxConnectedAudioDevicesPreferenceController(context));
-        controllers.add(new EnhancedConnectivityPreferenceController(context));
         controllers.add(new ShowTapsPreferenceController(context));
         controllers.add(new PointerLocationPreferenceController(context));
         controllers.add(new ShowSurfaceUpdatesPreferenceController(context));
diff --git a/src/com/android/settings/development/EnhancedConnectivityPreferenceController.java b/src/com/android/settings/development/EnhancedConnectivityPreferenceController.java
deleted file mode 100644
index 54cfdc6..0000000
--- a/src/com/android/settings/development/EnhancedConnectivityPreferenceController.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.development;
-
-import android.content.Context;
-import android.provider.Settings;
-
-import androidx.preference.Preference;
-import androidx.preference.SwitchPreference;
-
-import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
-/**
- * Preference controller for Enhanced Connectivity feature
- */
-public class EnhancedConnectivityPreferenceController extends
-        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
-        PreferenceControllerMixin {
-
-    private static final String ENHANCED_CONNECTIVITY_KEY = "enhanced_connectivity";
-
-    @VisibleForTesting
-    static final int ENHANCED_CONNECTIVITY_ON = 1;
-    // default is enhanced connectivity enabled.
-    @VisibleForTesting
-    static final int ENHANCED_CONNECTIVITY_OFF = 0;
-
-    public EnhancedConnectivityPreferenceController(Context context) {
-        super(context);
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object o) {
-        final boolean isEnabled = (Boolean) o;
-        Settings.Global.putInt(mContext.getContentResolver(),
-                Settings.Global.ENHANCED_CONNECTIVITY_ENABLED,
-                isEnabled
-                        ? ENHANCED_CONNECTIVITY_ON
-                        : ENHANCED_CONNECTIVITY_OFF);
-        return true;
-    }
-
-    @Override
-    public String getPreferenceKey() {
-        return ENHANCED_CONNECTIVITY_KEY;
-    }
-
-    @Override
-    public void updateState(Preference preference) {
-        final int enhancedConnectivityEnabled = Settings.Global.getInt(
-                mContext.getContentResolver(), Settings.Global.ENHANCED_CONNECTIVITY_ENABLED,
-                ENHANCED_CONNECTIVITY_ON);
-        ((SwitchPreference) mPreference).setChecked(
-                enhancedConnectivityEnabled == ENHANCED_CONNECTIVITY_ON);
-    }
-
-    @Override
-    public boolean isAvailable() {
-        return mContext.getResources().getBoolean(R.bool.config_show_enhanced_connectivity);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchDisabled() {
-        super.onDeveloperOptionsSwitchDisabled();
-        Settings.Global.putInt(mContext.getContentResolver(),
-                Settings.Global.ENHANCED_CONNECTIVITY_ENABLED,
-                ENHANCED_CONNECTIVITY_ON);
-        ((SwitchPreference) mPreference).setChecked(true);
-    }
-}
diff --git a/src/com/android/settings/development/OemUnlockPreferenceController.java b/src/com/android/settings/development/OemUnlockPreferenceController.java
index f8a245f..118312a 100644
--- a/src/com/android/settings/development/OemUnlockPreferenceController.java
+++ b/src/com/android/settings/development/OemUnlockPreferenceController.java
@@ -52,8 +52,8 @@
     private final OemLockManager mOemLockManager;
     private final UserManager mUserManager;
     private final TelephonyManager mTelephonyManager;
+    private final Activity mActivity;
     private final DevelopmentSettingsDashboardFragment mFragment;
-    private final ChooseLockSettingsHelper mChooseLockSettingsHelper;
     private RestrictedSwitchPreference mPreference;
 
     public OemUnlockPreferenceController(Context context, Activity activity,
@@ -69,12 +69,8 @@
         }
         mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
         mTelephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
+        mActivity = activity;
         mFragment = fragment;
-        if (activity != null || mFragment != null) {
-            mChooseLockSettingsHelper = new ChooseLockSettingsHelper(activity, mFragment);
-        } else {
-            mChooseLockSettingsHelper = null;
-        }
     }
 
     @Override
@@ -204,8 +200,11 @@
 
     @VisibleForTesting
     boolean showKeyguardConfirmation(Resources resources, int requestCode) {
-        return mChooseLockSettingsHelper.launchConfirmationActivity(
-                requestCode, resources.getString(R.string.oem_unlock_enable));
+        final ChooseLockSettingsHelper.Builder builder =
+                new ChooseLockSettingsHelper.Builder(mActivity, mFragment);
+        return builder.setRequestCode(requestCode)
+                .setTitle(resources.getString(R.string.oem_unlock_enable))
+                .show();
     }
 
     @VisibleForTesting
diff --git a/src/com/android/settings/development/WirelessDebuggingPreferenceController.java b/src/com/android/settings/development/WirelessDebuggingPreferenceController.java
index a3daede..592028c 100644
--- a/src/com/android/settings/development/WirelessDebuggingPreferenceController.java
+++ b/src/com/android/settings/development/WirelessDebuggingPreferenceController.java
@@ -35,7 +35,7 @@
 
 import com.android.settings.R;
 import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settings.widget.PrimarySwitchPreference;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnPause;
@@ -43,7 +43,7 @@
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 
 /**
- * This controls the master switch controller in the developer options page for
+ * This controls the primary switch controller in the developer options page for
  * "Wireless debugging".
  */
 public class WirelessDebuggingPreferenceController extends DeveloperOptionsPreferenceController
@@ -132,7 +132,7 @@
         boolean enabled = Settings.Global.getInt(mContentResolver,
                 Settings.Global.ADB_WIFI_ENABLED, AdbPreferenceController.ADB_SETTING_OFF)
                     != AdbPreferenceController.ADB_SETTING_OFF;
-        ((MasterSwitchPreference) preference).setChecked(enabled);
+        ((PrimarySwitchPreference) preference).setChecked(enabled);
     }
 
     /**
diff --git a/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceController.java b/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceController.java
index 6bc9175..d66b8d8 100644
--- a/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceController.java
+++ b/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceController.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.development.bluetooth;
 
+import static android.bluetooth.BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST;
+
 import android.bluetooth.BluetoothA2dp;
 import android.bluetooth.BluetoothCodecConfig;
 import android.bluetooth.BluetoothCodecStatus;
@@ -113,7 +115,7 @@
         mBluetoothA2dpConfigStore.setSampleRate(config.getSampleRate());
         mBluetoothA2dpConfigStore.setBitsPerSample(config.getBitsPerSample());
         mBluetoothA2dpConfigStore.setChannelMode(config.getChannelMode());
-        mBluetoothA2dpConfigStore.setCodecPriority(config.getCodecPriority());
+        mBluetoothA2dpConfigStore.setCodecPriority(CODEC_PRIORITY_HIGHEST);
         mBluetoothA2dpConfigStore.setCodecSpecific1Value(config.getCodecSpecific1());
     }
 
diff --git a/src/com/android/settings/development/featureflags/FeatureFlagPersistent.java b/src/com/android/settings/development/featureflags/FeatureFlagPersistent.java
index fb84a72..d89df79 100644
--- a/src/com/android/settings/development/featureflags/FeatureFlagPersistent.java
+++ b/src/com/android/settings/development/featureflags/FeatureFlagPersistent.java
@@ -36,7 +36,6 @@
         PERSISTENT_FLAGS = new HashSet<>();
         PERSISTENT_FLAGS.add(FeatureFlags.HEARING_AID_SETTINGS);
         PERSISTENT_FLAGS.add(FeatureFlags.DYNAMIC_SYSTEM);
-        PERSISTENT_FLAGS.add(FeatureFlags.SETTINGS_FUSE_FLAG);
     }
 
     public static boolean isEnabled(Context context, String feature) {
diff --git a/src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceController.java b/src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceController.java
index b1a31fb..46a3082 100644
--- a/src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceController.java
+++ b/src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceController.java
@@ -16,8 +16,8 @@
 
 package com.android.settings.development.graphicsdriver;
 
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT;
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_DEFAULT;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_OFF;
 
 import android.content.ContentResolver;
 import android.content.Context;
@@ -62,7 +62,7 @@
     private final ContentResolver mContentResolver;
     private final String mPreferenceTitle;
     private final String mPreferenceDefault;
-    private final String mPreferenceGameDriver;
+    private final String mPreferenceProductionDriver;
     private final String mPreferencePrereleaseDriver;
     private final String mPreferenceSystem;
     @VisibleForTesting
@@ -88,8 +88,8 @@
         final Resources resources = context.getResources();
         mPreferenceTitle = resources.getString(R.string.graphics_driver_app_preference_title);
         mPreferenceDefault = resources.getString(R.string.graphics_driver_app_preference_default);
-        mPreferenceGameDriver =
-                resources.getString(R.string.graphics_driver_app_preference_game_driver);
+        mPreferenceProductionDriver =
+                resources.getString(R.string.graphics_driver_app_preference_production_driver);
         mPreferencePrereleaseDriver =
                 resources.getString(R.string.graphics_driver_app_preference_prerelease_driver);
         mPreferenceSystem = resources.getString(R.string.graphics_driver_app_preference_system);
@@ -101,19 +101,21 @@
         mAppInfos = getAppInfos(context);
 
         mDevOptInApps =
-                getGlobalSettingsString(mContentResolver, Settings.Global.GAME_DRIVER_OPT_IN_APPS);
+                getGlobalSettingsString(mContentResolver,
+                                        Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_IN_APPS);
         mDevPrereleaseOptInApps = getGlobalSettingsString(
-                mContentResolver, Settings.Global.GAME_DRIVER_PRERELEASE_OPT_IN_APPS);
+                mContentResolver, Settings.Global.UPDATABLE_DRIVER_PRERELEASE_OPT_IN_APPS);
         mDevOptOutApps =
-                getGlobalSettingsString(mContentResolver, Settings.Global.GAME_DRIVER_OPT_OUT_APPS);
+                getGlobalSettingsString(mContentResolver,
+                                        Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_OUT_APPS);
     }
 
     @Override
     public int getAvailabilityStatus() {
         return DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(mContext)
                 && (Settings.Global.getInt(mContentResolver,
-                Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT)
-                != GAME_DRIVER_OFF)
+                Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT)
+                != UPDATABLE_DRIVER_OFF)
                 ? AVAILABLE
                 : CONDITIONALLY_UNAVAILABLE;
     }
@@ -157,7 +159,7 @@
             mDevOptInApps.remove(packageName);
             mDevPrereleaseOptInApps.remove(packageName);
             mDevOptOutApps.add(packageName);
-        } else if (value.equals(mPreferenceGameDriver)) {
+        } else if (value.equals(mPreferenceProductionDriver)) {
             mDevOptInApps.add(packageName);
             mDevPrereleaseOptInApps.remove(packageName);
             mDevOptOutApps.remove(packageName);
@@ -174,13 +176,15 @@
         listPref.setSummary(value);
 
         // Push the updated Sets for stable/prerelease opt-in and opt-out apps to
-        // corresponding Settings.Global.GAME_DRIVER(_PRERELEASE)?_OPT_(IN|OUT)_APPS
-        Settings.Global.putString(mContentResolver, Settings.Global.GAME_DRIVER_OPT_IN_APPS,
+        // corresponding Settings.Global.UPDATABLE_DRIVER_[PRODUCTION|PRERELEASE]_OPT_(IN|OUT)_APPS
+        Settings.Global.putString(mContentResolver,
+                Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_IN_APPS,
                 String.join(",", mDevOptInApps));
         Settings.Global.putString(mContentResolver,
-                Settings.Global.GAME_DRIVER_PRERELEASE_OPT_IN_APPS,
+                Settings.Global.UPDATABLE_DRIVER_PRERELEASE_OPT_IN_APPS,
                 String.join(",", mDevPrereleaseOptInApps));
-        Settings.Global.putString(mContentResolver, Settings.Global.GAME_DRIVER_OPT_OUT_APPS,
+        Settings.Global.putString(mContentResolver,
+                Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_OUT_APPS,
                 String.join(",", mDevOptOutApps));
 
         return true;
@@ -251,7 +255,7 @@
         listPreference.setEntryValues(mEntryList);
 
         // Initialize preference default and summary with the opt in/out choices
-        // from Settings.Global.GAME_DRIVER(_PRERELEASE)?_OPT_(IN|OUT)_APPS
+        // from Settings.Global.UPDATABLE_DRIVER_[PRODUCTION|PRERELEASE]_OPT_[IN|OUT]_APPS
         if (mDevOptOutApps.contains(packageName)) {
             listPreference.setValue(mPreferenceSystem);
             listPreference.setSummary(mPreferenceSystem);
@@ -259,8 +263,8 @@
             listPreference.setValue(mPreferencePrereleaseDriver);
             listPreference.setSummary(mPreferencePrereleaseDriver);
         } else if (mDevOptInApps.contains(packageName)) {
-            listPreference.setValue(mPreferenceGameDriver);
-            listPreference.setSummary(mPreferenceGameDriver);
+            listPreference.setValue(mPreferenceProductionDriver);
+            listPreference.setSummary(mPreferenceProductionDriver);
         } else {
             listPreference.setValue(mPreferenceDefault);
             listPreference.setSummary(mPreferenceDefault);
diff --git a/src/com/android/settings/development/graphicsdriver/GraphicsDriverContentObserver.java b/src/com/android/settings/development/graphicsdriver/GraphicsDriverContentObserver.java
index 8317800..dbad099 100644
--- a/src/com/android/settings/development/graphicsdriver/GraphicsDriverContentObserver.java
+++ b/src/com/android/settings/development/graphicsdriver/GraphicsDriverContentObserver.java
@@ -52,7 +52,7 @@
      */
     public void register(ContentResolver contentResolver) {
         contentResolver.registerContentObserver(
-                Settings.Global.getUriFor(Settings.Global.GAME_DRIVER_ALL_APPS), false, this);
+                Settings.Global.getUriFor(Settings.Global.UPDATABLE_DRIVER_ALL_APPS), false, this);
     }
 
     /**
diff --git a/src/com/android/settings/development/graphicsdriver/GraphicsDriverDashboard.java b/src/com/android/settings/development/graphicsdriver/GraphicsDriverDashboard.java
index 2801689..9275a31 100644
--- a/src/com/android/settings/development/graphicsdriver/GraphicsDriverDashboard.java
+++ b/src/com/android/settings/development/graphicsdriver/GraphicsDriverDashboard.java
@@ -30,7 +30,7 @@
 import com.android.settingslib.search.SearchIndexable;
 
 /**
- * Dashboard for Game Driver preferences.
+ * Dashboard for Graphics Driver preferences.
  */
 @SearchIndexable
 public class GraphicsDriverDashboard extends DashboardFragment {
@@ -39,7 +39,7 @@
 
     @Override
     public int getMetricsCategory() {
-        return SettingsEnums.SETTINGS_GAME_DRIVER_DASHBOARD;
+        return SettingsEnums.SETTINGS_GRAPHICS_DRIVER_DASHBOARD;
     }
 
     @Override
diff --git a/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceController.java b/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceController.java
index 29f1014..5106a78 100644
--- a/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceController.java
+++ b/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceController.java
@@ -46,24 +46,24 @@
 import java.util.List;
 
 /**
- * Controller of global switch to enable Game Driver for all Apps.
+ * Controller of global switch to enable updatable driver for all Apps.
  */
 public class GraphicsDriverEnableForAllAppsPreferenceController extends BasePreferenceController
         implements Preference.OnPreferenceChangeListener,
                    GraphicsDriverContentObserver.OnGraphicsDriverContentChangedListener,
                    LifecycleObserver, OnStart, OnStop {
 
-    public static final int GAME_DRIVER_DEFAULT = 0;
-    public static final int GAME_DRIVER_ALL_APPS = 1;
-    public static final int GAME_DRIVER_PRERELEASE_ALL_APPS = 2;
-    public static final int GAME_DRIVER_OFF = 3;
-    public static final String PROPERTY_GFX_DRIVER_GAME = "ro.gfx.driver.0";
+    public static final int UPDATABLE_DRIVER_DEFAULT = 0;
+    public static final int UPDATABLE_DRIVER_PRODUCTION_ALL_APPS = 1;
+    public static final int UPDATABLE_DRIVER_PRERELEASE_ALL_APPS = 2;
+    public static final int UPDATABLE_DRIVER_OFF = 3;
+    public static final String PROPERTY_GFX_DRIVER_PRODUCTION = "ro.gfx.driver.0";
     public static final String PROPERTY_GFX_DRIVER_PRERELEASE = "ro.gfx.driver.1";
 
     private final Context mContext;
     private final ContentResolver mContentResolver;
     private final String mPreferenceDefault;
-    private final String mPreferenceGameDriver;
+    private final String mPreferenceProductionDriver;
     private final String mPreferencePrereleaseDriver;
     @VisibleForTesting
     CharSequence[] mEntryList;
@@ -79,8 +79,8 @@
 
         final Resources resources = context.getResources();
         mPreferenceDefault = resources.getString(R.string.graphics_driver_app_preference_default);
-        mPreferenceGameDriver =
-                resources.getString(R.string.graphics_driver_app_preference_game_driver);
+        mPreferenceProductionDriver =
+                resources.getString(R.string.graphics_driver_app_preference_production_driver);
         mPreferencePrereleaseDriver =
                 resources.getString(R.string.graphics_driver_app_preference_prerelease_driver);
         mEntryList = constructEntryList(mContext, false);
@@ -92,8 +92,9 @@
     public int getAvailabilityStatus() {
         return DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(mContext)
                         && (Settings.Global.getInt(mContentResolver,
-                                    Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT)
-                                != GAME_DRIVER_OFF)
+                                    Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                                    UPDATABLE_DRIVER_DEFAULT)
+                                != UPDATABLE_DRIVER_OFF)
                 ? AVAILABLE
                 : CONDITIONALLY_UNAVAILABLE;
     }
@@ -122,11 +123,12 @@
         final ListPreference listPref = (ListPreference) preference;
         listPref.setVisible(isAvailable());
         final int currentChoice = Settings.Global.getInt(
-                mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
-        if (currentChoice == GAME_DRIVER_ALL_APPS) {
-            listPref.setValue(mPreferenceGameDriver);
-            listPref.setSummary(mPreferenceGameDriver);
-        } else if (currentChoice == GAME_DRIVER_PRERELEASE_ALL_APPS) {
+                mContentResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                UPDATABLE_DRIVER_DEFAULT);
+        if (currentChoice == UPDATABLE_DRIVER_PRODUCTION_ALL_APPS) {
+            listPref.setValue(mPreferenceProductionDriver);
+            listPref.setSummary(mPreferenceProductionDriver);
+        } else if (currentChoice == UPDATABLE_DRIVER_PRERELEASE_ALL_APPS) {
             listPref.setValue(mPreferencePrereleaseDriver);
             listPref.setSummary(mPreferencePrereleaseDriver);
         } else {
@@ -140,21 +142,22 @@
         final ListPreference listPref = (ListPreference) preference;
         final String value = newValue.toString();
         final int currentChoice = Settings.Global.getInt(
-                mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
+                mContentResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                UPDATABLE_DRIVER_DEFAULT);
         final int userChoice;
-        if (value.equals(mPreferenceGameDriver)) {
-            userChoice = GAME_DRIVER_ALL_APPS;
+        if (value.equals(mPreferenceProductionDriver)) {
+            userChoice = UPDATABLE_DRIVER_PRODUCTION_ALL_APPS;
         } else if (value.equals(mPreferencePrereleaseDriver)) {
-            userChoice = GAME_DRIVER_PRERELEASE_ALL_APPS;
+            userChoice = UPDATABLE_DRIVER_PRERELEASE_ALL_APPS;
         } else {
-            userChoice = GAME_DRIVER_DEFAULT;
+            userChoice = UPDATABLE_DRIVER_DEFAULT;
         }
         listPref.setValue(value);
         listPref.setSummary(value);
 
         if (userChoice != currentChoice) {
             Settings.Global.putInt(
-                    mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS, userChoice);
+                    mContentResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, userChoice);
         }
 
         return true;
@@ -172,7 +175,8 @@
         final Resources resources = context.getResources();
         final String prereleaseDriverPackageName =
                 SystemProperties.get(PROPERTY_GFX_DRIVER_PRERELEASE);
-        final String gameDriverPackageName = SystemProperties.get(PROPERTY_GFX_DRIVER_GAME);
+        final String productionDriverPackageName =
+                SystemProperties.get(PROPERTY_GFX_DRIVER_PRODUCTION);
 
         List<CharSequence> entryList = new ArrayList<>();
         entryList.add(resources.getString(R.string.graphics_driver_app_preference_default));
@@ -182,9 +186,10 @@
             entryList.add(resources.getString(
                     R.string.graphics_driver_app_preference_prerelease_driver));
         }
-        if (!TextUtils.isEmpty(gameDriverPackageName)
-                && hasDriverPackage(pm, gameDriverPackageName)) {
-            entryList.add(resources.getString(R.string.graphics_driver_app_preference_game_driver));
+        if (!TextUtils.isEmpty(productionDriverPackageName)
+                && hasDriverPackage(pm, productionDriverPackageName)) {
+            entryList.add(resources.getString(
+                    R.string.graphics_driver_app_preference_production_driver));
         }
         if (withSystem) {
             entryList.add(resources.getString(R.string.graphics_driver_app_preference_system));
diff --git a/src/com/android/settings/development/graphicsdriver/GraphicsDriverFooterPreferenceController.java b/src/com/android/settings/development/graphicsdriver/GraphicsDriverFooterPreferenceController.java
index 4862cfe..5595f39 100644
--- a/src/com/android/settings/development/graphicsdriver/GraphicsDriverFooterPreferenceController.java
+++ b/src/com/android/settings/development/graphicsdriver/GraphicsDriverFooterPreferenceController.java
@@ -16,8 +16,8 @@
 
 package com.android.settings.development.graphicsdriver;
 
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT;
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_DEFAULT;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_OFF;
 
 import android.content.ContentResolver;
 import android.content.Context;
@@ -58,8 +58,9 @@
     @Override
     public int getAvailabilityStatus() {
         return Settings.Global.getInt(
-                mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT)
-                == GAME_DRIVER_OFF
+                mContentResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                UPDATABLE_DRIVER_DEFAULT)
+                == UPDATABLE_DRIVER_OFF
                 ? AVAILABLE_UNSEARCHABLE
                 : CONDITIONALLY_UNAVAILABLE;
     }
diff --git a/src/com/android/settings/development/graphicsdriver/GraphicsDriverGlobalSwitchBarController.java b/src/com/android/settings/development/graphicsdriver/GraphicsDriverGlobalSwitchBarController.java
index 86c56b7..b1faefa 100644
--- a/src/com/android/settings/development/graphicsdriver/GraphicsDriverGlobalSwitchBarController.java
+++ b/src/com/android/settings/development/graphicsdriver/GraphicsDriverGlobalSwitchBarController.java
@@ -16,10 +16,10 @@
 
 package com.android.settings.development.graphicsdriver;
 
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_ALL_APPS;
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT;
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF;
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_PRERELEASE_ALL_APPS;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_DEFAULT;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_OFF;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_PRERELEASE_ALL_APPS;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_PRODUCTION_ALL_APPS;
 
 import android.content.ContentResolver;
 import android.content.Context;
@@ -36,7 +36,7 @@
 import com.android.settingslib.development.DevelopmentSettingsEnabler;
 
 /**
- * Controller of global switch bar used to fully turn off Game Driver.
+ * Controller of global switch bar used to fully turn off updatable driver.
  */
 public class GraphicsDriverGlobalSwitchBarController
         implements SwitchWidgetController.OnSwitchChangeListener,
@@ -61,8 +61,9 @@
                 DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(context));
         mSwitchWidgetController.setChecked(
                 Settings.Global.getInt(
-                        mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT)
-                != GAME_DRIVER_OFF);
+                        mContentResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                        UPDATABLE_DRIVER_DEFAULT)
+                != UPDATABLE_DRIVER_OFF);
         mSwitchWidgetController.setListener(this);
     }
 
@@ -81,21 +82,22 @@
     @Override
     public boolean onSwitchToggled(boolean isChecked) {
         final int graphicsDriverGlobalOption = Settings.Global.getInt(
-                mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
+                mContentResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                UPDATABLE_DRIVER_DEFAULT);
 
         if (isChecked
-                && (graphicsDriverGlobalOption == GAME_DRIVER_DEFAULT
-                        || graphicsDriverGlobalOption == GAME_DRIVER_ALL_APPS
-                        || graphicsDriverGlobalOption == GAME_DRIVER_PRERELEASE_ALL_APPS)) {
+                && (graphicsDriverGlobalOption == UPDATABLE_DRIVER_DEFAULT
+                        || graphicsDriverGlobalOption == UPDATABLE_DRIVER_PRODUCTION_ALL_APPS
+                        || graphicsDriverGlobalOption == UPDATABLE_DRIVER_PRERELEASE_ALL_APPS)) {
             return true;
         }
 
-        if (!isChecked && graphicsDriverGlobalOption == GAME_DRIVER_OFF) {
+        if (!isChecked && graphicsDriverGlobalOption == UPDATABLE_DRIVER_OFF) {
             return true;
         }
 
-        Settings.Global.putInt(mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS,
-                isChecked ? GAME_DRIVER_DEFAULT : GAME_DRIVER_OFF);
+        Settings.Global.putInt(mContentResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                isChecked ? UPDATABLE_DRIVER_DEFAULT : UPDATABLE_DRIVER_OFF);
 
         return true;
     }
@@ -104,7 +106,8 @@
     public void onGraphicsDriverContentChanged() {
         mSwitchWidgetController.setChecked(
                 Settings.Global.getInt(
-                        mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT)
-                != GAME_DRIVER_OFF);
+                        mContentResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                        UPDATABLE_DRIVER_DEFAULT)
+                != UPDATABLE_DRIVER_OFF);
     }
 }
diff --git a/src/com/android/settings/development/qstile/DevelopmentTiles.java b/src/com/android/settings/development/qstile/DevelopmentTiles.java
index 916c6c9..b8af740 100644
--- a/src/com/android/settings/development/qstile/DevelopmentTiles.java
+++ b/src/com/android/settings/development/qstile/DevelopmentTiles.java
@@ -432,4 +432,31 @@
                     enabled ? ADB_SETTING_ON : ADB_SETTING_OFF);
         }
     }
+
+    /**
+     * Tile to control the "Show taps" developer setting
+     */
+    public static class ShowTaps extends DevelopmentTiles {
+        private static final int SETTING_VALUE_ON = 1;
+        private static final int SETTING_VALUE_OFF = 0;
+        private Context mContext;
+
+        @Override
+        public void onCreate() {
+            super.onCreate();
+            mContext = getApplicationContext();
+        }
+
+        @Override
+        protected boolean isEnabled() {
+            return Settings.System.getInt(mContext.getContentResolver(),
+                Settings.System.SHOW_TOUCHES, SETTING_VALUE_OFF) == SETTING_VALUE_ON;
+        }
+
+        @Override
+        protected void setIsEnabled(boolean isEnabled) {
+            Settings.System.putInt(mContext.getContentResolver(),
+                Settings.System.SHOW_TOUCHES, isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
+        }
+    }
 }
diff --git a/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java b/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java
index 185c8ea..c09ea02 100644
--- a/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java
@@ -160,11 +160,16 @@
             if (mDevHitCountdown == 0 && !mProcessingLastDevHit) {
                 // Add 1 count back, then start password confirmation flow.
                 mDevHitCountdown++;
-                final ChooseLockSettingsHelper helper =
-                        new ChooseLockSettingsHelper(mActivity, mFragment);
-                mProcessingLastDevHit = helper.launchConfirmationActivity(
-                        REQUEST_CONFIRM_PASSWORD_FOR_DEV_PREF,
-                        mContext.getString(R.string.unlock_set_unlock_launch_picker_title));
+
+                final String title = mContext
+                        .getString(R.string.unlock_set_unlock_launch_picker_title);
+                final ChooseLockSettingsHelper.Builder builder =
+                        new ChooseLockSettingsHelper.Builder(mActivity, mFragment);
+                mProcessingLastDevHit = builder
+                        .setRequestCode(REQUEST_CONFIRM_PASSWORD_FOR_DEV_PREF)
+                        .setTitle(title)
+                        .show();
+
                 if (!mProcessingLastDevHit) {
                     enableDevelopmentSettings();
                 }
diff --git a/src/com/android/settings/deviceinfo/HardwareInfoPreferenceController.java b/src/com/android/settings/deviceinfo/HardwareInfoPreferenceController.java
index 7ee6f89..5f760bf 100644
--- a/src/com/android/settings/deviceinfo/HardwareInfoPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/HardwareInfoPreferenceController.java
@@ -49,7 +49,7 @@
 
     @Override
     public CharSequence getSummary() {
-        return mContext.getResources().getString(R.string.model_summary, getDeviceModel());
+        return getDeviceModel();
     }
 
     public static String getDeviceModel() {
diff --git a/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java b/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java
index 1cae22e..7d20aa7 100644
--- a/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java
+++ b/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java
@@ -103,8 +103,14 @@
                     Log.d(TAG, "User " + user.id + " is currently locked; requesting unlock");
                     final CharSequence description = TextUtils.expandTemplate(
                             getText(R.string.storage_wizard_move_unlock), user.name);
-                    new ChooseLockSettingsHelper(this).launchConfirmationActivityForAnyUser(
-                            REQUEST_CREDENTIAL, null, null, description, user.id);
+                    final ChooseLockSettingsHelper.Builder builder =
+                            new ChooseLockSettingsHelper.Builder(this);
+                    builder.setRequestCode(REQUEST_CREDENTIAL)
+                            .setDescription(description)
+                            .setUserId(user.id)
+                            .setAllowAnyUserId(true)
+                            .setForceVerifyPath(true)
+                            .show();
                     return;
                 }
             }
diff --git a/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java b/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java
index 8dc878e..034eb079 100644
--- a/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java
+++ b/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java
@@ -61,7 +61,7 @@
             return;
         }
 
-        // Sanity check that target volume is candidate
+        // Check that target volume is candidate
         Preconditions.checkState(
                 getPackageManager().getPackageCandidateVolumes(mApp).contains(mVolume));
 
@@ -85,8 +85,14 @@
                     Log.d(TAG, "User " + user.id + " is currently locked; requesting unlock");
                     final CharSequence description = TextUtils.expandTemplate(
                             getText(R.string.storage_wizard_move_unlock), user.name);
-                    new ChooseLockSettingsHelper(this).launchConfirmationActivityForAnyUser(
-                            REQUEST_CREDENTIAL, null, null, description, user.id);
+                    final ChooseLockSettingsHelper.Builder builder =
+                            new ChooseLockSettingsHelper.Builder(this);
+                    builder.setRequestCode(REQUEST_CREDENTIAL)
+                            .setDescription(description)
+                            .setUserId(user.id)
+                            .setForceVerifyPath(true)
+                            .setAllowAnyUserId(true)
+                            .show();
                     return;
                 }
             }
diff --git a/src/com/android/settings/deviceinfo/aboutphone/TopLevelAboutDevicePreferenceController.java b/src/com/android/settings/deviceinfo/aboutphone/TopLevelAboutDevicePreferenceController.java
index dbee443..83efcc4 100644
--- a/src/com/android/settings/deviceinfo/aboutphone/TopLevelAboutDevicePreferenceController.java
+++ b/src/com/android/settings/deviceinfo/aboutphone/TopLevelAboutDevicePreferenceController.java
@@ -35,7 +35,7 @@
     @Override
     public CharSequence getSummary() {
         final DeviceNamePreferenceController deviceNamePreferenceController =
-                new DeviceNamePreferenceController(mContext, "dummy_key");
+                new DeviceNamePreferenceController(mContext, "unused_key");
         return deviceNamePreferenceController.getSummary();
     }
 }
diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
index 370bdfb..9858ad2 100644
--- a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
+++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
@@ -152,6 +152,7 @@
     private final Context mContext;
 
     private boolean mShowLatestAreaInfo;
+    private boolean mIsRegisteredListener = false;
 
     private final BroadcastReceiver mAreaInfoReceiver = new BroadcastReceiver() {
         @Override
@@ -282,11 +283,22 @@
             mContext.registerReceiver(mAreaInfoReceiver,
                     new IntentFilter(CellBroadcastIntents.ACTION_AREA_INFO_UPDATED));
         }
+
+        mIsRegisteredListener = true;
     }
 
     @Override
     public void onPause() {
         if (mSubscriptionInfo == null) {
+            if (mIsRegisteredListener) {
+                mSubscriptionManager.removeOnSubscriptionsChangedListener(
+                        mOnSubscriptionsChangedListener);
+                mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);
+                if (mShowLatestAreaInfo) {
+                    mContext.unregisterReceiver(mAreaInfoReceiver);
+                }
+                mIsRegisteredListener = false;
+            }
             return;
         }
 
diff --git a/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java b/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java
index 50027f2..8fec0c4 100644
--- a/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java
@@ -29,8 +29,8 @@
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.deletionhelper.ActivationWarningFragment;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.widget.MasterSwitchController;
-import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settings.widget.PrimarySwitchController;
+import com.android.settings.widget.PrimarySwitchPreference;
 import com.android.settings.widget.SwitchWidgetController;
 import com.android.settingslib.Utils;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
@@ -43,8 +43,8 @@
     @VisibleForTesting
     static final String STORAGE_MANAGER_ENABLED_BY_DEFAULT_PROPERTY = "ro.storage_manager.enabled";
     private final MetricsFeatureProvider mMetricsFeatureProvider;
-    private MasterSwitchPreference mSwitch;
-    private MasterSwitchController mSwitchController;
+    private PrimarySwitchPreference mSwitch;
+    private PrimarySwitchController mSwitchController;
     private FragmentManager mFragmentManager;
 
     public AutomaticStorageManagementSwitchPreferenceController(Context context, String key) {
@@ -77,7 +77,7 @@
         mSwitch.setChecked(Utils.isStorageManagerEnabled(mContext));
 
         if (mSwitch != null) {
-            mSwitchController = new MasterSwitchController(mSwitch);
+            mSwitchController = new PrimarySwitchController(mSwitch);
             mSwitchController.setListener(this);
             mSwitchController.startListening();
         }
diff --git a/src/com/android/settings/display/AdaptiveSleepDetailPreferenceController.java b/src/com/android/settings/display/AdaptiveSleepDetailPreferenceController.java
index d6eabec..d0fc5d7 100644
--- a/src/com/android/settings/display/AdaptiveSleepDetailPreferenceController.java
+++ b/src/com/android/settings/display/AdaptiveSleepDetailPreferenceController.java
@@ -17,13 +17,25 @@
 package com.android.settings.display;
 
 import android.content.Context;
+import android.os.UserManager;
 
 import androidx.preference.Preference;
 
+import com.android.settings.bluetooth.RestrictionUtils;
+import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+import com.android.settingslib.RestrictedSwitchPreference;
+
 public class AdaptiveSleepDetailPreferenceController extends AdaptiveSleepPreferenceController {
+    private RestrictionUtils mRestrictionUtils;
+
+    public AdaptiveSleepDetailPreferenceController(Context context, String key,
+            RestrictionUtils restrictionUtils) {
+        super(context, key);
+        mRestrictionUtils = restrictionUtils;
+    }
 
     public AdaptiveSleepDetailPreferenceController(Context context, String key) {
-        super(context, key);
+        this(context, key, new RestrictionUtils());
     }
 
     @Override
@@ -43,6 +55,12 @@
     @Override
     public void updateState(Preference preference) {
         super.updateState(preference);
-        preference.setEnabled(hasSufficientPermission(mContext.getPackageManager()));
+        final EnforcedAdmin enforcedAdmin = mRestrictionUtils.checkIfRestrictionEnforced(mContext,
+                UserManager.DISALLOW_CONFIG_SCREEN_TIMEOUT);
+        if (enforcedAdmin != null) {
+            ((RestrictedSwitchPreference) preference).setDisabledByAdmin(enforcedAdmin);
+        } else {
+            preference.setEnabled(hasSufficientPermission(mContext.getPackageManager()));
+        }
     }
 }
\ No newline at end of file
diff --git a/src/com/android/settings/display/TopLevelDisplayPreferenceController.java b/src/com/android/settings/display/TopLevelDisplayPreferenceController.java
index fbaea93..73aafe5 100644
--- a/src/com/android/settings/display/TopLevelDisplayPreferenceController.java
+++ b/src/com/android/settings/display/TopLevelDisplayPreferenceController.java
@@ -37,7 +37,7 @@
     @Override
     public CharSequence getSummary() {
         final WallpaperPreferenceController controller =
-                new WallpaperPreferenceController(mContext, "dummy_key");
+                new WallpaperPreferenceController(mContext, "unused_key");
         if (controller.isAvailable()) {
             return mContext.getText(
                     controller.areStylesAvailable()
diff --git a/src/com/android/settings/display/WallpaperPreferenceController.java b/src/com/android/settings/display/WallpaperPreferenceController.java
index b6af9bc..72054e9 100644
--- a/src/com/android/settings/display/WallpaperPreferenceController.java
+++ b/src/com/android/settings/display/WallpaperPreferenceController.java
@@ -62,8 +62,11 @@
     }
 
     public ComponentName getComponentName() {
-        return new ComponentName(mWallpaperPackage,
-                areStylesAvailable() ? mStylesAndWallpaperClass : mWallpaperClass);
+        return new ComponentName(mWallpaperPackage, getComponentClassString());
+    }
+
+    public String getComponentClassString() {
+        return areStylesAvailable() ? mStylesAndWallpaperClass : mWallpaperClass;
     }
 
     public String getKeywords() {
@@ -76,11 +79,12 @@
 
     @Override
     public int getAvailabilityStatus() {
-        if (TextUtils.isEmpty(mWallpaperPackage) || TextUtils.isEmpty(mWallpaperClass)) {
+        if ((TextUtils.isEmpty(mWallpaperClass) && TextUtils.isEmpty(mStylesAndWallpaperClass))
+                || TextUtils.isEmpty(mWallpaperPackage)) {
             Log.e(TAG, "No Wallpaper picker specified!");
             return UNSUPPORTED_ON_DEVICE;
         }
-        return canResolveWallpaperComponent(mWallpaperClass)
+        return canResolveWallpaperComponent(getComponentClassString())
                 ? AVAILABLE_UNSEARCHABLE : CONDITIONALLY_UNAVAILABLE;
     }
 
@@ -92,7 +96,11 @@
     @Override
     public boolean handlePreferenceTreeClick(Preference preference) {
         if (getPreferenceKey().equals(preference.getKey())) {
-            preference.getContext().startActivity(new Intent().setComponent(getComponentName()));
+            final Intent intent = new Intent().setComponent(getComponentName());
+            if (areStylesAvailable()) {
+                intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            }
+            preference.getContext().startActivity(intent);
             return true;
         }
         return super.handlePreferenceTreeClick(preference);
diff --git a/src/com/android/settings/display/darkmode/DarkModePreference.java b/src/com/android/settings/display/darkmode/DarkModePreference.java
index 7fb8023..baaa1f7 100644
--- a/src/com/android/settings/display/darkmode/DarkModePreference.java
+++ b/src/com/android/settings/display/darkmode/DarkModePreference.java
@@ -19,14 +19,16 @@
 import android.content.res.Configuration;
 import android.os.PowerManager;
 import android.util.AttributeSet;
+
 import com.android.settings.R;
-import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settings.widget.PrimarySwitchPreference;
 
 import java.time.LocalTime;
 
 /**
- * component for the display settings dark ui summary*/
-public class DarkModePreference extends MasterSwitchPreference {
+ * component for the display settings dark ui summary
+ */
+public class DarkModePreference extends PrimarySwitchPreference {
 
     private UiModeManager mUiModeManager;
     private DarkModeObserver mDarkModeObserver;
diff --git a/src/com/android/settings/display/darkmode/TimeFormatter.java b/src/com/android/settings/display/darkmode/TimeFormatter.java
index 1032fe1..32ff026 100644
--- a/src/com/android/settings/display/darkmode/TimeFormatter.java
+++ b/src/com/android/settings/display/darkmode/TimeFormatter.java
@@ -18,26 +18,29 @@
 import android.content.Context;
 
 import java.time.LocalTime;
-import java.time.format.DateTimeFormatter;
-import java.util.Locale;
+import java.util.Calendar;
+import java.util.TimeZone;
 
 /**
  * Formats LocalTime to the locale time string format
 */
 public class TimeFormatter {
     private final Context mContext;
-    private final DateTimeFormatter mFormatter;
+    private final java.text.DateFormat mFormatter;
     public TimeFormatter(Context context) {
         mContext = context;
-        Locale locale = mContext.getResources().getConfiguration().locale;
-        if (locale == null) {
-            locale = Locale.getDefault();
-        }
-        mFormatter = DateTimeFormatter.ofPattern("hh:mm a", locale);
+        mFormatter = android.text.format.DateFormat.getTimeFormat(context);
+        mFormatter.setTimeZone(TimeZone.getTimeZone("UTC"));
     }
 
     public String of(LocalTime time) {
-        return mFormatter.format(time);
+        final Calendar c = Calendar.getInstance();
+        c.setTimeZone(mFormatter.getTimeZone());
+        c.set(Calendar.HOUR_OF_DAY, time.getHour());
+        c.set(Calendar.MINUTE, time.getMinute());
+        c.set(Calendar.SECOND, 0);
+        c.set(Calendar.MILLISECOND, 0);
+        return mFormatter.format(c.getTime());
     }
 
     public boolean is24HourFormat() {
diff --git a/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java b/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java
index 4a5ce7d..fad3456 100644
--- a/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java
@@ -33,7 +33,7 @@
 import com.android.settings.fuelgauge.batterytip.tips.UnrestrictAppTip;
 import com.android.settingslib.RestrictedPreference;
 import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.fuelgauge.PowerWhitelistBackend;
+import com.android.settingslib.fuelgauge.PowerAllowlistBackend;
 
 /**
  * Controller to control whether an app can run in the background
@@ -54,18 +54,18 @@
     BatteryUtils mBatteryUtils;
     private InstrumentedPreferenceFragment mFragment;
     private String mTargetPackage;
-    private PowerWhitelistBackend mPowerWhitelistBackend;
+    private PowerAllowlistBackend mPowerAllowlistBackend;
 
     public BackgroundActivityPreferenceController(Context context,
             InstrumentedPreferenceFragment fragment, int uid, String packageName) {
-        this(context, fragment, uid, packageName, PowerWhitelistBackend.getInstance(context));
+        this(context, fragment, uid, packageName, PowerAllowlistBackend.getInstance(context));
     }
 
     @VisibleForTesting
     BackgroundActivityPreferenceController(Context context, InstrumentedPreferenceFragment fragment,
-            int uid, String packageName, PowerWhitelistBackend backend) {
+            int uid, String packageName, PowerAllowlistBackend backend) {
         super(context);
-        mPowerWhitelistBackend = backend;
+        mPowerAllowlistBackend = backend;
         mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
         mDpm = (DevicePolicyManager) context.getSystemService(Context.DEVICE_POLICY_SERVICE);
         mAppOpsManager = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
@@ -84,8 +84,8 @@
         }
         final int mode = mAppOpsManager
                 .checkOpNoThrow(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, mUid, mTargetPackage);
-        final boolean whitelisted = mPowerWhitelistBackend.isWhitelisted(mTargetPackage);
-        if (whitelisted || mode == AppOpsManager.MODE_ERRORED
+        final boolean allowlisted = mPowerAllowlistBackend.isAllowlisted(mTargetPackage);
+        if (allowlisted || mode == AppOpsManager.MODE_ERRORED
                 || Utils.isProfileOrDeviceOwner(mUserManager, mDpm, mTargetPackage)) {
             preference.setEnabled(false);
         } else {
@@ -117,8 +117,8 @@
     }
 
     public void updateSummary(Preference preference) {
-        if (mPowerWhitelistBackend.isWhitelisted(mTargetPackage)) {
-            preference.setSummary(R.string.background_activity_summary_whitelisted);
+        if (mPowerAllowlistBackend.isAllowlisted(mTargetPackage)) {
+            preference.setSummary(R.string.background_activity_summary_allowlisted);
             return;
         }
         final int mode = mAppOpsManager
diff --git a/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java
index 4667e16..8d7bcd9 100644
--- a/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java
@@ -391,11 +391,11 @@
     }
 
     private boolean shouldShowSummary(BatterySipper sipper) {
-        final CharSequence[] whitelistPackages = mContext.getResources()
-                .getTextArray(R.array.whitelist_hide_summary_in_battery_usage);
+        final CharSequence[] allowlistPackages = mContext.getResources()
+                .getTextArray(R.array.allowlist_hide_summary_in_battery_usage);
         final String target = sipper.packageWithHighestDrain;
 
-        for (CharSequence packageName: whitelistPackages) {
+        for (CharSequence packageName: allowlistPackages) {
             if (TextUtils.equals(target, packageName)) {
                 return false;
             }
diff --git a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
index bfa43d1..468d8c5 100644
--- a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
@@ -34,6 +34,7 @@
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.widget.EntityHeaderController;
 import com.android.settingslib.Utils;
 import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -50,6 +51,8 @@
     static final String KEY_BATTERY_HEADER = "battery_header";
 
     @VisibleForTesting
+    BatteryStatusFeatureProvider mBatteryStatusFeatureProvider;
+    @VisibleForTesting
     BatteryMeterView mBatteryMeterView;
     @VisibleForTesting
     TextView mBatteryPercentText;
@@ -66,6 +69,8 @@
     public BatteryHeaderPreferenceController(Context context, String key) {
         super(context, key);
         mPowerManager = context.getSystemService(PowerManager.class);
+        mBatteryStatusFeatureProvider = FeatureFactory.getFactory(context)
+                .getBatteryStatusFeatureProvider(context);
     }
 
     public void setActivity(Activity activity) {
@@ -107,10 +112,12 @@
 
     public void updateHeaderPreference(BatteryInfo info) {
         mBatteryPercentText.setText(formatBatteryPercentageText(info.batteryLevel));
-        if (info.remainingLabel == null) {
-            mSummary1.setText(info.statusLabel);
-        } else {
-            mSummary1.setText(info.remainingLabel);
+        if (!mBatteryStatusFeatureProvider.triggerBatteryStatusUpdate(this, info)) {
+            if (info.remainingLabel == null) {
+                mSummary1.setText(info.statusLabel);
+            } else {
+                mSummary1.setText(info.remainingLabel);
+            }
         }
 
         mBatteryMeterView.setBatteryLevel(info.batteryLevel);
@@ -118,6 +125,13 @@
         mBatteryMeterView.setPowerSave(mPowerManager.isPowerSaveMode());
     }
 
+    /**
+     * Callback which receives text for the summary line.
+     */
+    public void updateBatteryStatus(String statusLabel) {
+        mSummary1.setText(statusLabel);
+    }
+
     public void quickUpdateHeaderPreference() {
         Intent batteryBroadcast = mContext.registerReceiver(null,
                 new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
diff --git a/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceController.java
index 7e00307..7c041e9 100644
--- a/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceController.java
@@ -27,7 +27,7 @@
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.fuelgauge.PowerWhitelistBackend;
+import com.android.settingslib.fuelgauge.PowerAllowlistBackend;
 
 /**
  * Controller that jumps to high power optimization fragment
@@ -38,7 +38,7 @@
     private static final String KEY_BACKGROUND_ACTIVITY = "battery_optimization";
 
 
-    private PowerWhitelistBackend mBackend;
+    private PowerAllowlistBackend mBackend;
     private DashboardFragment mFragment;
     private SettingsActivity mSettingsActivity;
     private String mPackageName;
@@ -49,12 +49,12 @@
         mFragment = fragment;
         mSettingsActivity = settingsActivity;
         mPackageName = packageName;
-        mBackend = PowerWhitelistBackend.getInstance(mSettingsActivity);
+        mBackend = PowerAllowlistBackend.getInstance(mSettingsActivity);
     }
 
     @VisibleForTesting
     BatteryOptimizationPreferenceController(SettingsActivity settingsActivity,
-            DashboardFragment fragment, String packageName, PowerWhitelistBackend backend) {
+            DashboardFragment fragment, String packageName, PowerAllowlistBackend backend) {
         super(settingsActivity);
         mFragment = fragment;
         mSettingsActivity = settingsActivity;
@@ -69,8 +69,8 @@
 
     @Override
     public void updateState(Preference preference) {
-        final boolean isWhitelisted = mBackend.isWhitelisted(mPackageName);
-        preference.setSummary(isWhitelisted ? R.string.high_power_on : R.string.high_power_off);
+        final boolean isAllowlisted = mBackend.isAllowlisted(mPackageName);
+        preference.setSummary(isAllowlisted ? R.string.high_power_on : R.string.high_power_off);
     }
 
     @Override
diff --git a/src/com/android/settings/fuelgauge/BatteryStatusFeatureProvider.java b/src/com/android/settings/fuelgauge/BatteryStatusFeatureProvider.java
new file mode 100644
index 0000000..c3fc247
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/BatteryStatusFeatureProvider.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.fuelgauge;
+
+/**
+ * Feature Provider used to retrieve battery status
+ */
+public interface BatteryStatusFeatureProvider {
+
+    /**
+     * Trigger a battery status update; return false if built-in status should be used.
+     */
+    boolean triggerBatteryStatusUpdate(
+            BatteryHeaderPreferenceController batteryHeaderPreferenceController, BatteryInfo info);
+}
diff --git a/src/com/android/settings/fuelgauge/BatteryStatusFeatureProviderImpl.java b/src/com/android/settings/fuelgauge/BatteryStatusFeatureProviderImpl.java
new file mode 100644
index 0000000..47d376d
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/BatteryStatusFeatureProviderImpl.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.fuelgauge;
+
+import android.content.Context;
+
+/**
+ * Used to override battery status string in Battery Header.
+ */
+public class BatteryStatusFeatureProviderImpl implements BatteryStatusFeatureProvider {
+
+    protected Context mContext;
+
+    public BatteryStatusFeatureProviderImpl(Context context) {
+        mContext = context.getApplicationContext();
+    }
+
+    @Override
+    public boolean triggerBatteryStatusUpdate(
+            BatteryHeaderPreferenceController batteryHeaderPreferenceController, BatteryInfo info) {
+        return false;
+    }
+}
diff --git a/src/com/android/settings/fuelgauge/BatteryUtils.java b/src/com/android/settings/fuelgauge/BatteryUtils.java
index 03387f9..4725459 100644
--- a/src/com/android/settings/fuelgauge/BatteryUtils.java
+++ b/src/com/android/settings/fuelgauge/BatteryUtils.java
@@ -50,7 +50,7 @@
 import com.android.settingslib.applications.AppUtils;
 import com.android.settingslib.fuelgauge.Estimate;
 import com.android.settingslib.fuelgauge.EstimateKt;
-import com.android.settingslib.fuelgauge.PowerWhitelistBackend;
+import com.android.settingslib.fuelgauge.PowerAllowlistBackend;
 import com.android.settingslib.utils.PowerUtil;
 import com.android.settingslib.utils.ThreadUtils;
 
@@ -578,7 +578,7 @@
     /**
      * Return {@code true} if we should hide anomaly app represented by {@code uid}
      */
-    public boolean shouldHideAnomaly(PowerWhitelistBackend powerWhitelistBackend, int uid,
+    public boolean shouldHideAnomaly(PowerAllowlistBackend powerAllowlistBackend, int uid,
             AnomalyInfo anomalyInfo) {
         final String[] packageNames = mPackageManager.getPackagesForUid(uid);
         if (ArrayUtils.isEmpty(packageNames)) {
@@ -586,7 +586,7 @@
             return true;
         }
 
-        return isSystemUid(uid) || powerWhitelistBackend.isWhitelisted(packageNames)
+        return isSystemUid(uid) || powerAllowlistBackend.isAllowlisted(packageNames)
                 || (isSystemApp(mPackageManager, packageNames) && !hasLauncherEntry(packageNames))
                 || (isExcessiveBackgroundAnomaly(anomalyInfo) && !isPreOApp(packageNames));
     }
diff --git a/src/com/android/settings/fuelgauge/FakeUid.java b/src/com/android/settings/fuelgauge/FakeUid.java
index 0e5fde1..c592f51 100644
--- a/src/com/android/settings/fuelgauge/FakeUid.java
+++ b/src/com/android/settings/fuelgauge/FakeUid.java
@@ -389,4 +389,9 @@
     public long[] getScreenOffCpuFreqTimes(int procState, int which) {
         return null;
     }
+
+    @Override
+    public double getProportionalSystemServiceUsage() {
+        return 0;
+    }
 }
diff --git a/src/com/android/settings/fuelgauge/HighPowerDetail.java b/src/com/android/settings/fuelgauge/HighPowerDetail.java
index 6448d9a..4ddbf8d 100644
--- a/src/com/android/settings/fuelgauge/HighPowerDetail.java
+++ b/src/com/android/settings/fuelgauge/HighPowerDetail.java
@@ -38,7 +38,7 @@
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
-import com.android.settingslib.fuelgauge.PowerWhitelistBackend;
+import com.android.settingslib.fuelgauge.PowerAllowlistBackend;
 
 public class HighPowerDetail extends InstrumentedDialogFragment implements OnClickListener,
         View.OnClickListener {
@@ -46,7 +46,7 @@
     private static final String ARG_DEFAULT_ON = "default_on";
 
     @VisibleForTesting
-    PowerWhitelistBackend mBackend;
+    PowerAllowlistBackend mBackend;
     @VisibleForTesting
     BatteryUtils mBatteryUtils;
     @VisibleForTesting
@@ -70,7 +70,7 @@
         super.onCreate(savedInstanceState);
         final Context context = getContext();
         mBatteryUtils = BatteryUtils.getInstance(context);
-        mBackend = PowerWhitelistBackend.getInstance(context);
+        mBackend = PowerAllowlistBackend.getInstance(context);
 
         mPackageName = getArguments().getString(AppInfoBase.ARG_PACKAGE_NAME);
         mPackageUid = getArguments().getInt(AppInfoBase.ARG_PACKAGE_UID);
@@ -81,7 +81,7 @@
             mLabel = mPackageName;
         }
         mDefaultOn = getArguments().getBoolean(ARG_DEFAULT_ON);
-        mIsEnabled = mDefaultOn || mBackend.isWhitelisted(mPackageName);
+        mIsEnabled = mDefaultOn || mBackend.isAllowlisted(mPackageName);
     }
 
     public Checkable setup(View view, boolean on) {
@@ -91,7 +91,7 @@
                 ? R.string.ignore_optimizations_on_desc : R.string.ignore_optimizations_off_desc);
         view.setClickable(true);
         view.setOnClickListener(this);
-        if (!on && mBackend.isSysWhitelisted(mPackageName)) {
+        if (!on && mBackend.isSysAllowlisted(mPackageName)) {
             view.setEnabled(false);
         }
         return (Checkable) view;
@@ -103,7 +103,7 @@
                 .setTitle(mLabel)
                 .setNegativeButton(R.string.cancel, null)
                 .setView(R.layout.ignore_optimizations_content);
-        if (!mBackend.isSysWhitelisted(mPackageName)) {
+        if (!mBackend.isSysAllowlisted(mPackageName)) {
             b.setPositiveButton(R.string.done, this);
         }
         return b.create();
@@ -137,7 +137,7 @@
     public void onClick(DialogInterface dialog, int which) {
         if (which == DialogInterface.BUTTON_POSITIVE) {
             boolean newValue = mIsEnabled;
-            boolean oldValue = mBackend.isWhitelisted(mPackageName);
+            boolean oldValue = mBackend.isAllowlisted(mPackageName);
             if (newValue != oldValue) {
                 logSpecialPermissionChange(newValue, mPackageName, getContext());
                 if (newValue) {
@@ -152,8 +152,8 @@
     }
 
     @VisibleForTesting
-    static void logSpecialPermissionChange(boolean whitelist, String packageName, Context context) {
-        int logCategory = whitelist ? SettingsEnums.APP_SPECIAL_PERMISSION_BATTERY_DENY
+    static void logSpecialPermissionChange(boolean allowlist, String packageName, Context context) {
+        int logCategory = allowlist ? SettingsEnums.APP_SPECIAL_PERMISSION_BATTERY_DENY
                 : SettingsEnums.APP_SPECIAL_PERMISSION_BATTERY_ALLOW;
         FeatureFactory.getFactory(context).getMetricsFeatureProvider().action(context, logCategory,
                 packageName);
@@ -173,16 +173,16 @@
     }
 
     public static CharSequence getSummary(Context context, String pkg) {
-        return getSummary(context, PowerWhitelistBackend.getInstance(context), pkg);
+        return getSummary(context, PowerAllowlistBackend.getInstance(context), pkg);
     }
 
     @VisibleForTesting
-    static CharSequence getSummary(Context context, PowerWhitelistBackend powerWhitelist,
+    static CharSequence getSummary(Context context, PowerAllowlistBackend powerAllowlist,
             String pkg) {
         return context.getString(
-                powerWhitelist.isSysWhitelisted(pkg) || powerWhitelist.isDefaultActiveApp(pkg)
+                powerAllowlist.isSysAllowlisted(pkg) || powerAllowlist.isDefaultActiveApp(pkg)
                         ? R.string.high_power_system
-                        : powerWhitelist.isWhitelisted(pkg)
+                        : powerAllowlist.isAllowlisted(pkg)
                                 ? R.string.high_power_on
                                 : R.string.high_power_off);
     }
diff --git a/src/com/android/settings/fuelgauge/InactiveApps.java b/src/com/android/settings/fuelgauge/InactiveApps.java
index aaee2b3..36a9734 100644
--- a/src/com/android/settings/fuelgauge/InactiveApps.java
+++ b/src/com/android/settings/fuelgauge/InactiveApps.java
@@ -77,7 +77,7 @@
         super.onCreate(icicle);
 
         mUsageStats = getActivity().getSystemService(UsageStatsManager.class);
-        addPreferencesFromResource(R.xml.dummy_preference_screen);
+        addPreferencesFromResource(R.xml.placeholder_preference_screen);
         getActivity().setTitle(R.string.inactive_apps_title);
     }
 
diff --git a/src/com/android/settings/fuelgauge/RequestIgnoreBatteryOptimizations.java b/src/com/android/settings/fuelgauge/RequestIgnoreBatteryOptimizations.java
index 27bd889..c06a4ff 100644
--- a/src/com/android/settings/fuelgauge/RequestIgnoreBatteryOptimizations.java
+++ b/src/com/android/settings/fuelgauge/RequestIgnoreBatteryOptimizations.java
@@ -22,10 +22,8 @@
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.IDeviceIdleController;
 import android.os.PowerManager;
-import android.os.RemoteException;
-import android.os.ServiceManager;
+import android.os.PowerWhitelistManager;
 import android.util.Log;
 
 import com.android.internal.app.AlertActivity;
@@ -36,17 +34,14 @@
         DialogInterface.OnClickListener {
     static final String TAG = "RequestIgnoreBatteryOptimizations";
 
-    private static final String DEVICE_IDLE_SERVICE = "deviceidle";
-
-    IDeviceIdleController mDeviceIdleService;
+    private PowerWhitelistManager mPowerWhitelistManager;
     String mPackageName;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        mDeviceIdleService = IDeviceIdleController.Stub.asInterface(
-                ServiceManager.getService(DEVICE_IDLE_SERVICE));
+        mPowerWhitelistManager = getSystemService(PowerWhitelistManager.class);
 
         Uri data = getIntent().getData();
         if (data == null) {
@@ -102,11 +97,7 @@
     public void onClick(DialogInterface dialog, int which) {
         switch (which) {
             case BUTTON_POSITIVE:
-                try {
-                    mDeviceIdleService.addPowerSaveWhitelistApp(mPackageName);
-                } catch (RemoteException e) {
-                    Log.w(TAG, "Unable to reach IDeviceIdleController", e);
-                }
+                mPowerWhitelistManager.addToWhitelist(mPackageName);
                 setResult(RESULT_OK);
                 break;
             case BUTTON_NEGATIVE:
diff --git a/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java b/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java
index 8b57234..93a95f3 100644
--- a/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java
+++ b/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java
@@ -46,7 +46,7 @@
 import com.android.settings.fuelgauge.PowerUsageFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
-import com.android.settingslib.fuelgauge.PowerWhitelistBackend;
+import com.android.settingslib.fuelgauge.PowerAllowlistBackend;
 import com.android.settingslib.utils.ThreadUtils;
 
 import java.util.ArrayList;
@@ -96,8 +96,8 @@
             final BatteryUtils batteryUtils = BatteryUtils.getInstance(this);
             final ContentResolver contentResolver = getContentResolver();
             final UserManager userManager = getSystemService(UserManager.class);
-            final PowerWhitelistBackend powerWhitelistBackend =
-                    PowerWhitelistBackend.getInstance(context);
+            final PowerAllowlistBackend powerAllowlistBackend =
+                    PowerAllowlistBackend.getInstance(context);
             final PowerUsageFeatureProvider powerUsageFeatureProvider = FeatureFactory
                     .getFactory(this).getPowerUsageFeatureProvider(this);
             final MetricsFeatureProvider metricsFeatureProvider = FeatureFactory
@@ -105,7 +105,7 @@
 
             for (JobWorkItem item = dequeueWork(params); item != null; item = dequeueWork(params)) {
                 saveAnomalyToDatabase(context, userManager,
-                        batteryDatabaseManager, batteryUtils, policy, powerWhitelistBackend,
+                        batteryDatabaseManager, batteryUtils, policy, powerAllowlistBackend,
                         contentResolver, powerUsageFeatureProvider, metricsFeatureProvider,
                         item.getIntent().getExtras());
 
@@ -127,7 +127,7 @@
     @VisibleForTesting
     void saveAnomalyToDatabase(Context context, UserManager userManager,
             BatteryDatabaseManager databaseManager, BatteryUtils batteryUtils,
-            BatteryTipPolicy policy, PowerWhitelistBackend powerWhitelistBackend,
+            BatteryTipPolicy policy, PowerAllowlistBackend powerAllowlistBackend,
             ContentResolver contentResolver, PowerUsageFeatureProvider powerUsageFeatureProvider,
             MetricsFeatureProvider metricsFeatureProvider, Bundle bundle) {
         // The Example of intentDimsValue is: 35:{1:{1:{1:10013|}|}|}
@@ -151,7 +151,7 @@
             final String packageName = batteryUtils.getPackageName(uid);
             final long versionCode = batteryUtils.getAppLongVersionCode(packageName);
             final String versionedPackage = packageName + "/" + versionCode;
-            if (batteryUtils.shouldHideAnomaly(powerWhitelistBackend, uid, anomalyInfo)) {
+            if (batteryUtils.shouldHideAnomaly(powerAllowlistBackend, uid, anomalyInfo)) {
                 metricsFeatureProvider.action(SettingsEnums.PAGE_UNKNOWN,
                         SettingsEnums.ACTION_ANOMALY_IGNORED,
                         SettingsEnums.PAGE_UNKNOWN,
diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java
index d615db6..4317bff 100644
--- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java
@@ -112,7 +112,7 @@
 
         for (int i = 0, size = batteryTips.size(); i < size; i++) {
             final BatteryTip batteryTip = mBatteryTips.get(i);
-            batteryTip.sanityCheck(mContext);
+            batteryTip.validateCheck(mContext);
             if (batteryTip.getState() != BatteryTip.StateType.INVISIBLE) {
                 batteryTip.updatePreference(mCardPreference);
                 mBatteryTipMap.put(mCardPreference.getKey(), batteryTip);
diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java
index ebc4939..12fcaba 100644
--- a/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java
+++ b/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java
@@ -17,7 +17,6 @@
 package com.android.settings.fuelgauge.batterytip.tips;
 
 import android.content.Context;
-import android.content.res.ColorStateList;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.util.SparseIntArray;
@@ -137,9 +136,9 @@
 
     /**
      * Check whether data is still make sense. If not, try recover.
-     * @param context used to do sanity check
+     * @param context used to do validate check
      */
-    public void sanityCheck(Context context) {
+    public void validateCheck(Context context) {
         // do nothing
     }
 
diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTip.java
index 1bd760b..c5f1171 100644
--- a/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTip.java
+++ b/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTip.java
@@ -107,8 +107,8 @@
     }
 
     @Override
-    public void sanityCheck(Context context) {
-        super.sanityCheck(context);
+    public void validateCheck(Context context) {
+        super.validateCheck(context);
 
         // Set it invisible if there is no valid app
         mRestrictAppList.removeIf(AppLabelPredicate.getInstance(context));
diff --git a/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java b/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java
index c3171b8..e4cea26 100644
--- a/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java
+++ b/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java
@@ -35,7 +35,7 @@
 
     private static final String PREF_KEY_VIDEO = "gesture_double_tap_screen_video";
 
-    private final String SECURE_KEY = DOZE_DOUBLE_TAP_GESTURE;
+    private static final String SECURE_KEY = DOZE_DOUBLE_TAP_GESTURE;
 
     private AmbientDisplayConfiguration mAmbientConfig;
     @UserIdInt
diff --git a/src/com/android/settings/gestures/OneHandedAppTapsExitPreferenceController.java b/src/com/android/settings/gestures/OneHandedAppTapsExitPreferenceController.java
new file mode 100644
index 0000000..c49199c
--- /dev/null
+++ b/src/com/android/settings/gestures/OneHandedAppTapsExitPreferenceController.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import android.content.Context;
+import android.net.Uri;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.core.TogglePreferenceController;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
+
+/**
+ * The Controller to handle app taps to exit of one-handed mode
+ */
+public class OneHandedAppTapsExitPreferenceController extends TogglePreferenceController implements
+        LifecycleObserver, OnStart, OnStop, OneHandedSettingsUtils.TogglesCallback {
+
+    private Preference mPreference;
+    private final OneHandedSettingsUtils mUtils;
+
+    public OneHandedAppTapsExitPreferenceController(Context context, String key) {
+        super(context, key);
+        mUtils = new OneHandedSettingsUtils(context);
+
+        // By default, app taps to stop one-handed is enabled, this will get default value once.
+        OneHandedSettingsUtils.setSettingsTapsAppToExit(mContext, isChecked());
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return OneHandedSettingsUtils.isOneHandedModeEnabled(mContext)
+                ? AVAILABLE : DISABLED_DEPENDENT_SETTING;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+
+        final int availabilityStatus = getAvailabilityStatus();
+        preference.setEnabled(
+                availabilityStatus == AVAILABLE || availabilityStatus == AVAILABLE_UNSEARCHABLE);
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        return OneHandedSettingsUtils.setSettingsTapsAppToExit(mContext, isChecked);
+    }
+
+    @Override
+    public boolean isChecked() {
+        return OneHandedSettingsUtils.getSettingsTapsAppToExit(mContext);
+    }
+
+    @Override
+    public void onStart() {
+        mUtils.registerToggleAwareObserver(this);
+    }
+
+    @Override
+    public void onStop() {
+        mUtils.unregisterToggleAwareObserver();
+    }
+
+    @Override
+    public void onChange(Uri uri) {
+        updateState(mPreference);
+    }
+}
diff --git a/src/com/android/settings/gestures/OneHandedEnablePreferenceController.java b/src/com/android/settings/gestures/OneHandedEnablePreferenceController.java
new file mode 100644
index 0000000..c6db4ea
--- /dev/null
+++ b/src/com/android/settings/gestures/OneHandedEnablePreferenceController.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import android.content.Context;
+import android.os.SystemProperties;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.core.TogglePreferenceController;
+
+/**
+ * The controller to handle one-handed mode enable or disable state.
+ **/
+public class OneHandedEnablePreferenceController extends TogglePreferenceController {
+
+    static final String SUPPORT_ONE_HANDED_MODE = "ro.support_one_handed_mode";
+
+    public OneHandedEnablePreferenceController(Context context, String key) {
+        super(context, key);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return SystemProperties.getBoolean(SUPPORT_ONE_HANDED_MODE, false)
+                ? BasePreferenceController.AVAILABLE
+                : BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        OneHandedSettingsUtils.setSettingsOneHandedModeEnabled(mContext,
+                isChecked);
+        return true;
+    }
+
+    @Override
+    public boolean isChecked() {
+        return OneHandedSettingsUtils.isOneHandedModeEnabled(mContext);
+    }
+
+    @Override
+    public CharSequence getSummary() {
+        return OneHandedSettingsUtils.isOneHandedModeEnabled(mContext)
+                ? mContext.getText(R.string.switch_on_text)
+                : mContext.getText(R.string.switch_off_text);
+    }
+}
diff --git a/src/com/android/settings/gestures/OneHandedSettings.java b/src/com/android/settings/gestures/OneHandedSettings.java
new file mode 100644
index 0000000..2449cf2
--- /dev/null
+++ b/src/com/android/settings/gestures/OneHandedSettings.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.os.SystemProperties;
+
+import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.search.SearchIndexable;
+
+/**
+ * The Fragment for one-handed mode settings.
+ */
+@SearchIndexable
+public class OneHandedSettings extends DashboardFragment {
+
+    private static final String TAG = "OneHandedSettings";
+
+    @Override
+    public int getMetricsCategory() {
+        return SettingsEnums.SETTINGS_ONE_HANDED;
+    }
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.one_handed_settings;
+    }
+
+    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider(R.xml.one_handed_settings) {
+                @Override
+                protected boolean isPageSearchEnabled(Context context) {
+                    return SystemProperties.getBoolean(
+                            OneHandedEnablePreferenceController.SUPPORT_ONE_HANDED_MODE, false);
+                }
+            };
+}
diff --git a/src/com/android/settings/gestures/OneHandedSettingsUtils.java b/src/com/android/settings/gestures/OneHandedSettingsUtils.java
new file mode 100644
index 0000000..f3d7e33
--- /dev/null
+++ b/src/com/android/settings/gestures/OneHandedSettingsUtils.java
@@ -0,0 +1,173 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.database.ContentObserver;
+import android.net.Uri;
+import android.os.Handler;
+import android.os.Looper;
+import android.provider.Settings;
+
+/**
+ * The Util to query one-handed mode settings config
+ */
+public class OneHandedSettingsUtils {
+
+    public enum OneHandedTimeout {
+        NEVER(0), SHORT(4), MEDIUM(8), LONG(12);
+
+        private final int mValue;
+
+        OneHandedTimeout(int value) {
+            this.mValue = value;
+        }
+
+        public int getValue() {
+            return mValue;
+        }
+    }
+
+    private final Context mContext;
+    private final SettingsObserver mSettingsObserver;
+
+    OneHandedSettingsUtils(Context context) {
+        mContext = context;
+        mSettingsObserver = new SettingsObserver(new Handler(Looper.getMainLooper()));
+    }
+
+    /**
+     * Get one-handed mode enable or disable flag from Settings provider.
+     *
+     * @param context App context
+     * @return enable or disable one-handed mode flag.
+     */
+    public static boolean isOneHandedModeEnabled(Context context) {
+        return Settings.Secure.getInt(context.getContentResolver(),
+                Settings.Secure.ONE_HANDED_MODE_ENABLED, 0) == 1;
+    }
+
+    /**
+     * Set one-handed mode enable or disable flag to Settings provider.
+     *
+     * @param context App context
+     * @param enable enable or disable one-handed mode.
+     */
+    public static void setSettingsOneHandedModeEnabled(Context context, boolean enable) {
+        Settings.Secure.putInt(context.getContentResolver(),
+                Settings.Secure.ONE_HANDED_MODE_ENABLED, enable ? 1 : 0);
+    }
+
+    /**
+     * Get enabling taps app to exit one-handed mode flag from Settings provider.
+     *
+     * @param context App context
+     * @return enable or disable taps app to exit.
+     */
+    public static boolean getSettingsTapsAppToExit(Context context) {
+        return Settings.Secure.getInt(context.getContentResolver(),
+                Settings.Secure.TAPS_APP_TO_EXIT, 1) == 1;
+    }
+
+    /**
+     * Set enabling taps app to exit one-handed mode flag to Settings provider.
+     *
+     * @param context App context
+     * @param enable  enable or disable when taping app to exit one-handed mode.
+     */
+    public static boolean setSettingsTapsAppToExit(Context context, boolean enable) {
+        return Settings.Secure.putInt(context.getContentResolver(),
+                Settings.Secure.TAPS_APP_TO_EXIT, enable ? 1 : 0);
+    }
+
+    /**
+     * Get one-handed mode timeout value from Settings provider.
+     *
+     * @param context App context
+     * @return timeout value in seconds.
+     */
+    public static int getSettingsOneHandedModeTimeout(Context context) {
+        return Settings.Secure.getInt(context.getContentResolver(),
+                Settings.Secure.ONE_HANDED_MODE_TIMEOUT,
+                OneHandedTimeout.MEDIUM.getValue() /* default MEDIUM(8) by UX */);
+    }
+
+    /**
+     * Set one-handed mode timeout value to Settings provider.
+     *
+     * @param context App context
+     * @param timeout timeout in seconds for exiting one-handed mode.
+     */
+    public static void setSettingsOneHandedModeTimeout(Context context, int timeout) {
+        Settings.Secure.putInt(context.getContentResolver(),
+                Settings.Secure.ONE_HANDED_MODE_TIMEOUT, timeout);
+    }
+
+    /**
+     * Register callback for observing Settings.Secure.ONE_HANDED_MODE_ENABLED state.
+     * @param callback for state changes
+     */
+    public void registerToggleAwareObserver(TogglesCallback callback) {
+        mSettingsObserver.observe();
+        mSettingsObserver.setCallback(callback);
+    }
+
+    /**
+     * Unregister callback for observing Settings.Secure.ONE_HANDED_MODE_ENABLED state.
+     */
+    public void unregisterToggleAwareObserver() {
+        final ContentResolver resolver = mContext.getContentResolver();
+        resolver.unregisterContentObserver(mSettingsObserver);
+    }
+
+    private final class SettingsObserver extends ContentObserver {
+        private TogglesCallback mCallback;
+
+        private final Uri mOneHandedEnabledAware = Settings.Secure.getUriFor(
+                Settings.Secure.ONE_HANDED_MODE_ENABLED);
+
+        SettingsObserver(Handler handler) {
+            super(handler);
+        }
+
+        private void setCallback(TogglesCallback callback) {
+            mCallback = callback;
+        }
+
+        public void observe() {
+            final ContentResolver resolver = mContext.getContentResolver();
+            resolver.registerContentObserver(mOneHandedEnabledAware, true, this);
+        }
+
+        @Override
+        public void onChange(boolean selfChange, Uri uri) {
+            if (mCallback != null) mCallback.onChange(uri);
+        }
+    }
+
+    /**
+     * An interface for when Settings.Secure key state changes.
+     */
+    public interface TogglesCallback {
+        /**
+         * Callback method for Settings.Secure key state changes.
+         * @param uri
+         */
+        void onChange(Uri uri);
+    }
+}
diff --git a/src/com/android/settings/gestures/OneHandedTimeoutPreferenceController.java b/src/com/android/settings/gestures/OneHandedTimeoutPreferenceController.java
new file mode 100644
index 0000000..90ff9a6
--- /dev/null
+++ b/src/com/android/settings/gestures/OneHandedTimeoutPreferenceController.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import android.content.Context;
+import android.net.Uri;
+
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * The Controller to handle one-handed mode timeout state.
+ **/
+public class OneHandedTimeoutPreferenceController extends BasePreferenceController implements
+        Preference.OnPreferenceChangeListener, LifecycleObserver, OnStart, OnStop,
+        OneHandedSettingsUtils.TogglesCallback {
+
+    private final Map<String, String> mTimeoutMap;
+    private Preference mTimeoutPreference;
+    private final OneHandedSettingsUtils mUtils;
+
+    public OneHandedTimeoutPreferenceController(Context context, String preferenceKey) {
+        super(context, preferenceKey);
+        mTimeoutMap = new HashMap<>();
+        initTimeoutMap();
+        mUtils = new OneHandedSettingsUtils(context);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return OneHandedSettingsUtils.isOneHandedModeEnabled(mContext)
+                ? AVAILABLE : DISABLED_DEPENDENT_SETTING;
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object object) {
+        if (!(preference instanceof ListPreference)) {
+            return false;
+        }
+        final int newValue = Integer.parseInt((String) object);
+        OneHandedSettingsUtils.setSettingsOneHandedModeTimeout(mContext, newValue);
+        updateState(preference);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+        if (!(preference instanceof ListPreference)) {
+            return;
+        }
+        final ListPreference listPreference = (ListPreference) preference;
+        listPreference.setValue(getTimeoutValue());
+
+        final int availabilityStatus = getAvailabilityStatus();
+        preference.setEnabled(
+                availabilityStatus == AVAILABLE || availabilityStatus == AVAILABLE_UNSEARCHABLE);
+    }
+
+    @Override
+    public CharSequence getSummary() {
+        if (OneHandedSettingsUtils.getSettingsOneHandedModeTimeout(mContext) == 0) {
+            return mContext.getResources().getString(R.string.screensaver_settings_summary_never);
+        }
+        return String.format(mContext.getResources().getString(
+                R.string.screen_timeout_summary), mTimeoutMap.get(getTimeoutValue()));
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mTimeoutPreference = screen.findPreference(mPreferenceKey);
+    }
+
+    @Override
+    public void onStart() {
+        mUtils.registerToggleAwareObserver(this);
+    }
+
+    @Override
+    public void onStop() {
+        mUtils.unregisterToggleAwareObserver();
+    }
+
+    @Override
+    public void onChange(Uri uri) {
+        updateState(mTimeoutPreference);
+    }
+
+    private String getTimeoutValue() {
+        return String.valueOf(OneHandedSettingsUtils.getSettingsOneHandedModeTimeout(mContext));
+    }
+
+    private void initTimeoutMap() {
+        if (mTimeoutMap.size() != 0) {
+            return;
+        }
+
+        final String[] timeoutValues = mContext.getResources().getStringArray(
+                R.array.one_handed_timeout_values);
+        final String[] timeoutTitles = mContext.getResources().getStringArray(
+                R.array.one_handed_timeout_title);
+
+        if (timeoutValues.length != timeoutTitles.length) {
+            return;
+        }
+
+        for (int i = 0; i < timeoutValues.length; i++) {
+            mTimeoutMap.put(timeoutValues[i], timeoutTitles[i]);
+        }
+    }
+}
diff --git a/src/com/android/settings/gestures/PanicGesturePreferenceController.java b/src/com/android/settings/gestures/PanicGesturePreferenceController.java
new file mode 100644
index 0000000..947cbb9
--- /dev/null
+++ b/src/com/android/settings/gestures/PanicGesturePreferenceController.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.text.TextUtils;
+
+import androidx.annotation.VisibleForTesting;
+
+import com.android.settings.R;
+
+/**
+ * Preference controller for emergency sos gesture setting
+ */
+public class PanicGesturePreferenceController extends GesturePreferenceController {
+
+    @VisibleForTesting
+    static final int ON = 1;
+    @VisibleForTesting
+    static final int OFF = 0;
+
+    private static final String PREF_KEY_VIDEO = "panic_button_screen_video";
+
+    private static final String SECURE_KEY = Settings.Secure.PANIC_GESTURE_ENABLED;
+
+    public PanicGesturePreferenceController(Context context, String key) {
+        super(context, key);
+    }
+
+    private static boolean isGestureAvailable(Context context) {
+        return context.getResources()
+                .getBoolean(R.bool.config_show_panic_gesture_settings);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return isGestureAvailable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+    }
+
+    @Override
+    public boolean isSliceable() {
+        return TextUtils.equals(getPreferenceKey(), "gesture_panic_button");
+    }
+
+    @Override
+    protected String getVideoPrefKey() {
+        return PREF_KEY_VIDEO;
+    }
+
+    @Override
+    public boolean isChecked() {
+        return Settings.Secure.getInt(mContext.getContentResolver(), SECURE_KEY, OFF) == ON;
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        return Settings.Secure.putInt(mContext.getContentResolver(), SECURE_KEY,
+                isChecked ? ON : OFF);
+    }
+}
diff --git a/src/com/android/settings/gestures/PanicGestureSettings.java b/src/com/android/settings/gestures/PanicGestureSettings.java
new file mode 100644
index 0000000..c296047
--- /dev/null
+++ b/src/com/android/settings/gestures/PanicGestureSettings.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import android.app.settings.SettingsEnums;
+
+import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.search.SearchIndexable;
+
+/**
+ * Settings page for emergency sos gesture
+ */
+@SearchIndexable
+public class PanicGestureSettings extends DashboardFragment {
+
+    private static final String TAG = "PanicGestureSettings";
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.panic_gesture_settings;
+    }
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return SettingsEnums.EMERGENCY_SOS_GESTURE_SETTINGS;
+    }
+
+    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider(R.xml.panic_gesture_settings);
+}
diff --git a/src/com/android/settings/gestures/PanicGestureSoundPreferenceController.java b/src/com/android/settings/gestures/PanicGestureSoundPreferenceController.java
new file mode 100644
index 0000000..332636a
--- /dev/null
+++ b/src/com/android/settings/gestures/PanicGestureSoundPreferenceController.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.annotation.VisibleForTesting;
+
+import com.android.settings.R;
+import com.android.settings.core.TogglePreferenceController;
+
+/**
+ * Preference controller for emergency sos gesture setting
+ */
+public class PanicGestureSoundPreferenceController extends TogglePreferenceController {
+
+    @VisibleForTesting
+    static final int ON = 1;
+    @VisibleForTesting
+    static final int OFF = 0;
+
+    private static final String SECURE_KEY = Settings.Secure.PANIC_SOUND_ENABLED;
+
+    public PanicGestureSoundPreferenceController(Context context, String key) {
+        super(context, key);
+    }
+
+    private static boolean isGestureAvailable(Context context) {
+        return context.getResources()
+                .getBoolean(R.bool.config_show_panic_gesture_settings);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return isGestureAvailable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+    }
+
+    @Override
+    public boolean isSliceable() {
+        return false;
+    }
+
+    @Override
+    public boolean isChecked() {
+        return Settings.Secure.getInt(mContext.getContentResolver(), SECURE_KEY, ON) == ON;
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        return Settings.Secure.putInt(mContext.getContentResolver(), SECURE_KEY,
+                isChecked ? ON : OFF);
+    }
+}
diff --git a/src/com/android/settings/gestures/SwipeBottomToNotificationPreferenceController.java b/src/com/android/settings/gestures/SwipeBottomToNotificationPreferenceController.java
new file mode 100644
index 0000000..5eba539
--- /dev/null
+++ b/src/com/android/settings/gestures/SwipeBottomToNotificationPreferenceController.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import static android.provider.Settings.Secure.SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED;
+
+import static com.android.settings.gestures.OneHandedEnablePreferenceController.SUPPORT_ONE_HANDED_MODE;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.provider.Settings;
+import android.text.TextUtils;
+
+import com.android.settings.R;
+import com.android.settings.core.TogglePreferenceController;
+
+/**
+ * Handles swipe bottom to expand notification panel gesture.
+ **/
+public class SwipeBottomToNotificationPreferenceController extends TogglePreferenceController {
+
+    private static final int ON = 1;
+    private static final int OFF = 0;
+
+    private static final String PREF_KEY = "gesture_swipe_bottom_to_notification";
+
+    public SwipeBottomToNotificationPreferenceController(Context context, String key) {
+        super(context, key);
+    }
+
+    /** Indicates whether the gesture is available or not. */
+    public static boolean isGestureAvailable(Context context) {
+        // Disable the gesture once One-Handed mode gesture enabled.
+        if (SystemProperties.getBoolean(SUPPORT_ONE_HANDED_MODE, false)) {
+            return !OneHandedSettingsUtils.isOneHandedModeEnabled(context);
+        }
+        return true;
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return isGestureAvailable(mContext) ? AVAILABLE : DISABLED_DEPENDENT_SETTING;
+    }
+
+    @Override
+    public boolean isSliceable() {
+        return TextUtils.equals(getPreferenceKey(), PREF_KEY);
+    }
+
+    @Override
+    public boolean isPublicSlice() {
+        return true;
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED, isChecked ? ON : OFF);
+        return true;
+    }
+
+    @Override
+    public boolean isChecked() {
+        return Settings.Secure.getInt(mContext.getContentResolver(),
+                SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED, OFF) == ON;
+    }
+
+    @Override
+    public CharSequence getSummary() {
+        // This toggle preference summary will be updated in gesture preference page since we bound
+        // it with entry preference in gesture.xml
+        return mContext.getText(
+                isChecked() ? R.string.gesture_setting_on : R.string.gesture_setting_off);
+    }
+}
diff --git a/src/com/android/settings/gestures/SwipeBottomToNotificationSettings.java b/src/com/android/settings/gestures/SwipeBottomToNotificationSettings.java
new file mode 100644
index 0000000..d0441f3
--- /dev/null
+++ b/src/com/android/settings/gestures/SwipeBottomToNotificationSettings.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+
+import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+
+/**
+ * The Fragment for swipe bottom to notification gesture settings.
+ */
+public class SwipeBottomToNotificationSettings extends DashboardFragment {
+
+    private static final String TAG = "SwipeBottomToNotificationSettings";
+
+    @Override
+    public int getMetricsCategory() {
+        return SettingsEnums.SETTINGS_SWIPE_BOTTOM_TO_NOTIFICATION;
+    }
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.swipe_bottom_to_notification_settings;
+    }
+
+    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider(R.xml.swipe_bottom_to_notification_settings) {
+
+                @Override
+                protected boolean isPageSearchEnabled(Context context) {
+                    return SwipeBottomToNotificationPreferenceController
+                            .isGestureAvailable(context);
+                }
+            };
+}
diff --git a/src/com/android/settings/homepage/contextualcards/ContextualCardsFragment.java b/src/com/android/settings/homepage/contextualcards/ContextualCardsFragment.java
index 9f0023a..3b75ebf 100644
--- a/src/com/android/settings/homepage/contextualcards/ContextualCardsFragment.java
+++ b/src/com/android/settings/homepage/contextualcards/ContextualCardsFragment.java
@@ -40,7 +40,6 @@
 import com.android.settings.homepage.contextualcards.slices.BluetoothUpdateWorker;
 import com.android.settings.homepage.contextualcards.slices.SwipeDismissalDelegate;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.wifi.slice.ContextualWifiScanWorker;
 
 public class ContextualCardsFragment extends InstrumentedFragment implements
         FocusRecyclerView.FocusListener {
@@ -80,7 +79,6 @@
         super.onStart();
         registerScreenOffReceiver();
         registerKeyEventReceiver();
-        ContextualWifiScanWorker.newVisibleUiSession();
         mContextualCardManager.loadContextualCards(LoaderManager.getInstance(this),
                 sRestartLoaderNeeded);
         sRestartLoaderNeeded = false;
diff --git a/src/com/android/settings/inputmethod/SpellCheckersSettings.java b/src/com/android/settings/inputmethod/SpellCheckersSettings.java
index 017c101..dcd3703 100644
--- a/src/com/android/settings/inputmethod/SpellCheckersSettings.java
+++ b/src/com/android/settings/inputmethod/SpellCheckersSettings.java
@@ -93,8 +93,8 @@
         super.onResume();
         mSwitchBar = ((SettingsActivity) getActivity()).getSwitchBar();
         mSwitchBar.setSwitchBarText(
-                R.string.spell_checker_master_switch_title,
-                R.string.spell_checker_master_switch_title);
+                R.string.spell_checker_primary_switch_title,
+                R.string.spell_checker_primary_switch_title);
         mSwitchBar.show();
         mSwitchBar.addOnSwitchChangeListener(this);
         updatePreferenceScreen();
diff --git a/src/com/android/settings/location/LocationEnabler.java b/src/com/android/settings/location/LocationEnabler.java
index db53973..ab59b8e 100644
--- a/src/com/android/settings/location/LocationEnabler.java
+++ b/src/com/android/settings/location/LocationEnabler.java
@@ -109,7 +109,7 @@
 
         if (isRestricted()) {
             // Location toggling disabled by user restriction. Read the current location mode to
-            // update the location master switch.
+            // update the location primary switch.
             if (Log.isLoggable(TAG, Log.INFO)) {
                 Log.i(TAG, "Restricted user, not setting location mode");
             }
diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java
index 26a4afd..4391811 100644
--- a/src/com/android/settings/location/LocationSettings.java
+++ b/src/com/android/settings/location/LocationSettings.java
@@ -41,7 +41,7 @@
  * <ul>
  *     <li>Platform location controls</li>
  *     <ul>
- *         <li>In switch bar: location master switch. Used to toggle location on and off.
+ *         <li>In switch bar: location primary switch. Used to toggle location on and off.
  *         </li>
  *     </ul>
  *     <li>Recent location requests: automatically populated by {@link RecentLocationApps}</li>
@@ -71,8 +71,8 @@
         super.onActivityCreated(savedInstanceState);
         final SettingsActivity activity = (SettingsActivity) getActivity();
         final SwitchBar switchBar = activity.getSwitchBar();
-        switchBar.setSwitchBarText(R.string.location_settings_master_switch_title,
-                R.string.location_settings_master_switch_title);
+        switchBar.setSwitchBarText(R.string.location_settings_primary_switch_title,
+                R.string.location_settings_primary_switch_title);
         mSwitchBarController = new LocationSwitchBarController(activity, switchBar,
                 getSettingsLifecycle());
         switchBar.show();
diff --git a/src/com/android/settings/location/LocationSwitchBarController.java b/src/com/android/settings/location/LocationSwitchBarController.java
index 7aa66ce..e8458d1 100644
--- a/src/com/android/settings/location/LocationSwitchBarController.java
+++ b/src/com/android/settings/location/LocationSwitchBarController.java
@@ -60,9 +60,9 @@
 
     @Override
     public void onLocationModeChanged(int mode, boolean restricted) {
-        // Restricted user can't change the location mode, so disable the master switch. But in some
-        // corner cases, the location might still be enabled. In such case the master switch should
-        // be disabled but checked.
+        // Restricted user can't change the location mode, so disable the primary switch. But in
+        // some corner cases, the location might still be enabled. In such case the primary switch
+        // should be disabled but checked.
         final boolean enabled = mLocationEnabler.isEnabled(mode);
         final int userId = UserHandle.myUserId();
         final RestrictedLockUtils.EnforcedAdmin admin =
@@ -90,7 +90,7 @@
     }
 
     /**
-     * Listens to the state change of the location master switch.
+     * Listens to the state change of the location primary switch.
      */
     @Override
     public void onSwitchChanged(Switch switchView, boolean isChecked) {
diff --git a/src/com/android/settings/media/BluetoothPairingReceiver.java b/src/com/android/settings/media/BluetoothPairingReceiver.java
new file mode 100644
index 0000000..5b57800
--- /dev/null
+++ b/src/com/android/settings/media/BluetoothPairingReceiver.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.media;
+
+import android.app.settings.SettingsEnums;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.text.TextUtils;
+
+import com.android.settings.R;
+import com.android.settings.bluetooth.BluetoothPairingDetail;
+import com.android.settings.core.SubSettingLauncher;
+import com.android.settingslib.media.MediaOutputSliceConstants;
+
+/**
+ * BroadcastReceiver for handling media output intent
+ */
+public class BluetoothPairingReceiver extends BroadcastReceiver {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        if (TextUtils.equals(MediaOutputSliceConstants.ACTION_LAUNCH_BLUETOOTH_PAIRING,
+                intent.getAction())) {
+            context.startActivity(new SubSettingLauncher(context)
+                    .setDestination(BluetoothPairingDetail.class.getName())
+                    .setTitleRes(R.string.bluetooth_pairing_page_title)
+                    .setSourceMetricsCategory(SettingsEnums.BLUETOOTH_PAIRING_RECEIVER)
+                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK)
+                    .toIntent());
+        }
+    }
+}
diff --git a/src/com/android/settings/media/MediaOutputSlice.java b/src/com/android/settings/media/MediaOutputSlice.java
index 94a4f50..b9d43b4 100644
--- a/src/com/android/settings/media/MediaOutputSlice.java
+++ b/src/com/android/settings/media/MediaOutputSlice.java
@@ -106,10 +106,15 @@
             final MediaDevice connectedDevice = worker.getCurrentConnectedMediaDevice();
             if (devices.size() == 1) {
                 // Zero state
-                for (MediaDevice device : devices) {
-                    addRow(device, device, listBuilder);
+                final MediaDevice device = devices.iterator().next();
+                addRow(device, device, listBuilder);
+                // Add "pair new" only when local output device exists
+                final int type = device.getDeviceType();
+                if (type == MediaDevice.MediaDeviceType.TYPE_PHONE_DEVICE
+                        || type == MediaDevice.MediaDeviceType.TYPE_3POINT5_MM_AUDIO_DEVICE
+                        || type == MediaDevice.MediaDeviceType.TYPE_USB_C_AUDIO_DEVICE) {
+                    listBuilder.addRow(getPairNewRow());
                 }
-                listBuilder.addRow(getPairNewRow());
             } else {
                 final boolean isTouched = worker.getIsTouched();
                 // Fix the last top device when user press device to transfer.
diff --git a/src/com/android/settings/media/RemoteMediaSlice.java b/src/com/android/settings/media/RemoteMediaSlice.java
index 61a53f3..510a60e 100644
--- a/src/com/android/settings/media/RemoteMediaSlice.java
+++ b/src/com/android/settings/media/RemoteMediaSlice.java
@@ -91,7 +91,6 @@
                 R.drawable.ic_volume_remote);
         // To create an empty icon to indent the row
         final IconCompat emptyIcon = createEmptyIcon();
-        int requestCode = 0;
         for (RoutingSessionInfo info : infos) {
             final int maxVolume = info.getVolumeMax();
             if (maxVolume <= 0) {
@@ -104,7 +103,7 @@
             listBuilder.addInputRange(new InputRangeBuilder()
                     .setTitleItem(icon, ListBuilder.ICON_IMAGE)
                     .setTitle(castVolume)
-                    .setInputAction(getSliderInputAction(requestCode++, info.getId()))
+                    .setInputAction(getSliderInputAction(info.getId().hashCode(), info.getId()))
                     .setPrimaryAction(getSoundSettingAction(castVolume, icon, info.getId()))
                     .setMax(maxVolume)
                     .setValue(info.getVolume()));
diff --git a/src/com/android/settings/network/AdaptiveConnectivityPreferenceController.java b/src/com/android/settings/network/AdaptiveConnectivityPreferenceController.java
new file mode 100644
index 0000000..33d1d5b
--- /dev/null
+++ b/src/com/android/settings/network/AdaptiveConnectivityPreferenceController.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+
+/**
+ * {@link BasePreferenceController} that shows Adaptive connectivity on/off state.
+ */
+public class AdaptiveConnectivityPreferenceController extends BasePreferenceController {
+
+    public AdaptiveConnectivityPreferenceController(Context context, String preferenceKey) {
+        super(context, preferenceKey);
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return mContext.getResources().getBoolean(R.bool.config_show_adaptive_connectivity)
+                ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+    }
+
+    @Override
+    public CharSequence getSummary() {
+        return Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ADAPTIVE_CONNECTIVITY_ENABLED, 1) == 1
+                ? mContext.getString(R.string.switch_on_text)
+                : mContext.getString(R.string.switch_off_text);
+    }
+}
diff --git a/src/com/android/settings/network/AdaptiveConnectivitySettings.java b/src/com/android/settings/network/AdaptiveConnectivitySettings.java
new file mode 100644
index 0000000..5e1dc12
--- /dev/null
+++ b/src/com/android/settings/network/AdaptiveConnectivitySettings.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.network;
+
+import android.app.settings.SettingsEnums;
+
+import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.search.SearchIndexable;
+
+/**
+ * Adaptive connectivity is a feature which automatically manages network connections.
+ */
+@SearchIndexable
+public class AdaptiveConnectivitySettings extends DashboardFragment {
+
+    private static final String TAG = "AdaptiveConnectivitySettings";
+
+    private static final String KEY_ADAPTIVE_CONNECTIVITY_PREFERENCE = "adaptive_connectivity";
+
+    @Override
+    public int getMetricsCategory() {
+        return SettingsEnums.ADAPTIVE_CONNECTIVITY_CATEGORY;
+    }
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.adaptive_connectivity_settings;
+    }
+
+    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider(R.xml.adaptive_connectivity_settings);
+}
diff --git a/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceController.java b/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceController.java
new file mode 100644
index 0000000..e072b5c
--- /dev/null
+++ b/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceController.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.core.TogglePreferenceController;
+
+/**
+ * {@link TogglePreferenceController} that controls whether Adaptive connectivity option is enabled.
+ */
+public class AdaptiveConnectivityTogglePreferenceController extends TogglePreferenceController {
+
+    public AdaptiveConnectivityTogglePreferenceController(Context context, String preferenceKey) {
+        super(context, preferenceKey);
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE;
+    }
+
+    @Override
+    public boolean isChecked() {
+        return Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ADAPTIVE_CONNECTIVITY_ENABLED, 1) == 1;
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ADAPTIVE_CONNECTIVITY_ENABLED,
+                isChecked ? 1 : 0);
+        return true;
+    }
+}
diff --git a/src/com/android/settings/network/AllInOneTetherPreferenceController.java b/src/com/android/settings/network/AllInOneTetherPreferenceController.java
index 75453b4..cc55e7a 100644
--- a/src/com/android/settings/network/AllInOneTetherPreferenceController.java
+++ b/src/com/android/settings/network/AllInOneTetherPreferenceController.java
@@ -42,8 +42,8 @@
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.core.FeatureFlags;
-import com.android.settings.widget.MasterSwitchController;
-import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settings.widget.PrimarySwitchController;
+import com.android.settings.widget.PrimarySwitchPreference;
 import com.android.settingslib.TetherUtil;
 
 import java.util.concurrent.atomic.AtomicReference;
@@ -75,7 +75,7 @@
                 }
             };
 
-    private MasterSwitchPreference mPreference;
+    private PrimarySwitchPreference mPreference;
     private TetherEnabler mTetherEnabler;
 
     @VisibleForTesting(otherwise = VisibleForTesting.NONE)
@@ -191,7 +191,7 @@
     void initEnabler(Lifecycle lifecycle) {
         if (mPreference != null) {
             mTetherEnabler = new TetherEnabler(
-                    mContext, new MasterSwitchController(mPreference), mBluetoothPan);
+                    mContext, new PrimarySwitchController(mPreference), mBluetoothPan);
             if (lifecycle != null) {
                 lifecycle.addObserver(mTetherEnabler);
             }
diff --git a/src/com/android/settings/network/ApnEditor.java b/src/com/android/settings/network/ApnEditor.java
index f9eccfa..a852fd6 100644
--- a/src/com/android/settings/network/ApnEditor.java
+++ b/src/com/android/settings/network/ApnEditor.java
@@ -726,6 +726,9 @@
                         telephonyManager = telephonyManagerForSubId;
                     }
                     mMvnoMatchData.setText(telephonyManager.getGroupIdLevel1());
+                } else {
+                    // mvno type 'none' case. At this time, mvnoIndex should be 0.
+                    mMvnoMatchData.setText("");
                 }
             }
 
@@ -784,6 +787,7 @@
             }
             mMvnoType.setValue((String) newValue);
             mMvnoType.setSummary(mvno);
+            mMvnoMatchData.setSummary(checkNull(mMvnoMatchData.getText()));
         } else if (KEY_PASSWORD.equals(key)) {
             mPassword.setSummary(starify(newValue != null ? String.valueOf(newValue) : ""));
         } else if (KEY_CARRIER_ENABLED.equals(key)) {
diff --git a/src/com/android/settings/network/NetworkDashboardFragment.java b/src/com/android/settings/network/NetworkDashboardFragment.java
index db704ae..76d60e5 100644
--- a/src/com/android/settings/network/NetworkDashboardFragment.java
+++ b/src/com/android/settings/network/NetworkDashboardFragment.java
@@ -30,7 +30,7 @@
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.network.MobilePlanPreferenceController.MobilePlanPreferenceHost;
 import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.wifi.WifiMasterSwitchPreferenceController;
+import com.android.settings.wifi.WifiPrimarySwitchPreferenceController;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -96,8 +96,8 @@
             MobilePlanPreferenceHost mobilePlanHost) {
         final MobilePlanPreferenceController mobilePlanPreferenceController =
                 new MobilePlanPreferenceController(context, mobilePlanHost);
-        final WifiMasterSwitchPreferenceController wifiPreferenceController =
-                new WifiMasterSwitchPreferenceController(context, metricsFeatureProvider);
+        final WifiPrimarySwitchPreferenceController wifiPreferenceController =
+                new WifiPrimarySwitchPreferenceController(context, metricsFeatureProvider);
 
         final VpnPreferenceController vpnPreferenceController =
                 new VpnPreferenceController(context);
diff --git a/src/com/android/settings/network/TetherBasePreferenceController.java b/src/com/android/settings/network/TetherBasePreferenceController.java
index 36ce2a4..1919770 100644
--- a/src/com/android/settings/network/TetherBasePreferenceController.java
+++ b/src/com/android/settings/network/TetherBasePreferenceController.java
@@ -129,11 +129,11 @@
     }
 
     @Override
-    public void onWhitelistStatusChanged(int uid, boolean isWhitelisted) {
+    public void onAllowlistStatusChanged(int uid, boolean isAllowlisted) {
     }
 
     @Override
-    public void onBlacklistStatusChanged(int uid, boolean isBlacklisted) {
+    public void onDenylistStatusChanged(int uid, boolean isDenylisted) {
     }
 
     /**
diff --git a/src/com/android/settings/network/TetherEnabler.java b/src/com/android/settings/network/TetherEnabler.java
index b3c6d61..6ab4cb2 100644
--- a/src/com/android/settings/network/TetherEnabler.java
+++ b/src/com/android/settings/network/TetherEnabler.java
@@ -368,12 +368,12 @@
     }
 
     @Override
-    public void onWhitelistStatusChanged(int uid, boolean isWhitelisted) {
+    public void onAllowlistStatusChanged(int uid, boolean isAllowlisted) {
         // we don't care, since we just want to read the value
     }
 
     @Override
-    public void onBlacklistStatusChanged(int uid, boolean isBlacklisted) {
+    public void onDenylistStatusChanged(int uid, boolean isDenylisted) {
         // we don't care, since we just want to read the value
     }
 
diff --git a/src/com/android/settings/network/TetherProvisioningActivity.java b/src/com/android/settings/network/TetherProvisioningActivity.java
index 047c90d..285780b 100644
--- a/src/com/android/settings/network/TetherProvisioningActivity.java
+++ b/src/com/android/settings/network/TetherProvisioningActivity.java
@@ -36,7 +36,7 @@
 import androidx.annotation.VisibleForTesting;
 
 /**
- * Activity which acts as a proxy to the tether provisioning app for sanity checks and permission
+ * Activity which acts as a proxy to the tether provisioning app for validity checks and permission
  * restrictions. Specifically, the provisioning apps require
  * {@link android.permission.TETHER_PRIVILEGED}, while this activity can be started by a caller
  * with {@link android.permission.TETHER_PRIVILEGED}.
diff --git a/src/com/android/settings/network/TopLevelNetworkEntryPreferenceController.java b/src/com/android/settings/network/TopLevelNetworkEntryPreferenceController.java
index f2e1312..c630cc7 100644
--- a/src/com/android/settings/network/TopLevelNetworkEntryPreferenceController.java
+++ b/src/com/android/settings/network/TopLevelNetworkEntryPreferenceController.java
@@ -24,14 +24,14 @@
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.core.BasePreferenceController;
-import com.android.settings.wifi.WifiMasterSwitchPreferenceController;
+import com.android.settings.wifi.WifiPrimarySwitchPreferenceController;
 
 import java.util.ArrayList;
 import java.util.List;
 
 public class TopLevelNetworkEntryPreferenceController extends BasePreferenceController {
 
-    private final WifiMasterSwitchPreferenceController mWifiPreferenceController;
+    private final WifiPrimarySwitchPreferenceController mWifiPreferenceController;
     private final MobileNetworkPreferenceController mMobileNetworkPreferenceController;
     private final TetherPreferenceController mTetherPreferenceController;
 
@@ -40,7 +40,7 @@
         mMobileNetworkPreferenceController = new MobileNetworkPreferenceController(mContext);
         mTetherPreferenceController = new TetherPreferenceController(
                 mContext, null /* lifecycle */);
-        mWifiPreferenceController = new WifiMasterSwitchPreferenceController(
+        mWifiPreferenceController = new WifiPrimarySwitchPreferenceController(
                 mContext, null /* metrics */);
     }
 
diff --git a/src/com/android/settings/network/telephony/AbstractMobileNetworkSettings.java b/src/com/android/settings/network/telephony/AbstractMobileNetworkSettings.java
index aa84cc1..ff831e8 100644
--- a/src/com/android/settings/network/telephony/AbstractMobileNetworkSettings.java
+++ b/src/com/android/settings/network/telephony/AbstractMobileNetworkSettings.java
@@ -132,7 +132,6 @@
         final TelephonyStatusControlSession session =
                 setTelephonyAvailabilityStatus(controllers);
 
-
         final PreferenceScreen screen = getPreferenceScreen();
         controllers.forEach(controller -> {
             controller.displayPreference(screen);
diff --git a/src/com/android/settings/network/telephony/CarrierSettingsVersionPreferenceController.java b/src/com/android/settings/network/telephony/CarrierSettingsVersionPreferenceController.java
index a6db773..aec3648 100644
--- a/src/com/android/settings/network/telephony/CarrierSettingsVersionPreferenceController.java
+++ b/src/com/android/settings/network/telephony/CarrierSettingsVersionPreferenceController.java
@@ -20,6 +20,7 @@
 import android.os.PersistableBundle;
 import android.telephony.CarrierConfigManager;
 import android.telephony.SubscriptionManager;
+import android.text.TextUtils;
 
 import com.android.settings.core.BasePreferenceController;
 
@@ -49,6 +50,6 @@
 
     @Override
     public int getAvailabilityStatus() {
-        return AVAILABLE;
+        return TextUtils.isEmpty(getSummary()) ? UNSUPPORTED_ON_DEVICE : AVAILABLE;
     }
 }
diff --git a/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelper.java b/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelper.java
index 9e46158..d2eab3e 100644
--- a/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelper.java
+++ b/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelper.java
@@ -23,8 +23,6 @@
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.res.Resources;
 import android.net.Uri;
 import android.os.PersistableBundle;
 import android.telephony.CarrierConfigManager;
@@ -84,6 +82,10 @@
     private static final String RESOURCE_ENHANCED_4G_LTE_MODE_TITLE_VARIANT =
             "enhanced_4g_lte_mode_title_variant";
 
+    private static final int MODE_VOLTE = 0;
+    private static final int MODE_ADVANCED_CALL = 1;
+    private static final int MODE_4G_CALLING = 2;
+
     @VisibleForTesting
     public Enhanced4gLteSliceHelper(Context context) {
         mContext = context;
@@ -217,40 +219,47 @@
     }
 
     private CharSequence getEnhanced4glteModeTitle(int subId) {
-        CharSequence ret = mContext.getText(R.string.enhanced_4g_lte_mode_title);
-        try {
-            if (isCarrierConfigManagerKeyEnabled(
-                    CarrierConfigManager.KEY_ENHANCED_4G_LTE_TITLE_VARIANT_BOOL,
-                    subId,
-                    false)) {
-                final PackageManager manager = mContext.getPackageManager();
-                final Resources resources = manager.getResourcesForApplication(
-                        PACKAGE_PHONE);
-                final int resId = resources.getIdentifier(
-                        RESOURCE_ENHANCED_4G_LTE_MODE_TITLE_VARIANT,
-                        RESOURCE_TYPE_STRING, PACKAGE_PHONE);
-                ret = resources.getText(resId);
-            }
-        } catch (PackageManager.NameNotFoundException e) {
-            Log.e(TAG, "package name not found");
+        final int variant4gLteTitleIndex = getCarrierConfigManagerKeyValue(
+                CarrierConfigManager.KEY_ENHANCED_4G_LTE_TITLE_VARIANT_INT, subId, 0);
+        final boolean show4GForLTE = isCarrierConfigManagerKeyEnabled(
+                CarrierConfigManager.KEY_SHOW_4G_FOR_LTE_DATA_ICON_BOOL, subId, false);
+        final CharSequence[] variantTitles = mContext.getResources()
+                .getTextArray(R.array.enhanced_4g_lte_mode_title_variant);
+        int index = MODE_ADVANCED_CALL;
+        if (variant4gLteTitleIndex != MODE_ADVANCED_CALL) {
+            index = show4GForLTE ? MODE_4G_CALLING : MODE_VOLTE;
         }
-        return ret;
+        return variantTitles[index];
     }
 
     /**
      * Returns {@code true} when the key is enabled for the carrier, and {@code false} otherwise.
      */
-    private boolean isCarrierConfigManagerKeyEnabled(String key,
-            int subId, boolean defaultValue) {
-        final CarrierConfigManager configManager = getCarrierConfigManager();
-        boolean ret = defaultValue;
-        if (configManager != null) {
-            final PersistableBundle bundle = configManager.getConfigForSubId(subId);
-            if (bundle != null) {
-                ret = bundle.getBoolean(key, defaultValue);
-            }
+    private boolean isCarrierConfigManagerKeyEnabled(String key, int subId, boolean defaultValue) {
+        boolean result = defaultValue;
+        final PersistableBundle carrierConfig = getCarrierConfig(subId);
+        if (carrierConfig != null) {
+            result = carrierConfig.getBoolean(key, defaultValue);
         }
-        return ret;
+        return result;
+    }
+
+    private int getCarrierConfigManagerKeyValue(String key, int subId, int defaultValue) {
+        int result = defaultValue;
+        final PersistableBundle carrierConfig = getCarrierConfig(subId);
+        if (carrierConfig != null) {
+            result = carrierConfig.getInt(key, defaultValue);
+        }
+        return result;
+    }
+
+    private PersistableBundle getCarrierConfig(int subId) {
+        final CarrierConfigManager configManager = getCarrierConfigManager();
+        PersistableBundle bundle = null;
+        if (configManager != null) {
+            bundle = configManager.getConfigForSubId(subId);
+        }
+        return bundle;
     }
 
     protected CarrierConfigManager getCarrierConfigManager() {
diff --git a/src/com/android/settings/network/telephony/MobileDataPreferenceController.java b/src/com/android/settings/network/telephony/MobileDataPreferenceController.java
index c35eef6..91c46df 100644
--- a/src/com/android/settings/network/telephony/MobileDataPreferenceController.java
+++ b/src/com/android/settings/network/telephony/MobileDataPreferenceController.java
@@ -128,6 +128,13 @@
             preference.setEnabled(true);
             preference.setSummary(R.string.mobile_data_settings_summary);
         }
+
+        if (mSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+            preference.setSelectable(false);
+            preference.setSummary(R.string.mobile_data_settings_summary_unavailable);
+        } else {
+            preference.setSelectable(true);
+        }
     }
 
     private boolean isOpportunistic() {
diff --git a/src/com/android/settings/network/telephony/MobileNetworkActivity.java b/src/com/android/settings/network/telephony/MobileNetworkActivity.java
index 7f7dc3a..a792824 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkActivity.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkActivity.java
@@ -158,6 +158,11 @@
 
         // Remove the dialog if the subscription associated with this activity changes.
         if (info == null) {
+            // Close the activity when subscription removed
+            if ((oldSubIndex != SUB_ID_NULL)
+                    && (!isFinishing()) && (!isDestroyed())) {
+                finish();
+            }
             return;
         }
         int subIndex = info.getSubscriptionId();
diff --git a/src/com/android/settings/network/telephony/MobileNetworkUtils.java b/src/com/android/settings/network/telephony/MobileNetworkUtils.java
index 3b5e6e0..9339d68 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkUtils.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkUtils.java
@@ -48,6 +48,7 @@
 import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
 import android.telephony.CarrierConfigManager;
+import android.telephony.ServiceState;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
@@ -475,8 +476,9 @@
         if (carrierConfig.getBoolean(CarrierConfigManager.KEY_SUPPORT_TDSCDMA_BOOL)) {
             return true;
         }
-
-        final String operatorNumeric = telephonyManager.getServiceState().getOperatorNumeric();
+        final ServiceState serviceState = telephonyManager.getServiceState();
+        final String operatorNumeric =
+                (serviceState != null) ? serviceState.getOperatorNumeric() : null;
         final String[] numericArray = carrierConfig.getStringArray(
                 CarrierConfigManager.KEY_SUPPORT_TDSCDMA_ROAMING_NETWORKS_STRING_ARRAY);
         if (numericArray == null || operatorNumeric == null) {
diff --git a/src/com/android/settings/network/telephony/NetworkOperatorPreference.java b/src/com/android/settings/network/telephony/NetworkOperatorPreference.java
index 97894b1..cfd587a 100644
--- a/src/com/android/settings/network/telephony/NetworkOperatorPreference.java
+++ b/src/com/android/settings/network/telephony/NetworkOperatorPreference.java
@@ -37,6 +37,7 @@
 
 import androidx.preference.Preference;
 
+import com.android.internal.telephony.OperatorInfo;
 import com.android.settings.R;
 
 import java.util.List;
@@ -125,10 +126,8 @@
         final CellSignalStrength signalStrength = getCellSignalStrength(mCellInfo);
         final int level = signalStrength != null ? signalStrength.getLevel() : LEVEL_NONE;
         if (DBG) Log.d(TAG, "refresh level: " + String.valueOf(level));
-        if (mLevel != level) {
-            mLevel = level;
-            updateIcon(mLevel);
-        }
+        mLevel = level;
+        updateIcon(mLevel);
     }
 
     /**
@@ -175,6 +174,15 @@
         return CellInfoUtil.getNetworkTitle(mCellId, getOperatorNumeric());
     }
 
+    /**
+     * Operator info of this cell
+     */
+    public OperatorInfo getOperatorInfo() {
+        return new OperatorInfo(Objects.toString(mCellId.getOperatorAlphaLong(), ""),
+                Objects.toString(mCellId.getOperatorAlphaShort(), ""),
+                getOperatorNumeric());
+    }
+
     private int getIconIdForCell(CellInfo ci) {
         if (ci instanceof CellInfoGsm) {
             return R.drawable.signal_strength_g;
diff --git a/src/com/android/settings/network/telephony/NetworkSelectSettings.java b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
index 3f18928..ff641e9 100644
--- a/src/com/android/settings/network/telephony/NetworkSelectSettings.java
+++ b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
@@ -40,6 +40,7 @@
 import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
 
+import com.android.internal.telephony.OperatorInfo;
 import com.android.settings.R;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.overlay.FeatureFactory;
@@ -185,12 +186,12 @@
 
             mRequestIdManualNetworkSelect = getNewRequestId();
             mWaitingForNumberOfScanResults = MIN_NUMBER_OF_SCAN_REQUIRED;
-            final String operatorNumeric = mSelectedPreference.getOperatorNumeric();
+            final OperatorInfo operator = mSelectedPreference.getOperatorInfo();
             ThreadUtils.postOnBackgroundThread(() -> {
                 final Message msg = mHandler.obtainMessage(
                         EVENT_SET_NETWORK_SELECTION_MANUALLY_DONE);
                 msg.obj = mTelephonyManager.setNetworkSelectionModeManual(
-                        operatorNumeric, true /* persistSelection */);
+                        operator, true /* persistSelection */);
                 msg.sendToTarget();
             });
         }
@@ -223,9 +224,13 @@
                     setProgressBarVisible(false);
                     getPreferenceScreen().setEnabled(true);
 
-                    mSelectedPreference.setSummary(isSucceed
-                            ? R.string.network_connected
-                            : R.string.network_could_not_connect);
+                    if (mSelectedPreference != null) {
+                        mSelectedPreference.setSummary(isSucceed
+                                ? R.string.network_connected
+                                : R.string.network_could_not_connect);
+                    } else {
+                        Log.e(TAG, "No preference to update!");
+                    }
                     break;
                 case EVENT_NETWORK_SCAN_RESULTS:
                     final List<CellInfo> results = (List<CellInfo>) msg.obj;
@@ -400,6 +405,9 @@
         if (mTelephonyManager.getDataState() == mTelephonyManager.DATA_CONNECTED) {
             // Try to get the network registration states
             final ServiceState ss = mTelephonyManager.getServiceState();
+            if (ss == null) {
+                return;
+            }
             final List<NetworkRegistrationInfo> networkList =
                     ss.getNetworkRegistrationInfoListForTransportType(
                             AccessNetworkConstants.TRANSPORT_TYPE_WWAN);
diff --git a/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java b/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java
index e53a452..2a7bc02 100644
--- a/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java
+++ b/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java
@@ -19,6 +19,7 @@
 import android.app.Dialog;
 import android.app.settings.SettingsEnums;
 import android.content.Context;
+import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.graphics.Paint;
 import android.graphics.drawable.ShapeDrawable;
@@ -48,7 +49,10 @@
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 import com.android.settingslib.DeviceInfoUtils;
 
+import com.google.common.collect.ImmutableMap;
+
 import java.util.List;
+import java.util.Map;
 
 /**
  * A dialog allowing the display name of a mobile network subscription to be changed
@@ -65,6 +69,7 @@
     private EditText mNameView;
     private Spinner mColorSpinner;
     private Color[] mColors;
+    private Map<Integer, Integer> mLightDarkMap;
 
     public static RenameMobileNetworkDialogFragment newInstance(int subscriptionId) {
         final Bundle args = new Bundle(1);
@@ -100,6 +105,21 @@
         mTelephonyManager = getTelephonyManager(context);
         mSubscriptionManager = getSubscriptionManager(context);
         mSubId = getArguments().getInt(KEY_SUBSCRIPTION_ID);
+        Resources res = context.getResources();
+        mLightDarkMap = ImmutableMap.<Integer, Integer>builder()
+                .put(res.getInteger(R.color.SIM_color_teal),
+                        res.getInteger(R.color.SIM_dark_mode_color_teal))
+                .put(res.getInteger(R.color.SIM_color_blue),
+                        res.getInteger(R.color.SIM_dark_mode_color_blue))
+                .put(res.getInteger(R.color.SIM_color_indigo),
+                        res.getInteger(R.color.SIM_dark_mode_color_indigo))
+                .put(res.getInteger(R.color.SIM_color_purple),
+                        res.getInteger(R.color.SIM_dark_mode_color_purple))
+                .put(res.getInteger(R.color.SIM_color_pink),
+                        res.getInteger(R.color.SIM_dark_mode_color_pink))
+                .put(res.getInteger(R.color.SIM_color_red),
+                        res.getInteger(R.color.SIM_dark_mode_color_red))
+                .build();
     }
 
     @NonNull
@@ -163,7 +183,7 @@
         final TextView operatorName = view.findViewById(R.id.operator_name_value);
         mTelephonyManager = mTelephonyManager.createForSubscriptionId(mSubId);
         final ServiceState serviceState = mTelephonyManager.getServiceState();
-        operatorName.setText(serviceState.getOperatorAlphaLong());
+        operatorName.setText(serviceState == null ? "" : serviceState.getOperatorAlphaLong());
 
         final TextView phoneTitle = view.findViewById(R.id.number_label);
         phoneTitle.setVisibility(info.isOpportunistic() ? View.GONE : View.VISIBLE);
@@ -196,8 +216,13 @@
             if (convertView == null) {
                 convertView = inflater.inflate(mItemResId, null);
             }
+            boolean isDarkMode = false;
+            if ((getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK)
+                    == Configuration.UI_MODE_NIGHT_YES) {
+                isDarkMode = true;
+            }
             ((ImageView) convertView.findViewById(R.id.color_icon))
-                    .setImageDrawable(getItem(position).getDrawable());
+                    .setImageDrawable(getItem(position).getDrawable(isDarkMode));
             ((TextView) convertView.findViewById(R.id.color_label))
                     .setText(getItem(position).getLabel());
 
@@ -223,7 +248,7 @@
         return colors;
     }
 
-    private static class Color {
+    private class Color {
 
         private String mLabel;
         private int mColor;
@@ -248,8 +273,15 @@
             return mColor;
         }
 
-        private ShapeDrawable getDrawable() {
+        private ShapeDrawable getDrawable(boolean isDarkMode) {
+            if (isDarkMode) {
+                mDrawable.getPaint().setColor(getDarkColor(mColor));
+            }
             return mDrawable;
         }
     }
+
+    private int getDarkColor(int lightColor) {
+        return mLightDarkMap.getOrDefault(lightColor, lightColor);
+    }
 }
diff --git a/src/com/android/settings/network/telephony/TelephonyStatusControlSession.java b/src/com/android/settings/network/telephony/TelephonyStatusControlSession.java
index 12c9bee..3716f1f 100644
--- a/src/com/android/settings/network/telephony/TelephonyStatusControlSession.java
+++ b/src/com/android/settings/network/telephony/TelephonyStatusControlSession.java
@@ -22,6 +22,7 @@
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.utils.ThreadUtils;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
@@ -37,7 +38,7 @@
     private static final String LOG_TAG = "TelephonyStatusControlSS";
 
     private Collection<AbstractPreferenceController> mControllers;
-    private Future<Boolean> mResult;
+    private Collection<Future<Boolean>> mResult = new ArrayList<>();
 
     /**
      * Buider of session
@@ -67,9 +68,9 @@
 
     private TelephonyStatusControlSession(Collection<AbstractPreferenceController> controllers) {
         mControllers = controllers;
-        mResult = ThreadUtils.postOnBackgroundThread(() ->
-            setupAvailabilityStatus(controllers)
-        );
+        controllers.forEach(prefCtrl -> mResult
+                .add(ThreadUtils.postOnBackgroundThread(() -> setupAvailabilityStatus(prefCtrl))));
+
     }
 
     /**
@@ -79,25 +80,24 @@
      */
     public void close() {
         //check the background thread is finished then unset the status of availability.
-        try {
-            mResult.get();
-        } catch (ExecutionException | InterruptedException exception) {
-            Log.e(LOG_TAG, "setup availability status failed!", exception);
+
+        for (Future<Boolean> result : mResult) {
+            try {
+                result.get();
+            } catch (ExecutionException | InterruptedException exception) {
+                Log.e(LOG_TAG, "setup availability status failed!", exception);
+            }
         }
         unsetAvailabilityStatus(mControllers);
     }
 
-    private Boolean setupAvailabilityStatus(
-            Collection<AbstractPreferenceController> controllerLists) {
+    private Boolean setupAvailabilityStatus(AbstractPreferenceController controller) {
         try {
-            controllerLists.stream()
-                    .filter(controller -> controller instanceof TelephonyAvailabilityHandler)
-                    .map(TelephonyAvailabilityHandler.class::cast)
-                    .forEach(controller -> {
-                        int status = ((BasePreferenceController) controller)
-                                .getAvailabilityStatus();
-                        controller.setAvailabilityStatus(status);
-                    });
+            if (controller instanceof TelephonyAvailabilityHandler) {
+                int status = ((BasePreferenceController) controller)
+                        .getAvailabilityStatus();
+                ((TelephonyAvailabilityHandler) controller).setAvailabilityStatus(status);
+            }
             return true;
         } catch (Exception exception) {
             Log.e(LOG_TAG, "Setup availability status failed!", exception);
diff --git a/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java b/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java
index 361f58e..d981362 100644
--- a/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java
+++ b/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java
@@ -29,6 +29,7 @@
 import android.os.SystemClock;
 import android.provider.Settings;
 import android.telephony.CarrierConfigManager;
+import android.telephony.ServiceState;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 
@@ -125,7 +126,13 @@
         super.updateState(preference);
 
         preference.setSummary(null);
-        if (mTelephonyManager.getServiceState().getRoaming()) {
+        final ServiceState serviceState = mTelephonyManager.getServiceState();
+        if (serviceState == null) {
+            preference.setEnabled(false);
+            return;
+        }
+
+        if (serviceState.getRoaming()) {
             preference.setEnabled(true);
         } else {
             preference.setEnabled(!mOnlyAutoSelectInHome);
diff --git a/src/com/android/settings/notification/AssistantFeedbackPreferenceController.java b/src/com/android/settings/notification/AssistantFeedbackPreferenceController.java
new file mode 100644
index 0000000..1566ae9
--- /dev/null
+++ b/src/com/android/settings/notification/AssistantFeedbackPreferenceController.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.notification;
+
+import static android.provider.Settings.Global.NOTIFICATION_FEEDBACK_ENABLED;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.database.ContentObserver;
+import android.net.Uri;
+import android.os.Handler;
+import android.provider.Settings;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.core.TogglePreferenceController;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
+
+import com.google.common.annotations.VisibleForTesting;
+
+public class AssistantFeedbackPreferenceController extends TogglePreferenceController
+        implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener,
+        LifecycleObserver, OnResume, OnPause {
+
+    @VisibleForTesting
+    static final int ON = 1;
+    @VisibleForTesting
+    static final int OFF = 0;
+
+    private SettingObserver mSettingObserver;
+
+    public AssistantFeedbackPreferenceController(Context context,
+            String preferenceKey) {
+        super(context, preferenceKey);
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        Preference preference = screen.findPreference(NOTIFICATION_FEEDBACK_ENABLED);
+        if (preference != null) {
+            mSettingObserver = new SettingObserver(preference);
+        }
+    }
+
+    @Override
+    public void onResume() {
+        if (mSettingObserver != null) {
+            mSettingObserver.register(mContext.getContentResolver(), true /* register */);
+        }
+    }
+
+    @Override
+    public void onPause() {
+        if (mSettingObserver != null) {
+            mSettingObserver.register(mContext.getContentResolver(), false /* register */);
+        }
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE;
+    }
+
+    @Override
+    public boolean isChecked() {
+        return Settings.Global.getInt(mContext.getContentResolver(),
+                NOTIFICATION_FEEDBACK_ENABLED, OFF) == ON;
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        return Settings.Global.putInt(mContext.getContentResolver(),
+                NOTIFICATION_FEEDBACK_ENABLED, isChecked ? ON : OFF);
+    }
+
+    class SettingObserver extends ContentObserver {
+
+        private final Uri NOTIFICATION_URI =
+                Settings.Global.getUriFor(NOTIFICATION_FEEDBACK_ENABLED);
+
+        private final Preference mPreference;
+
+        SettingObserver(Preference preference) {
+            super(new Handler());
+            mPreference = preference;
+        }
+
+        public void register(ContentResolver cr, boolean register) {
+            if (register) {
+                cr.registerContentObserver(NOTIFICATION_URI, false, this);
+            } else {
+                cr.unregisterContentObserver(this);
+            }
+        }
+
+        @Override
+        public void onChange(boolean selfChange, Uri uri) {
+            super.onChange(selfChange, uri);
+            if (NOTIFICATION_URI.equals(uri)) {
+                updateState(mPreference);
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java b/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java
index aaa96bcc..bab0d5f 100644
--- a/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java
+++ b/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java
@@ -33,13 +33,19 @@
 import android.util.IconDrawableFactory;
 import android.util.Slog;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.fragment.app.Fragment;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
+
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.applications.AppInfoBase;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.notification.app.AppNotificationSettings;
-import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settings.widget.PrimarySwitchPreference;
 import com.android.settingslib.TwoTargetPreference;
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.settingslib.core.AbstractPreferenceController;
@@ -52,12 +58,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import androidx.annotation.VisibleForTesting;
-import androidx.fragment.app.Fragment;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
-
 /**
  * This controller displays a list of recently used apps and a "See all" button. If there is
  * no recently used app, "See all" will be displayed as "Notifications".
@@ -223,13 +223,13 @@
 
         // Rebind prefs/avoid adding new prefs if possible. Adding/removing prefs causes jank.
         // Build a cached preference pool
-        final Map<String, MasterSwitchPreference> appPreferences = new ArrayMap<>();
+        final Map<String, PrimarySwitchPreference> appPreferences = new ArrayMap<>();
         int prefCount = mCategory.getPreferenceCount();
         for (int i = 0; i < prefCount; i++) {
             final Preference pref = mCategory.getPreference(i);
             final String key = pref.getKey();
             if (!TextUtils.equals(key, KEY_SEE_ALL)) {
-                appPreferences.put(key, (MasterSwitchPreference) pref);
+                appPreferences.put(key, (PrimarySwitchPreference) pref);
             }
         }
         final int recentAppsCount = recentApps.size();
@@ -244,10 +244,10 @@
             }
 
             boolean rebindPref = true;
-            MasterSwitchPreference pref = appPreferences.remove(getKey(app.getUserId(),
+            PrimarySwitchPreference pref = appPreferences.remove(getKey(app.getUserId(),
                     pkgName));
             if (pref == null) {
-                pref = new MasterSwitchPreference(prefContext);
+                pref = new PrimarySwitchPreference(prefContext);
                 rebindPref = false;
             }
             pref.setKey(getKey(app.getUserId(), pkgName));
diff --git a/src/com/android/settings/notification/SoundSettings.java b/src/com/android/settings/notification/SoundSettings.java
index 9e7f3ed..b088fe3 100644
--- a/src/com/android/settings/notification/SoundSettings.java
+++ b/src/com/android/settings/notification/SoundSettings.java
@@ -76,6 +76,7 @@
     private RingtonePreference mRequestPreference;
     private UpdatableListPreferenceDialogFragment mDialogFragment;
     private String mHfpOutputControllerKey;
+    private String mVibrationPreferencesKey = "vibration_preference_screen";
 
     @Override
     public int getMetricsCategory() {
@@ -127,6 +128,10 @@
 
     @Override
     public void onDisplayPreferenceDialog(Preference preference) {
+        if (TextUtils.equals(mVibrationPreferencesKey, preference.getKey())) {
+            super.onDisplayPreferenceDialog(preference);
+            return;
+        }
         final int metricsCategory;
         if (mHfpOutputControllerKey.equals(preference.getKey())) {
             metricsCategory = SettingsEnums.DIALOG_SWITCH_HFP_DEVICES;
@@ -310,4 +315,4 @@
             mDialogFragment.onListPreferenceUpdated(preference);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/com/android/settings/notification/app/AppChannelsBypassingDndPreferenceController.java b/src/com/android/settings/notification/app/AppChannelsBypassingDndPreferenceController.java
index fa05299..684a27a 100644
--- a/src/com/android/settings/notification/app/AppChannelsBypassingDndPreferenceController.java
+++ b/src/com/android/settings/notification/app/AppChannelsBypassingDndPreferenceController.java
@@ -39,7 +39,7 @@
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.notification.NotificationBackend;
-import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settings.widget.PrimarySwitchPreference;
 import com.android.settingslib.RestrictedSwitchPreference;
 
 import java.util.ArrayList;
@@ -92,8 +92,8 @@
                         // the 0th index is the mAllNotificationsToggle which allows users to
                         // toggle all notifications from this app to bypass DND
                         for (int i = 1; i < mPreferenceCategory.getPreferenceCount(); i++) {
-                            MasterSwitchPreference childPreference =
-                                    (MasterSwitchPreference) mPreferenceCategory.getPreference(i);
+                            PrimarySwitchPreference childPreference =
+                                    (PrimarySwitchPreference) mPreferenceCategory.getPreference(i);
                             childPreference.setChecked(showNotificationInDnd(mChannels.get(i - 1)));
                         }
                         return true;
@@ -158,7 +158,7 @@
         mPreferenceCategory.removeAll();
         mPreferenceCategory.addPreference(mAllNotificationsToggle);
         for (NotificationChannel channel : mChannels) {
-            MasterSwitchPreference channelPreference = new MasterSwitchPreference(mContext);
+            PrimarySwitchPreference channelPreference = new PrimarySwitchPreference(mContext);
             channelPreference.setDisabledByAdmin(mAdmin);
             channelPreference.setSwitchEnabled(
                     (mAdmin == null || !channelPreference.isDisabledByAdmin())
diff --git a/src/com/android/settings/notification/app/BlockPreferenceController.java b/src/com/android/settings/notification/app/BlockPreferenceController.java
index f55ea8c..2738962 100644
--- a/src/com/android/settings/notification/app/BlockPreferenceController.java
+++ b/src/com/android/settings/notification/app/BlockPreferenceController.java
@@ -106,8 +106,11 @@
             // It's always safe to override the importance if it's meant to be blocked or if
             // it was blocked and we are unblocking it.
             if (blocked || originalImportance == IMPORTANCE_NONE) {
-                final int importance = blocked ? IMPORTANCE_NONE
-                        : isDefaultChannel() ? IMPORTANCE_UNSPECIFIED : IMPORTANCE_DEFAULT;
+                final int importance = blocked
+                        ? IMPORTANCE_NONE
+                        : isDefaultChannel()
+                                ? IMPORTANCE_UNSPECIFIED
+                                : mChannel.getOriginalImportance();
                 mChannel.setImportance(importance);
                 saveChannel();
             }
diff --git a/src/com/android/settings/notification/app/BubblePreference.java b/src/com/android/settings/notification/app/BubblePreference.java
index 7e071ff..f0046d7 100644
--- a/src/com/android/settings/notification/app/BubblePreference.java
+++ b/src/com/android/settings/notification/app/BubblePreference.java
@@ -45,8 +45,6 @@
     private int mSelectedPreference;
 
     private Context mContext;
-    private Drawable mSelectedBackground;
-    private Drawable mUnselectedBackground;
 
     private ButtonViewHolder mBubbleAllButton;
     private ButtonViewHolder mBubbleSelectedButton;
@@ -72,8 +70,6 @@
         mHelper = new RestrictedPreferenceHelper(context, this, attrs);
         mHelper.useAdminDisabledSummary(true);
         mContext = context;
-        mSelectedBackground = mContext.getDrawable(R.drawable.button_border_selected);
-        mUnselectedBackground = mContext.getDrawable(R.drawable.button_border_unselected);
         setLayoutResource(R.layout.bubble_preference);
     }
 
@@ -167,7 +163,9 @@
         }
 
         void setSelected(Context context, boolean selected) {
-            mView.setBackground(selected ?  mSelectedBackground : mUnselectedBackground);
+            mView.setBackground(mContext.getDrawable(selected
+                ? R.drawable.button_border_selected
+                : R.drawable.button_border_unselected));
             mView.setSelected(selected);
 
             ColorStateList stateList = selected
diff --git a/src/com/android/settings/notification/app/BubblePreferenceController.java b/src/com/android/settings/notification/app/BubblePreferenceController.java
index 1aed156..722b279 100644
--- a/src/com/android/settings/notification/app/BubblePreferenceController.java
+++ b/src/com/android/settings/notification/app/BubblePreferenceController.java
@@ -77,7 +77,7 @@
             if (isDefaultChannel()) {
                 return true;
             } else {
-                return mAppRow != null;
+                return mAppRow != null &&  mAppRow.bubblePreference != BUBBLE_PREFERENCE_NONE;
             }
         }
         return true;
diff --git a/src/com/android/settings/notification/app/ChannelListPreferenceController.java b/src/com/android/settings/notification/app/ChannelListPreferenceController.java
index b19fc71..8410ce1 100644
--- a/src/com/android/settings/notification/app/ChannelListPreferenceController.java
+++ b/src/com/android/settings/notification/app/ChannelListPreferenceController.java
@@ -23,16 +23,14 @@
 import android.app.NotificationChannelGroup;
 import android.app.settings.SettingsEnums;
 import android.content.Context;
-import android.graphics.BlendMode;
-import android.graphics.BlendModeColorFilter;
 import android.graphics.drawable.Drawable;
-import android.graphics.drawable.GradientDrawable;
-import android.graphics.drawable.LayerDrawable;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.provider.Settings;
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceGroup;
@@ -43,7 +41,7 @@
 import com.android.settings.applications.AppInfoBase;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.notification.NotificationBackend;
-import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settings.widget.PrimarySwitchPreference;
 import com.android.settingslib.RestrictedSwitchPreference;
 
 import java.util.ArrayList;
@@ -53,7 +51,8 @@
 public class ChannelListPreferenceController extends NotificationPreferenceController {
 
     private static final String KEY = "channels";
-    private static String KEY_GENERAL_CATEGORY = "categories";
+    private static final String KEY_GENERAL_CATEGORY = "categories";
+    private static final String KEY_ZERO_CATEGORIES = "zeroCategories";
     public static final String ARG_FROM_SETTINGS = "fromSettings";
 
     private List<NotificationChannelGroup> mChannelGroupList;
@@ -102,62 +101,192 @@
                 if (mContext == null) {
                     return;
                 }
-                populateList();
+                updateFullList(mPreference, mChannelGroupList);
             }
         }.execute();
     }
 
-    private void populateList() {
-        // TODO: if preference has children, compare with newly loaded list
-        mPreference.removeAll();
-
-        if (mChannelGroupList.isEmpty()) {
-            PreferenceCategory groupCategory = new PreferenceCategory(mContext);
-            groupCategory.setTitle(R.string.notification_channels);
-            groupCategory.setKey(KEY_GENERAL_CATEGORY);
-            mPreference.addPreference(groupCategory);
-
-            Preference empty = new Preference(mContext);
-            empty.setTitle(R.string.no_channels);
-            empty.setEnabled(false);
-            groupCategory.addPreference(empty);
-        } else {
-            populateGroupList();
-        }
-    }
-
-    private void populateGroupList() {
-        for (NotificationChannelGroup group : mChannelGroupList) {
-            PreferenceCategory groupCategory = new PreferenceCategory(mContext);
-            groupCategory.setOrderingAsAdded(true);
-            mPreference.addPreference(groupCategory);
-            if (group.getId() == null) {
-                groupCategory.setTitle(R.string.notification_channels_other);
-                groupCategory.setKey(KEY_GENERAL_CATEGORY);
+    /**
+     * Update the preferences group to match the
+     * @param groupPrefsList
+     * @param channelGroups
+     */
+    void updateFullList(@NonNull PreferenceCategory groupPrefsList,
+                @NonNull List<NotificationChannelGroup> channelGroups) {
+        if (channelGroups.isEmpty()) {
+            if (groupPrefsList.getPreferenceCount() == 1
+                    && KEY_ZERO_CATEGORIES.equals(groupPrefsList.getPreference(0).getKey())) {
+                // Ensure the titles are correct for the current language, but otherwise leave alone
+                PreferenceGroup groupCategory = (PreferenceGroup) groupPrefsList.getPreference(0);
+                groupCategory.setTitle(R.string.notification_channels);
+                groupCategory.getPreference(0).setTitle(R.string.no_channels);
             } else {
-                groupCategory.setTitle(group.getName());
-                groupCategory.setKey(group.getId());
-                populateGroupToggle(groupCategory, group);
+                // Clear any contents and create the 'zero-categories' group.
+                groupPrefsList.removeAll();
+
+                PreferenceCategory groupCategory = new PreferenceCategory(mContext);
+                groupCategory.setTitle(R.string.notification_channels);
+                groupCategory.setKey(KEY_ZERO_CATEGORIES);
+                groupPrefsList.addPreference(groupCategory);
+
+                Preference empty = new Preference(mContext);
+                empty.setTitle(R.string.no_channels);
+                empty.setEnabled(false);
+                groupCategory.addPreference(empty);
             }
-            if (!group.isBlocked()) {
-                final List<NotificationChannel> channels = group.getChannels();
-                Collections.sort(channels, CHANNEL_COMPARATOR);
-                int N = channels.size();
-                for (int i = 0; i < N; i++) {
-                    final NotificationChannel channel = channels.get(i);
-                    // conversations get their own section
-                    if (TextUtils.isEmpty(channel.getConversationId()) || channel.isDemoted()) {
-                        populateSingleChannelPrefs(groupCategory, channel, group.isBlocked());
-                    }
-                }
+        } else {
+            updateGroupList(groupPrefsList, channelGroups);
+        }
+    }
+
+    /**
+     * Looks for the category for the given group's key at the expected index, if that doesn't
+     * match, it checks all groups, and if it can't find that group anywhere, it creates it.
+     */
+    @NonNull
+    private PreferenceCategory findOrCreateGroupCategoryForKey(
+            @NonNull PreferenceCategory groupPrefsList, @Nullable String key, int expectedIndex) {
+        if (key == null) {
+            key = KEY_GENERAL_CATEGORY;
+        }
+        int preferenceCount = groupPrefsList.getPreferenceCount();
+        if (expectedIndex < preferenceCount) {
+            Preference preference = groupPrefsList.getPreference(expectedIndex);
+            if (key.equals(preference.getKey())) {
+                return (PreferenceCategory) preference;
+            }
+        }
+        for (int i = 0; i < preferenceCount; i++) {
+            Preference preference = groupPrefsList.getPreference(i);
+            if (key.equals(preference.getKey())) {
+                preference.setOrder(expectedIndex);
+                return (PreferenceCategory) preference;
+            }
+        }
+        PreferenceCategory groupCategory = new PreferenceCategory(mContext);
+        groupCategory.setOrder(expectedIndex);
+        groupCategory.setKey(key);
+        groupPrefsList.addPreference(groupCategory);
+        return groupCategory;
+    }
+
+    private void updateGroupList(@NonNull PreferenceCategory groupPrefsList,
+            @NonNull List<NotificationChannelGroup> channelGroups) {
+        // Update the list, but optimize for the most common case where the list hasn't changed.
+        int numFinalGroups = channelGroups.size();
+        int initialPrefCount = groupPrefsList.getPreferenceCount();
+        List<PreferenceCategory> finalOrderedGroups = new ArrayList<>(numFinalGroups);
+        for (int i = 0; i < numFinalGroups; i++) {
+            NotificationChannelGroup group = channelGroups.get(i);
+            PreferenceCategory groupCategory =
+                    findOrCreateGroupCategoryForKey(groupPrefsList, group.getId(), i);
+            finalOrderedGroups.add(groupCategory);
+            updateGroupPreferences(group, groupCategory);
+        }
+        int postAddPrefCount = groupPrefsList.getPreferenceCount();
+        // If any groups were inserted (into a non-empty list) or need to be removed, we need to
+        // remove all groups and re-add them all.
+        // This is required to ensure proper ordering of inserted groups, and it simplifies logic
+        // at the cost of computation in the rare case that the list is changing.
+        boolean hasInsertions = initialPrefCount != 0 && initialPrefCount != numFinalGroups;
+        boolean requiresRemoval = postAddPrefCount != numFinalGroups;
+        if (hasInsertions || requiresRemoval) {
+            groupPrefsList.removeAll();
+            for (PreferenceCategory group : finalOrderedGroups) {
+                groupPrefsList.addPreference(group);
             }
         }
     }
 
-    protected void populateGroupToggle(final PreferenceGroup parent,
-            NotificationChannelGroup group) {
-        RestrictedSwitchPreference preference =
-                new RestrictedSwitchPreference(mContext);
+    /**
+     * Looks for the channel preference for the given channel's key at the expected index, if that
+     * doesn't match, it checks all rows, and if it can't find that channel anywhere, it creates
+     * the preference.
+     */
+    @NonNull
+    private PrimarySwitchPreference findOrCreateChannelPrefForKey(
+            @NonNull PreferenceGroup groupPrefGroup, @NonNull String key, int expectedIndex) {
+        int preferenceCount = groupPrefGroup.getPreferenceCount();
+        if (expectedIndex < preferenceCount) {
+            Preference preference = groupPrefGroup.getPreference(expectedIndex);
+            if (key.equals(preference.getKey())) {
+                return (PrimarySwitchPreference) preference;
+            }
+        }
+        for (int i = 0; i < preferenceCount; i++) {
+            Preference preference = groupPrefGroup.getPreference(i);
+            if (key.equals(preference.getKey())) {
+                preference.setOrder(expectedIndex);
+                return (PrimarySwitchPreference) preference;
+            }
+        }
+        PrimarySwitchPreference channelPref = new PrimarySwitchPreference(mContext);
+        channelPref.setOrder(expectedIndex);
+        channelPref.setKey(key);
+        groupPrefGroup.addPreference(channelPref);
+        return channelPref;
+    }
+
+    private void updateGroupPreferences(@NonNull NotificationChannelGroup group,
+            @NonNull PreferenceGroup groupPrefGroup) {
+        int initialPrefCount = groupPrefGroup.getPreferenceCount();
+        List<Preference> finalOrderedPrefs = new ArrayList<>();
+        if (group.getId() == null) {
+            // For the 'null' group, set the "Other" title.
+            groupPrefGroup.setTitle(R.string.notification_channels_other);
+        } else {
+            // For an app-defined group, set their name and create a row to toggle 'isBlocked'.
+            groupPrefGroup.setTitle(group.getName());
+            finalOrderedPrefs.add(addOrUpdateGroupToggle(groupPrefGroup, group));
+        }
+        // Here "empty" means having no channel rows; the group toggle is ignored for this purpose.
+        boolean initiallyEmpty = groupPrefGroup.getPreferenceCount() == finalOrderedPrefs.size();
+
+        // For each channel, add or update the preference object.
+        final List<NotificationChannel> channels =
+                group.isBlocked() ? Collections.emptyList() : group.getChannels();
+        Collections.sort(channels, CHANNEL_COMPARATOR);
+        for (NotificationChannel channel : channels) {
+            if (!TextUtils.isEmpty(channel.getConversationId()) && !channel.isDemoted()) {
+                // conversations get their own section
+                continue;
+            }
+            // Get or create the row, and populate its current state.
+            PrimarySwitchPreference channelPref = findOrCreateChannelPrefForKey(groupPrefGroup,
+                    channel.getId(), /* expectedIndex */ finalOrderedPrefs.size());
+            updateSingleChannelPrefs(channelPref, channel, group.isBlocked());
+            finalOrderedPrefs.add(channelPref);
+        }
+        int postAddPrefCount = groupPrefGroup.getPreferenceCount();
+
+        // If any channels were inserted (into a non-empty list) or need to be removed, we need to
+        // remove all preferences and re-add them all.
+        // This is required to ensure proper ordering of inserted channels, and it simplifies logic
+        // at the cost of computation in the rare case that the list is changing.
+        int numFinalGroups = finalOrderedPrefs.size();
+        boolean hasInsertions = !initiallyEmpty && initialPrefCount != numFinalGroups;
+        boolean requiresRemoval = postAddPrefCount != numFinalGroups;
+        if (hasInsertions || requiresRemoval) {
+            groupPrefGroup.removeAll();
+            for (Preference preference : finalOrderedPrefs) {
+                groupPrefGroup.addPreference(preference);
+            }
+        }
+    }
+
+    /** Add or find and update the toggle for disabling the entire notification channel group. */
+    private Preference addOrUpdateGroupToggle(@NonNull final PreferenceGroup parent,
+            @NonNull final NotificationChannelGroup group) {
+        boolean shouldAdd = false;
+        final RestrictedSwitchPreference preference;
+        if (parent.getPreferenceCount() > 0
+                && parent.getPreference(0) instanceof RestrictedSwitchPreference) {
+            preference = (RestrictedSwitchPreference) parent.getPreference(0);
+        } else {
+            shouldAdd = true;
+            preference = new RestrictedSwitchPreference(mContext);
+        }
+        preference.setOrder(-1);
         preference.setTitle(mContext.getString(
                 R.string.notification_switch_label, group.getName()));
         preference.setEnabled(mAdmin == null
@@ -171,23 +300,26 @@
             onGroupBlockStateChanged(group);
             return true;
         });
-
-        parent.addPreference(preference);
+        if (shouldAdd) {
+            parent.addPreference(preference);
+        }
+        return preference;
     }
 
-    protected Preference populateSingleChannelPrefs(PreferenceGroup parent,
-            final NotificationChannel channel, final boolean groupBlocked) {
-        MasterSwitchPreference channelPref = new MasterSwitchPreference(mContext);
+    /** Update the properties of the channel preference with the values from the channel object. */
+    private void updateSingleChannelPrefs(@NonNull final PrimarySwitchPreference channelPref,
+            @NonNull final NotificationChannel channel,
+            final boolean groupBlocked) {
         channelPref.setSwitchEnabled(mAdmin == null
                 && isChannelBlockable(channel)
                 && isChannelConfigurable(channel)
                 && !groupBlocked);
-        channelPref.setIcon(null);
         if (channel.getImportance() > IMPORTANCE_LOW) {
             channelPref.setIcon(getAlertingIcon());
+        } else {
+            channelPref.setIcon(null);
         }
-        channelPref.setIconSize(MasterSwitchPreference.ICON_SIZE_SMALL);
-        channelPref.setKey(channel.getId());
+        channelPref.setIconSize(PrimarySwitchPreference.ICON_SIZE_SMALL);
         channelPref.setTitle(channel.getName());
         channelPref.setSummary(NotificationBackend.getSentSummary(
                 mContext, mAppRow.sentByChannel.get(channel.getId()), false));
@@ -207,25 +339,18 @@
         channelPref.setOnPreferenceChangeListener(
                 (preference, o) -> {
                     boolean value = (Boolean) o;
-                    int importance = value ? IMPORTANCE_LOW : IMPORTANCE_NONE;
+                    int importance = value ? channel.getOriginalImportance() : IMPORTANCE_NONE;
                     channel.setImportance(importance);
-                    channel.lockFields(
-                            NotificationChannel.USER_LOCKED_IMPORTANCE);
-                    MasterSwitchPreference channelPref1 = (MasterSwitchPreference) preference;
+                    channel.lockFields(NotificationChannel.USER_LOCKED_IMPORTANCE);
+                    PrimarySwitchPreference channelPref1 = (PrimarySwitchPreference) preference;
                     channelPref1.setIcon(null);
                     if (channel.getImportance() > IMPORTANCE_LOW) {
                         channelPref1.setIcon(getAlertingIcon());
                     }
-                    toggleBehaviorIconState(channelPref1.getIcon(),
-                            importance != IMPORTANCE_NONE);
                     mBackend.updateChannel(mAppRow.pkg, mAppRow.uid, channel);
 
                     return true;
                 });
-        if (parent.findPreference(channelPref.getKey()) == null) {
-            parent.addPreference(channelPref);
-        }
-        return channelPref;
     }
 
     private Drawable getAlertingIcon() {
@@ -234,52 +359,13 @@
         return icon;
     }
 
-    private void toggleBehaviorIconState(Drawable icon, boolean enabled) {
-        if (icon == null) return;
-
-        LayerDrawable layerDrawable = (LayerDrawable) icon;
-        GradientDrawable background =
-                (GradientDrawable) layerDrawable.findDrawableByLayerId(R.id.back);
-
-        if (background == null) return;
-
-        if (enabled) {
-            background.clearColorFilter();
-        } else {
-            background.setColorFilter(new BlendModeColorFilter(
-                    mContext.getColor(R.color.material_grey_300),
-                    BlendMode.SRC_IN));
-        }
-    }
-
     protected void onGroupBlockStateChanged(NotificationChannelGroup group) {
         if (group == null) {
             return;
         }
-        PreferenceGroup groupGroup = mPreference.findPreference(group.getId());
-
-        if (groupGroup != null) {
-            if (group.isBlocked()) {
-                List<Preference> toRemove = new ArrayList<>();
-                int childCount = groupGroup.getPreferenceCount();
-                for (int i = 0; i < childCount; i++) {
-                    Preference pref = groupGroup.getPreference(i);
-                    if (pref instanceof MasterSwitchPreference) {
-                        toRemove.add(pref);
-                    }
-                }
-                for (Preference pref : toRemove) {
-                    groupGroup.removePreference(pref);
-                }
-            } else {
-                final List<NotificationChannel> channels = group.getChannels();
-                Collections.sort(channels, CHANNEL_COMPARATOR);
-                int N = channels.size();
-                for (int i = 0; i < N; i++) {
-                    final NotificationChannel channel = channels.get(i);
-                    populateSingleChannelPrefs(groupGroup, channel, group.isBlocked());
-                }
-            }
+        PreferenceGroup groupPrefGroup = mPreference.findPreference(group.getId());
+        if (groupPrefGroup != null) {
+            updateGroupPreferences(group, groupPrefGroup);
         }
     }
 }
diff --git a/src/com/android/settings/notification/app/ConversationPriorityPreference.java b/src/com/android/settings/notification/app/ConversationPriorityPreference.java
index 307abec..67bffbf 100644
--- a/src/com/android/settings/notification/app/ConversationPriorityPreference.java
+++ b/src/com/android/settings/notification/app/ConversationPriorityPreference.java
@@ -50,8 +50,6 @@
     private View mAlertButton;
     private View mPriorityButton;
     private Context mContext;
-    Drawable selectedBackground;
-    Drawable unselectedBackground;
     private static final int BUTTON_ANIM_TIME_MS = 100;
 
     public ConversationPriorityPreference(Context context, AttributeSet attrs,
@@ -77,8 +75,6 @@
 
     private void init(Context context) {
         mContext = context;
-        selectedBackground = mContext.getDrawable(R.drawable.button_border_selected);
-        unselectedBackground = mContext.getDrawable(R.drawable.button_border_unselected);
         setLayoutResource(R.layout.notif_priority_conversation_preference);
     }
 
@@ -148,86 +144,43 @@
             TransitionManager.beginDelayedTransition(parent, transition);
         }
 
-        ColorStateList colorAccent = getAccentTint();
-        ColorStateList colorNormal = getRegularTint();
-        ImageView silenceIcon = parent.findViewById(R.id.silence_icon);
-        TextView silenceLabel = parent.findViewById(R.id.silence_label);
-        TextView silenceSummary = parent.findViewById(R.id.silence_summary);
-        ImageView alertIcon = parent.findViewById(R.id.alert_icon);
-        TextView alertLabel = parent.findViewById(R.id.alert_label);
-        TextView alertSummary = parent.findViewById(R.id.alert_summary);
-        ImageView priorityIcon = parent.findViewById(R.id.priority_icon);
-        TextView priorityLabel = parent.findViewById(R.id.priority_label);
-        TextView prioritySummary = parent.findViewById(R.id.priority_summary);
-
         if (importance <= IMPORTANCE_LOW && importance > IMPORTANCE_UNSPECIFIED) {
-            alertSummary.setVisibility(GONE);
-            alertIcon.setImageTintList(colorNormal);
-            alertLabel.setTextColor(colorNormal);
-
-            prioritySummary.setVisibility(GONE);
-            priorityIcon.setImageTintList(colorNormal);
-            priorityLabel.setTextColor(colorNormal);
-
-            silenceIcon.setImageTintList(colorAccent);
-            silenceLabel.setTextColor(colorAccent);
-            silenceSummary.setVisibility(VISIBLE);
-
-            mAlertButton.setBackground(unselectedBackground);
-            mPriorityButton.setBackground(unselectedBackground);
-            mSilenceButton.setBackground(selectedBackground);
-            // a11y service won't always read the newly appearing text in the right order if the
-            // selection happens too soon (readback happens on a different thread as layout). post
-            // the selection to make that conflict less likely
-            parent.post(() -> {
-                mSilenceButton.setSelected(true);
-                mAlertButton.setSelected(false);
-                mPriorityButton.setSelected(false);
-            });
+            setSelected(mPriorityButton, false);
+            setSelected(mAlertButton, false);
+            setSelected(mSilenceButton, true);
         } else {
             if (isPriority) {
-                alertSummary.setVisibility(GONE);
-                alertIcon.setImageTintList(colorNormal);
-                alertLabel.setTextColor(colorNormal);
-
-                prioritySummary.setVisibility(VISIBLE);
-                priorityIcon.setImageTintList(colorAccent);
-                priorityLabel.setTextColor(colorAccent);
-
-                silenceIcon.setImageTintList(colorNormal);
-                silenceLabel.setTextColor(colorNormal);
-                silenceSummary.setVisibility(GONE);
-
-                mAlertButton.setBackground(unselectedBackground);
-                mPriorityButton.setBackground(selectedBackground);
-                mSilenceButton.setBackground(unselectedBackground);
-                parent.post(() -> {
-                    mSilenceButton.setSelected(false);
-                    mAlertButton.setSelected(false);
-                    mPriorityButton.setSelected(true);
-                });
+                setSelected(mPriorityButton, true);
+                setSelected(mAlertButton, false);
+                setSelected(mSilenceButton, false);
             } else {
-                alertSummary.setVisibility(VISIBLE);
-                alertIcon.setImageTintList(colorAccent);
-                alertLabel.setTextColor(colorAccent);
-
-                prioritySummary.setVisibility(GONE);
-                priorityIcon.setImageTintList(colorNormal);
-                priorityLabel.setTextColor(colorNormal);
-
-                silenceIcon.setImageTintList(colorNormal);
-                silenceLabel.setTextColor(colorNormal);
-                silenceSummary.setVisibility(GONE);
-
-                mAlertButton.setBackground(selectedBackground);
-                mPriorityButton.setBackground(unselectedBackground);
-                mSilenceButton.setBackground(unselectedBackground);
-                parent.post(() -> {
-                    mSilenceButton.setSelected(false);
-                    mAlertButton.setSelected(true);
-                    mPriorityButton.setSelected(false);
-                });
+                setSelected(mPriorityButton, false);
+                setSelected(mAlertButton, true);
+                setSelected(mSilenceButton, false);
             }
         }
     }
+
+    void setSelected(View view, boolean selected) {
+        ColorStateList colorAccent = getAccentTint();
+        ColorStateList colorNormal = getRegularTint();
+
+        ImageView icon = view.findViewById(R.id.icon);
+        TextView label = view.findViewById(R.id.label);
+        TextView summary = view.findViewById(R.id.summary);
+
+        icon.setImageTintList(selected ? colorAccent : colorNormal);
+        label.setTextColor(selected ? colorAccent : colorNormal);
+        summary.setVisibility(selected ? VISIBLE : GONE);
+
+        view.setBackground(mContext.getDrawable(selected
+                ? R.drawable.button_border_selected
+                : R.drawable.button_border_unselected));
+        // a11y service won't always read the newly appearing text in the right order if the
+        // selection happens too soon (readback happens on a different thread as layout). post
+        // the selection to make that conflict less likely
+        view.post(() -> {
+            view.setSelected(selected);
+        });
+    }
 }
diff --git a/src/com/android/settings/notification/history/NotificationHistoryActivity.java b/src/com/android/settings/notification/history/NotificationHistoryActivity.java
index 7635a4f..b184740 100644
--- a/src/com/android/settings/notification/history/NotificationHistoryActivity.java
+++ b/src/com/android/settings/notification/history/NotificationHistoryActivity.java
@@ -155,21 +155,22 @@
 
             final View container = viewForPackage.findViewById(R.id.notification_list);
             container.setVisibility(View.GONE);
-            ImageButton expand = viewForPackage.findViewById(R.id.expand);
-            expand.setContentDescription(container.getVisibility() == View.VISIBLE
+            View header = viewForPackage.findViewById(R.id.app_header);
+            ImageView expand = viewForPackage.findViewById(R.id.expand);
+            header.setStateDescription(container.getVisibility() == View.VISIBLE
                     ? getString(R.string.condition_expand_hide)
                     : getString(R.string.condition_expand_show));
             int finalI = i;
-            expand.setOnClickListener(v -> {
+            header.setOnClickListener(v -> {
                 container.setVisibility(container.getVisibility() == View.VISIBLE
                         ? View.GONE : View.VISIBLE);
                 expand.setImageResource(container.getVisibility() == View.VISIBLE
                         ? R.drawable.ic_expand_less
                         : com.android.internal.R.drawable.ic_expand_more);
-                expand.setContentDescription(container.getVisibility() == View.VISIBLE
+                header.setStateDescription(container.getVisibility() == View.VISIBLE
                         ? getString(R.string.condition_expand_hide)
                         : getString(R.string.condition_expand_show));
-                expand.sendAccessibilityEvent(TYPE_VIEW_ACCESSIBILITY_FOCUSED);
+                header.sendAccessibilityEvent(TYPE_VIEW_ACCESSIBILITY_FOCUSED);
                 mUiEventLogger.logWithPosition(
                         (container.getVisibility() == View.VISIBLE)
                             ? NotificationHistoryEvent.NOTIFICATION_HISTORY_PACKAGE_HISTORY_OPEN
diff --git a/src/com/android/settings/notification/history/NotificationHistoryViewHolder.java b/src/com/android/settings/notification/history/NotificationHistoryViewHolder.java
index 4991548..da1ed11 100644
--- a/src/com/android/settings/notification/history/NotificationHistoryViewHolder.java
+++ b/src/com/android/settings/notification/history/NotificationHistoryViewHolder.java
@@ -33,7 +33,6 @@
     NotificationHistoryViewHolder(View itemView) {
         super(itemView);
         mTime = itemView.findViewById(R.id.timestamp);
-        mTime.setShowRelativeTime(true);
         mTitle = itemView.findViewById(R.id.title);
         mSummary = itemView.findViewById(R.id.text);
     }
diff --git a/src/com/android/settings/notification/history/NotificationSbnViewHolder.java b/src/com/android/settings/notification/history/NotificationSbnViewHolder.java
index de12847..ac39f88 100644
--- a/src/com/android/settings/notification/history/NotificationSbnViewHolder.java
+++ b/src/com/android/settings/notification/history/NotificationSbnViewHolder.java
@@ -108,7 +108,7 @@
                                 : NotificationHistoryActivity.NotificationHistoryEvent
                                 .NOTIFICATION_HISTORY_RECENT_ITEM_CLICK,
                         uid, pkg, instanceId, position);
-                if (pi != null) {
+                if (pi != null && isPendingIntentValid) {
                     try {
                         pi.send();
                     } catch (PendingIntent.CanceledException e) {
diff --git a/src/com/android/settings/notification/history/NotificationStation.java b/src/com/android/settings/notification/history/NotificationStation.java
index 9d53479..5ce5952 100644
--- a/src/com/android/settings/notification/history/NotificationStation.java
+++ b/src/com/android/settings/notification/history/NotificationStation.java
@@ -312,7 +312,7 @@
         if (n.extras != null) {
             title = n.extras.getCharSequence(Notification.EXTRA_TITLE);
         }
-        return title == null? null : String.valueOf(title);
+        return title == null? "" : String.valueOf(title);
     }
 
     /**
@@ -339,7 +339,7 @@
                 text = n.extras.getCharSequence(Notification.EXTRA_TEXT);
             }
         }
-        return text == null ? null : String.valueOf(text);
+        return text == null ? "" : String.valueOf(text);
     }
 
     private Drawable loadIcon(HistoricalNotificationInfo info, StatusBarNotification sbn) {
diff --git a/src/com/android/settings/notification/zen/ZenModeBackend.java b/src/com/android/settings/notification/zen/ZenModeBackend.java
index 2f6a2b1..1d41bb9 100644
--- a/src/com/android/settings/notification/zen/ZenModeBackend.java
+++ b/src/com/android/settings/notification/zen/ZenModeBackend.java
@@ -26,7 +26,7 @@
 import android.app.NotificationManager;
 import android.content.Context;
 import android.database.Cursor;
-import android.icu.text.ListFormatter;
+import android.icu.text.MessageFormat;
 import android.net.Uri;
 import android.provider.ContactsContract;
 import android.provider.Settings;
@@ -41,7 +41,9 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 public class ZenModeBackend {
@@ -468,37 +470,30 @@
     String getStarredContactsSummary(Context context) {
         List<String> starredContacts = getStarredContacts();
         int numStarredContacts = starredContacts.size();
-
-        List<String> displayContacts = new ArrayList<>();
-
-        if (numStarredContacts == 0) {
-            displayContacts.add(context.getString(R.string.zen_mode_starred_contacts_summary_none));
-        } else {
-            for (int i = 0; i < 2 && i < numStarredContacts; i++) {
-                displayContacts.add(starredContacts.get(i));
-            }
-
-            if (numStarredContacts == 3) {
-                displayContacts.add(starredContacts.get(2));
-            } else if (numStarredContacts > 2) {
-                displayContacts.add(context.getResources().getQuantityString(
-                        R.plurals.zen_mode_starred_contacts_summary_additional_contacts,
-                        numStarredContacts - 2, numStarredContacts - 2));
+        MessageFormat msgFormat = new MessageFormat(
+                mContext.getString(R.string.zen_mode_starred_contacts_summary_contacts),
+                Locale.getDefault());
+        Map<String, Object> args = new HashMap<>();
+        args.put("count", numStarredContacts);
+        if (numStarredContacts >= 1) {
+            args.put("contact_1", starredContacts.get(0));
+            if (numStarredContacts >= 2) {
+                args.put("contact_2", starredContacts.get(1));
+                if (numStarredContacts == 3) {
+                    args.put("contact_3", starredContacts.get(2));
+                }
             }
         }
-
-        // values in displayContacts must not be null
-        return ListFormatter.getInstance().format(displayContacts);
+        return msgFormat.format(args);
     }
 
     String getContactsNumberSummary(Context context) {
-        final int numContacts = queryAllContactsData().getCount();
-        if (numContacts == 0) {
-            return context.getResources().getString(
-                    R.string.zen_mode_contacts_count_none);
-        }
-        return context.getResources().getQuantityString(R.plurals.zen_mode_contacts_count,
-                numContacts, numContacts);
+        MessageFormat msgFormat = new MessageFormat(
+                mContext.getString(R.string.zen_mode_contacts_count),
+                Locale.getDefault());
+        Map<String, Object> args = new HashMap<>();
+        args.put("count", queryAllContactsData().getCount());
+        return msgFormat.format(args);
     }
 
     private Cursor queryStarredContactsData() {
diff --git a/src/com/android/settings/notification/zen/ZenModeBypassingAppsPreferenceController.java b/src/com/android/settings/notification/zen/ZenModeBypassingAppsPreferenceController.java
index d088c0a..8d2ae48 100644
--- a/src/com/android/settings/notification/zen/ZenModeBypassingAppsPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenModeBypassingAppsPreferenceController.java
@@ -3,7 +3,7 @@
 import android.app.Application;
 import android.app.NotificationChannel;
 import android.content.Context;
-import android.icu.text.ListFormatter;
+import android.icu.text.MessageFormat;
 import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.ArraySet;
@@ -21,7 +21,10 @@
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -119,29 +122,23 @@
         }
 
         final int numAppsBypassingDnd = appsBypassingDnd.size();
-        if (numAppsBypassingDnd == 0) {
-            mSummary = mContext.getResources().getString(
-                    R.string.zen_mode_bypassing_apps_subtext_none);
-            refreshSummary(mPreference);
-            return;
+        String[] appsBypassingDndArr = appsBypassingDnd.toArray(new String[numAppsBypassingDnd]);
+        MessageFormat msgFormat = new MessageFormat(
+                mContext.getString(R.string.zen_mode_bypassing_apps_subtext),
+                Locale.getDefault());
+        Map<String, Object> args = new HashMap<>();
+        args.put("count", numAppsBypassingDnd);
+        if (numAppsBypassingDnd >= 1) {
+            args.put("app_1", appsBypassingDndArr[0]);
+            if (numAppsBypassingDnd >= 2) {
+                args.put("app_2", appsBypassingDndArr[1]);
+                if (numAppsBypassingDnd == 3) {
+                    args.put("app_3", appsBypassingDndArr[2]);
+                }
+            }
         }
 
-        List<String> displayAppsBypassing = new ArrayList<>();
-        if (numAppsBypassingDnd <= 2) {
-            displayAppsBypassing.addAll(appsBypassingDnd);
-        } else {
-            String[] appsBypassingDndArr =
-                    appsBypassingDnd.toArray(new String[numAppsBypassingDnd]);
-            displayAppsBypassing.add(appsBypassingDndArr[0]);
-            displayAppsBypassing.add(appsBypassingDndArr[1]);
-            displayAppsBypassing.add(mContext.getResources().getString(
-                    R.string.zen_mode_apps_bypassing_list_count,
-                    numAppsBypassingDnd - 2));
-        }
-        mSummary = mContext.getResources().getQuantityString(
-                R.plurals.zen_mode_bypassing_apps_subtext,
-                numAppsBypassingDnd,
-                ListFormatter.getInstance().format(displayAppsBypassing));
+        mSummary = msgFormat.format(args);
         refreshSummary(mPreference);
     }
 
diff --git a/src/com/android/settings/notification/zen/ZenModeDurationPreferenceController.java b/src/com/android/settings/notification/zen/ZenModeDurationPreferenceController.java
index f5d21a2..938796b 100644
--- a/src/com/android/settings/notification/zen/ZenModeDurationPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenModeDurationPreferenceController.java
@@ -17,11 +17,16 @@
 package com.android.settings.notification.zen;
 
 import android.content.Context;
+import android.icu.text.MessageFormat;
 
 import com.android.settings.R;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
 public class ZenModeDurationPreferenceController extends AbstractZenModePreferenceController
         implements PreferenceControllerMixin {
 
@@ -51,12 +56,19 @@
             summary = mContext.getString(R.string.zen_mode_duration_summary_forever);
         } else {
             if (zenDuration >= 60) {
-                int hours = zenDuration / 60;
-                summary = mContext.getResources().getQuantityString(
-                        R.plurals.zen_mode_duration_summary_time_hours, hours, hours);
+                MessageFormat msgFormat = new MessageFormat(
+                        mContext.getString(R.string.zen_mode_duration_summary_time_hours),
+                        Locale.getDefault());
+                Map<String, Object> msgArgs = new HashMap<>();
+                msgArgs.put("count", zenDuration / 60);
+                summary = msgFormat.format(msgArgs);
             } else {
-                summary = mContext.getResources().getString(
-                        R.string.zen_mode_duration_summary_time_minutes, zenDuration);
+                MessageFormat msgFormat = new MessageFormat(
+                        mContext.getString(R.string.zen_mode_duration_summary_time_minutes),
+                        Locale.getDefault());
+                Map<String, Object> msgArgs = new HashMap<>();
+                msgArgs.put("count", zenDuration);
+                summary = msgFormat.format(msgArgs);
             }
         }
 
diff --git a/src/com/android/settings/notification/zen/ZenModePriorityConversationsPreferenceController.java b/src/com/android/settings/notification/zen/ZenModePriorityConversationsPreferenceController.java
index 4ae16bc..e77f4ea 100644
--- a/src/com/android/settings/notification/zen/ZenModePriorityConversationsPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenModePriorityConversationsPreferenceController.java
@@ -23,6 +23,7 @@
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.content.pm.ParceledListSlice;
+import android.icu.text.MessageFormat;
 import android.os.AsyncTask;
 import android.service.notification.ConversationChannelWrapper;
 import android.view.View;
@@ -41,7 +42,10 @@
 import com.android.settingslib.widget.RadioButtonPreference;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
+import java.util.Map;
 
 /**
  * Options to choose the priority conversations that are allowed to bypass DND.
@@ -130,12 +134,13 @@
 
         if (numConversations == UNSET) {
             return null;
-        } else if (numConversations == 0) {
-            return mContext.getResources().getString(
-                    R.string.zen_mode_conversations_count_none);
         } else {
-            return mContext.getResources().getQuantityString(
-                    R.plurals.zen_mode_conversations_count, numConversations, numConversations);
+            MessageFormat msgFormat = new MessageFormat(
+                    mContext.getString(R.string.zen_mode_conversations_count),
+                    Locale.getDefault());
+            Map<String, Object> args = new HashMap<>();
+            args.put("count", numConversations);
+            return msgFormat.format(args);
         }
     }
 
diff --git a/src/com/android/settings/notification/zen/ZenModeSettings.java b/src/com/android/settings/notification/zen/ZenModeSettings.java
index 436a399..2cc4f8b 100644
--- a/src/com/android/settings/notification/zen/ZenModeSettings.java
+++ b/src/com/android/settings/notification/zen/ZenModeSettings.java
@@ -32,7 +32,7 @@
 import android.app.NotificationManager.Policy;
 import android.app.settings.SettingsEnums;
 import android.content.Context;
-import android.icu.text.ListFormatter;
+import android.icu.text.MessageFormat;
 import android.provider.Settings;
 import android.service.notification.ZenModeConfig;
 
@@ -47,7 +47,9 @@
 import com.android.settingslib.search.SearchIndexable;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.function.Predicate;
@@ -130,24 +132,21 @@
                             || PRIORITY_CATEGORY_EVENTS == category,
                     true);
             int numCategories = enabledCategories.size();
-            if (numCategories == 0) {
-                return mContext.getResources().getString(R.string.zen_mode_other_sounds_none);
+            MessageFormat msgFormat = new MessageFormat(
+                    mContext.getString(R.string.zen_mode_other_sounds_summary),
+                    Locale.getDefault());
+            Map<String, Object> args = new HashMap<>();
+            args.put("count", numCategories);
+            if (numCategories >= 1) {
+                args.put("sound_category_1", enabledCategories.get(0));
+                if (numCategories >= 2) {
+                    args.put("sound_category_2", enabledCategories.get(1));
+                    if (numCategories == 3) {
+                        args.put("sound_category_3", enabledCategories.get(2));
+                    }
+                }
             }
-
-            List<String> displayCategories = new ArrayList<>();
-            if (numCategories <= 2) {
-                displayCategories = enabledCategories;
-            } else {
-                displayCategories.add(enabledCategories.get(0));
-                displayCategories.add(enabledCategories.get(1));
-                displayCategories.add(mContext.getString(R.string.zen_mode_other_sounds_list_count,
-                        numCategories - 2));
-            }
-
-            return mContext.getResources().getQuantityString(
-                    R.plurals.zen_mode_other_sounds_summary,
-                    numCategories /* quantity */,
-                    ListFormatter.getInstance().format(displayCategories));
+            return msgFormat.format(args);
         }
 
         String getCallsSettingSummary(Policy policy) {
@@ -192,15 +191,12 @@
                             description);
                 }
             } else {
-                final int count = getEnabledAutomaticRulesCount();
-                if (count > 0) {
-                    return mContext.getString(R.string.zen_mode_sound_summary_off_with_info,
-                            mContext.getResources().getQuantityString(
-                                    R.plurals.zen_mode_sound_summary_summary_off_info,
-                                    count, count));
-                }
-
-                return mContext.getString(R.string.zen_mode_sound_summary_off);
+                MessageFormat msgFormat = new MessageFormat(
+                        mContext.getString(R.string.zen_mode_sound_summary_off),
+                        Locale.getDefault());
+                Map<String, Object> msgArgs = new HashMap<>();
+                msgArgs.put("count", getEnabledAutomaticRulesCount());
+                return msgFormat.format(msgArgs);
             }
         }
 
@@ -218,10 +214,12 @@
         }
 
         String getAutomaticRulesSummary() {
-            final int count = getEnabledAutomaticRulesCount();
-            return count == 0 ? mContext.getString(R.string.zen_mode_settings_summary_off)
-                    : mContext.getResources().getQuantityString(
-                            R.plurals.zen_mode_settings_summary_on, count, count);
+            MessageFormat msgFormat = new MessageFormat(
+                    mContext.getString(R.string.zen_mode_settings_schedules_summary),
+                    Locale.getDefault());
+            Map<String, Object> msgArgs = new HashMap<>();
+            msgArgs.put("count", getEnabledAutomaticRulesCount());
+            return msgFormat.format(msgArgs);
         }
 
         @VisibleForTesting
diff --git a/src/com/android/settings/notification/zen/ZenModeSoundVibrationPreferenceController.java b/src/com/android/settings/notification/zen/ZenModeSoundVibrationPreferenceController.java
index 691c2ae..1ceb357 100644
--- a/src/com/android/settings/notification/zen/ZenModeSoundVibrationPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenModeSoundVibrationPreferenceController.java
@@ -58,7 +58,7 @@
         switch (getZenMode()) {
             case Settings.Global.ZEN_MODE_NO_INTERRUPTIONS:
                 preference.setEnabled(false);
-                preference.setSummary(mContext.getString(R.string.zen_mode_other_sounds_none));
+                preference.setSummary(mContext.getString(R.string.zen_mode_sounds_none));
                 break;
             case Settings.Global.ZEN_MODE_ALARMS:
                 preference.setEnabled(false);
diff --git a/src/com/android/settings/overlay/FeatureFactory.java b/src/com/android/settings/overlay/FeatureFactory.java
index afbce09..b9aa68a 100644
--- a/src/com/android/settings/overlay/FeatureFactory.java
+++ b/src/com/android/settings/overlay/FeatureFactory.java
@@ -31,6 +31,7 @@
 import com.android.settings.dashboard.DashboardFeatureProvider;
 import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
 import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;
+import com.android.settings.fuelgauge.BatteryStatusFeatureProvider;
 import com.android.settings.fuelgauge.PowerUsageFeatureProvider;
 import com.android.settings.gestures.AssistGestureFeatureProvider;
 import com.android.settings.homepage.contextualcards.ContextualCardFeatureProvider;
@@ -103,6 +104,12 @@
 
     public abstract PowerUsageFeatureProvider getPowerUsageFeatureProvider(Context context);
 
+    /**
+     * Retrieve implementation for Battery Status feature.
+     */
+    public abstract BatteryStatusFeatureProvider getBatteryStatusFeatureProvider(
+            Context context);
+
     public abstract DashboardFeatureProvider getDashboardFeatureProvider(Context context);
 
     public abstract DockUpdaterFeatureProvider getDockUpdaterFeatureProvider();
diff --git a/src/com/android/settings/overlay/FeatureFactoryImpl.java b/src/com/android/settings/overlay/FeatureFactoryImpl.java
index 29beb5b..d4d396f 100644
--- a/src/com/android/settings/overlay/FeatureFactoryImpl.java
+++ b/src/com/android/settings/overlay/FeatureFactoryImpl.java
@@ -42,6 +42,8 @@
 import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl;
 import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;
 import com.android.settings.enterprise.EnterprisePrivacyFeatureProviderImpl;
+import com.android.settings.fuelgauge.BatteryStatusFeatureProvider;
+import com.android.settings.fuelgauge.BatteryStatusFeatureProviderImpl;
 import com.android.settings.fuelgauge.PowerUsageFeatureProvider;
 import com.android.settings.fuelgauge.PowerUsageFeatureProviderImpl;
 import com.android.settings.gestures.AssistGestureFeatureProvider;
@@ -78,6 +80,7 @@
     private SecurityFeatureProvider mSecurityFeatureProvider;
     private SuggestionFeatureProvider mSuggestionFeatureProvider;
     private PowerUsageFeatureProvider mPowerUsageFeatureProvider;
+    private BatteryStatusFeatureProvider mBatteryStatusFeatureProvider;
     private AssistGestureFeatureProvider mAssistGestureFeatureProvider;
     private UserFeatureProvider mUserFeatureProvider;
     private SlicesFeatureProvider mSlicesFeatureProvider;
@@ -111,6 +114,15 @@
     }
 
     @Override
+    public BatteryStatusFeatureProvider getBatteryStatusFeatureProvider(Context context) {
+        if (mBatteryStatusFeatureProvider == null) {
+            mBatteryStatusFeatureProvider = new BatteryStatusFeatureProviderImpl(
+                    context.getApplicationContext());
+        }
+        return mBatteryStatusFeatureProvider;
+    }
+
+    @Override
     public DashboardFeatureProvider getDashboardFeatureProvider(Context context) {
         if (mDashboardFeatureProvider == null) {
             mDashboardFeatureProvider = new DashboardFeatureProviderImpl(
diff --git a/src/com/android/settings/panel/PanelFragment.java b/src/com/android/settings/panel/PanelFragment.java
index 9cb626d..1aa2653 100644
--- a/src/com/android/settings/panel/PanelFragment.java
+++ b/src/com/android/settings/panel/PanelFragment.java
@@ -97,6 +97,7 @@
     private TextView mHeaderSubtitle;
     private int mMaxHeight;
     private View mFooterDivider;
+    private boolean mPanelCreating;
 
     private final Map<Uri, LiveData<Slice>> mSliceLiveData = new LinkedHashMap<>();
 
@@ -127,6 +128,7 @@
                     if (mPanelSlices != null) {
                         mPanelSlices.getViewTreeObserver().removeOnGlobalLayoutListener(this);
                     }
+                    mPanelCreating = false;
                 }
             };
 
@@ -140,6 +142,7 @@
         mLayoutView.getViewTreeObserver()
                 .addOnGlobalLayoutListener(mPanelLayoutListener);
         mMaxHeight = getResources().getDimensionPixelSize(R.dimen.output_switcher_slice_max_height);
+        mPanelCreating = true;
         createPanelContent();
         return mLayoutView;
     }
@@ -153,6 +156,7 @@
      * Call createPanelContent() once animation end.
      */
     void updatePanelWithAnimation() {
+        mPanelCreating = true;
         final View panelContent = mLayoutView.findViewById(R.id.panel_container);
         final AnimatorSet animatorSet = buildAnimatorSet(mLayoutView,
                 0.0f /* startY */, panelContent.getHeight() /* endY */,
@@ -171,11 +175,21 @@
         animatorSet.start();
     }
 
+    boolean isPanelCreating() {
+        return mPanelCreating;
+    }
+
     private void createPanelContent() {
         final FragmentActivity activity = getActivity();
+        if (activity == null) {
+            return;
+        }
+
         if (mLayoutView == null) {
             activity.finish();
+            return;
         }
+
         final ViewGroup.LayoutParams params = mLayoutView.getLayoutParams();
         params.height = ViewGroup.LayoutParams.WRAP_CONTENT;
         mLayoutView.setLayoutParams(params);
@@ -204,6 +218,7 @@
 
         if (mPanel == null) {
             activity.finish();
+            return;
         }
 
         mPanel.registerCallback(new LocalPanelCallback());
@@ -300,7 +315,7 @@
                  * Watching for the {@link Slice} to load.
                  * <p>
                  *     If the Slice comes back {@code null} or with the Error attribute, if slice
-                 *     uri is not in the whitelist, remove the Slice data from the list, otherwise
+                 *     uri is not in the allowlist, remove the Slice data from the list, otherwise
                  *     keep the Slice data.
                  * <p>
                  *     If the Slice has come back fully loaded, then mark the Slice as loaded.  No
@@ -331,10 +346,10 @@
     }
 
     private void removeSliceLiveData(Uri uri) {
-        final List<String> whiteList = Arrays.asList(
+        final List<String> allowList = Arrays.asList(
                 getResources().getStringArray(
                         R.array.config_panel_keep_observe_uri));
-        if (!whiteList.contains(uri.toString())) {
+        if (!allowList.contains(uri.toString())) {
             mSliceLiveData.remove(uri);
         }
     }
diff --git a/src/com/android/settings/panel/SettingsPanelActivity.java b/src/com/android/settings/panel/SettingsPanelActivity.java
index 68cb8d5..b7b1519 100644
--- a/src/com/android/settings/panel/SettingsPanelActivity.java
+++ b/src/com/android/settings/panel/SettingsPanelActivity.java
@@ -21,6 +21,7 @@
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.Window;
@@ -41,12 +42,14 @@
  */
 public class SettingsPanelActivity extends FragmentActivity {
 
-    private final String TAG = "panel_activity";
+    private static final String TAG = "SettingsPanelActivity";
 
     @VisibleForTesting
     final Bundle mBundle = new Bundle();
     @VisibleForTesting
     boolean mForceCreation = false;
+    @VisibleForTesting
+    PanelFragment mPanelFragment;
 
     /**
      * Key specifying which Panel the app is requesting.
@@ -87,7 +90,9 @@
     @Override
     protected void onStop() {
         super.onStop();
-        mForceCreation = true;
+        if (mPanelFragment != null && !mPanelFragment.isPanelCreating()) {
+            mForceCreation = true;
+        }
     }
 
     @Override
@@ -104,10 +109,10 @@
             return;
         }
 
+        final String action = callingIntent.getAction();
         // We will use it once media output switch panel support remote device.
         final String mediaPackageName = callingIntent.getStringExtra(EXTRA_PACKAGE_NAME);
-
-        mBundle.putString(KEY_PANEL_TYPE_ARGUMENT, callingIntent.getAction());
+        mBundle.putString(KEY_PANEL_TYPE_ARGUMENT, action);
         mBundle.putString(KEY_CALLING_PACKAGE_NAME, getCallingPackage());
         mBundle.putString(KEY_MEDIA_PACKAGE_NAME, mediaPackageName);
 
@@ -116,9 +121,21 @@
 
         // If fragment already exists and visible, we will need to update panel with animation.
         if (!shouldForceCreation && fragment != null && fragment instanceof PanelFragment) {
-            final PanelFragment panelFragment = (PanelFragment) fragment;
-            panelFragment.setArguments(mBundle);
-            panelFragment.updatePanelWithAnimation();
+            mPanelFragment = (PanelFragment) fragment;
+            if (mPanelFragment.isPanelCreating()) {
+                Log.w(TAG, "A panel is creating, skip " + action);
+                return;
+            }
+
+            final Bundle bundle = fragment.getArguments();
+            if (bundle != null
+                    && TextUtils.equals(action, bundle.getString(KEY_PANEL_TYPE_ARGUMENT))) {
+                Log.w(TAG, "Panel is showing the same action, skip " + action);
+                return;
+            }
+
+            mPanelFragment.setArguments(new Bundle(mBundle));
+            mPanelFragment.updatePanelWithAnimation();
         } else {
             setContentView(R.layout.settings_panel);
 
@@ -127,9 +144,9 @@
             window.setGravity(Gravity.BOTTOM);
             window.setLayout(WindowManager.LayoutParams.MATCH_PARENT,
                     WindowManager.LayoutParams.WRAP_CONTENT);
-            final PanelFragment panelFragment = new PanelFragment();
-            panelFragment.setArguments(mBundle);
-            fragmentManager.beginTransaction().add(R.id.main_content, panelFragment).commit();
+            mPanelFragment = new PanelFragment();
+            mPanelFragment.setArguments(new Bundle(mBundle));
+            fragmentManager.beginTransaction().add(R.id.main_content, mPanelFragment).commit();
         }
     }
 }
diff --git a/src/com/android/settings/panel/WifiPanel.java b/src/com/android/settings/panel/WifiPanel.java
index 0efa804..3b36a57 100644
--- a/src/com/android/settings/panel/WifiPanel.java
+++ b/src/com/android/settings/panel/WifiPanel.java
@@ -20,14 +20,12 @@
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
-import android.util.FeatureFlagUtils;
 
 import com.android.settings.R;
 import com.android.settings.SubSettings;
 import com.android.settings.slices.CustomSliceRegistry;
 import com.android.settings.slices.SliceBuilderUtils;
 import com.android.settings.wifi.WifiSettings;
-import com.android.settings.wifi.WifiSettings2;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -63,20 +61,11 @@
     public Intent getSeeMoreIntent() {
         final String screenTitle =
                 mContext.getText(R.string.wifi_settings).toString();
-        Intent intent;
-        if (FeatureFlagUtils.isEnabled(mContext, FeatureFlagUtils.SETTINGS_WIFITRACKER2)) {
-            intent = SliceBuilderUtils.buildSearchResultPageIntent(mContext,
-                    WifiSettings2.class.getName(),
-                    null /* key */,
-                    screenTitle,
-                    SettingsEnums.WIFI);
-        } else {
-            intent = SliceBuilderUtils.buildSearchResultPageIntent(mContext,
+        final Intent intent = SliceBuilderUtils.buildSearchResultPageIntent(mContext,
                     WifiSettings.class.getName(),
                     null /* key */,
                     screenTitle,
                     SettingsEnums.WIFI);
-        }
         intent.setClassName(mContext.getPackageName(), SubSettings.class.getName());
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         return intent;
diff --git a/src/com/android/settings/password/BiometricFragment.java b/src/com/android/settings/password/BiometricFragment.java
index de2a1ff..7666a36 100644
--- a/src/com/android/settings/password/BiometricFragment.java
+++ b/src/com/android/settings/password/BiometricFragment.java
@@ -17,11 +17,10 @@
 package com.android.settings.password;
 
 import android.app.settings.SettingsEnums;
-import android.content.DialogInterface;
-import android.hardware.biometrics.BiometricConstants;
 import android.hardware.biometrics.BiometricPrompt;
 import android.hardware.biometrics.BiometricPrompt.AuthenticationCallback;
 import android.hardware.biometrics.BiometricPrompt.AuthenticationResult;
+import android.hardware.biometrics.PromptInfo;
 import android.os.Bundle;
 import android.os.CancellationSignal;
 
@@ -38,6 +37,8 @@
 
     private static final String TAG = "ConfirmDeviceCredential/BiometricFragment";
 
+    private static final String KEY_PROMPT_INFO = "prompt_info";
+
     // Re-set by the application. Should be done upon orientation changes, etc
     private Executor mClientExecutor;
     private AuthenticationCallback mClientCallback;
@@ -46,16 +47,14 @@
     private int mUserId;
 
     // Created/Initialized once and retained
-    private Bundle mBundle;
+    private PromptInfo mPromptInfo;
     private BiometricPrompt mBiometricPrompt;
     private CancellationSignal mCancellationSignal;
-    private boolean mAuthenticating;
 
     private AuthenticationCallback mAuthenticationCallback =
             new AuthenticationCallback() {
         @Override
         public void onAuthenticationError(int error, @NonNull CharSequence message) {
-            mAuthenticating = false;
             mClientExecutor.execute(() -> {
                 mClientCallback.onAuthenticationError(error, message);
             });
@@ -64,7 +63,6 @@
 
         @Override
         public void onAuthenticationSucceeded(AuthenticationResult result) {
-            mAuthenticating = false;
             mClientExecutor.execute(() -> {
                 mClientCallback.onAuthenticationSucceeded(result);
             });
@@ -86,22 +84,14 @@
         }
     };
 
-    private final DialogInterface.OnClickListener mNegativeButtonListener =
-            new DialogInterface.OnClickListener() {
-        @Override
-        public void onClick(DialogInterface dialog, int which) {
-            mAuthenticationCallback.onAuthenticationError(
-                    BiometricConstants.BIOMETRIC_ERROR_NEGATIVE_BUTTON,
-                    mBundle.getString(BiometricPrompt.KEY_NEGATIVE_TEXT));
-        }
-    };
-
     /**
-     * @param bundle Bundle passed from {@link BiometricPrompt.Builder#buildIntent()}
+     * @param promptInfo
      * @return
      */
-    public static BiometricFragment newInstance(Bundle bundle) {
+    public static BiometricFragment newInstance(PromptInfo promptInfo) {
         BiometricFragment biometricFragment = new BiometricFragment();
+        final Bundle bundle = new Bundle();
+        bundle.putParcelable(KEY_PROMPT_INFO, promptInfo);
         biometricFragment.setArguments(bundle);
         return biometricFragment;
     }
@@ -134,28 +124,27 @@
         super.onCreate(savedInstanceState);
         setRetainInstance(true);
 
-        mBundle = getArguments();
+        final Bundle bundle = getArguments();
+        final PromptInfo promptInfo = bundle.getParcelable(KEY_PROMPT_INFO);
+
         final BiometricPrompt.Builder builder = new BiometricPrompt.Builder(getContext())
-                .setTitle(mBundle.getString(BiometricPrompt.KEY_TITLE))
+                .setTitle(promptInfo.getTitle())
                 .setUseDefaultTitle() // use default title if title is null/empty
                 .setDeviceCredentialAllowed(true)
-                .setSubtitle(mBundle.getString(BiometricPrompt.KEY_SUBTITLE))
-                .setDescription(mBundle.getString(BiometricPrompt.KEY_DESCRIPTION))
+                .setSubtitle(promptInfo.getSubtitle())
+                .setDescription(promptInfo.getDescription())
                 .setTextForDeviceCredential(
-                        mBundle.getCharSequence(BiometricPrompt.KEY_DEVICE_CREDENTIAL_TITLE),
-                        mBundle.getCharSequence(BiometricPrompt.KEY_DEVICE_CREDENTIAL_SUBTITLE),
-                        mBundle.getCharSequence(BiometricPrompt.KEY_DEVICE_CREDENTIAL_DESCRIPTION))
-                .setConfirmationRequired(mBundle.getBoolean(
-                        BiometricPrompt.KEY_REQUIRE_CONFIRMATION, true))
-                .setDisallowBiometricsIfPolicyExists(mBundle.getBoolean(
-                        BiometricPrompt.EXTRA_DISALLOW_BIOMETRICS_IF_POLICY_EXISTS, false))
+                        promptInfo.getDeviceCredentialTitle(),
+                        promptInfo.getDeviceCredentialSubtitle(),
+                        promptInfo.getDeviceCredentialDescription())
+                .setConfirmationRequired(promptInfo.isConfirmationRequested())
+                .setDisallowBiometricsIfPolicyExists(
+                        promptInfo.isDisallowBiometricsIfPolicyExists())
                 .setReceiveSystemEvents(true);
 
         mBiometricPrompt = builder.build();
         mCancellationSignal = new CancellationSignal();
 
-        // TODO: CC doesn't use crypto for now
-        mAuthenticating = true;
         mBiometricPrompt.authenticateUser(mCancellationSignal, mClientExecutor,
                 mAuthenticationCallback, mUserId);
     }
diff --git a/src/com/android/settings/password/ChooseLockGeneric.java b/src/com/android/settings/password/ChooseLockGeneric.java
index 04ee1b8..5b3013d 100644
--- a/src/com/android/settings/password/ChooseLockGeneric.java
+++ b/src/com/android/settings/password/ChooseLockGeneric.java
@@ -142,15 +142,13 @@
         @VisibleForTesting
         static final int SKIP_FINGERPRINT_REQUEST = 104;
 
-        private ChooseLockSettingsHelper mChooseLockSettingsHelper;
+        private LockPatternUtils mLockPatternUtils;
         private DevicePolicyManager mDpm;
-        private boolean mHasChallenge = false;
-        private long mChallenge;
+        private boolean mRequestGatekeeperPasswordHandle = false;
         private boolean mPasswordConfirmed = false;
         private boolean mWaitingForConfirmation = false;
         private boolean mForChangeCredRequiredForBoot = false;
         private LockscreenCredential mUserPassword;
-        private LockPatternUtils mLockPatternUtils;
         private FingerprintManager mFingerprintManager;
         private FaceManager mFaceManager;
         private int mUserId;
@@ -199,7 +197,6 @@
             mFingerprintManager = Utils.getFingerprintManagerOrNull(activity);
             mFaceManager = Utils.getFaceManagerOrNull(activity);
             mDpm = (DevicePolicyManager) getSystemService(Context.DEVICE_POLICY_SERVICE);
-            mChooseLockSettingsHelper = new ChooseLockSettingsHelper(activity);
             mLockPatternUtils = new LockPatternUtils(activity);
             mIsSetNewPassword = ACTION_SET_NEW_PARENT_PROFILE_PASSWORD.equals(chooseLockAction)
                     || ACTION_SET_NEW_PASSWORD.equals(chooseLockAction);
@@ -213,10 +210,8 @@
                         ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD);
             }
 
-            mHasChallenge = intent.getBooleanExtra(
-                    ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false);
-            mChallenge = intent.getLongExtra(
-                    ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0);
+            mRequestGatekeeperPasswordHandle = intent.getBooleanExtra(
+                    ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE, false);
             mForFingerprint = intent.getBooleanExtra(
                     ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT, false);
             mForFace = intent.getBooleanExtra(
@@ -274,15 +269,17 @@
                             mUserId), false);
                 }
             } else if (!mWaitingForConfirmation) {
-                ChooseLockSettingsHelper helper =
-                        new ChooseLockSettingsHelper(activity, this);
+                final ChooseLockSettingsHelper.Builder builder =
+                        new ChooseLockSettingsHelper.Builder(activity, this);
+                builder.setRequestCode(CONFIRM_EXISTING_REQUEST)
+                        .setTitle(getString(R.string.unlock_set_unlock_launch_picker_title))
+                        .setReturnCredentials(true)
+                        .setUserId(mUserId);
                 boolean managedProfileWithUnifiedLock =
                         UserManager.get(activity).isManagedProfile(mUserId)
                         && !mLockPatternUtils.isSeparateProfileChallengeEnabled(mUserId);
                 boolean skipConfirmation = managedProfileWithUnifiedLock && !mIsSetNewPassword;
-                if (skipConfirmation
-                        || !helper.launchConfirmationActivity(CONFIRM_EXISTING_REQUEST,
-                        getString(R.string.unlock_set_unlock_launch_picker_title), true, mUserId)) {
+                if (skipConfirmation || !builder.show()) {
                     mPasswordConfirmed = true; // no password set, so no need to confirm
                     updatePreferencesOrFinish(savedInstanceState != null);
                 } else {
@@ -386,9 +383,12 @@
                         mForFingerprint);
                 intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FACE,
                         mForFace);
+                // If the caller requested Gatekeeper Password to be returned, we assume it came
+                // from biometric enrollment. This should be cleaned up, since requesting
+                // Gatekeeper Password should not imply it came from biometric setup/settings.
                 startActivityForResult(
                         intent,
-                        mIsSetNewPassword && mHasChallenge
+                        mIsSetNewPassword && mRequestGatekeeperPasswordHandle
                                 ? CHOOSE_LOCK_BEFORE_BIOMETRIC_REQUEST
                                 : ENABLE_ENCRYPTION_REQUEST);
             } else {
@@ -438,6 +438,11 @@
                     && resultCode == BiometricEnrollBase.RESULT_FINISHED) {
                 Intent intent = getBiometricEnrollIntent(getActivity());
                 if (data != null) {
+                    // ChooseLockGeneric should have requested for a Gatekeeper Password Handle to
+                    // be returned, so that biometric enrollment(s) can subsequently request
+                    // Gatekeeper to create HardwareAuthToken(s) wrapping biometric-specific
+                    // challenges. Send the extras (including the GK Password) to the enrollment
+                    // activity.
                     intent.putExtras(data.getExtras());
                 }
                 // Forward the target user id to fingerprint setup page.
@@ -722,10 +727,8 @@
                             .setRequestedMinComplexity(mRequestedMinComplexity)
                             .setForFingerprint(mForFingerprint)
                             .setForFace(mForFace)
-                            .setUserId(mUserId);
-            if (mHasChallenge) {
-                builder.setChallenge(mChallenge);
-            }
+                            .setUserId(mUserId)
+                            .setRequestGatekeeperPasswordHandle(mRequestGatekeeperPasswordHandle);
             if (mUserPassword != null) {
                 builder.setPassword(mUserPassword);
             }
@@ -740,10 +743,8 @@
                     new ChooseLockPattern.IntentBuilder(getContext())
                             .setForFingerprint(mForFingerprint)
                             .setForFace(mForFace)
-                            .setUserId(mUserId);
-            if (mHasChallenge) {
-                builder.setChallenge(mChallenge);
-            }
+                            .setUserId(mUserId)
+                            .setRequestGatekeeperPasswordHandle(mRequestGatekeeperPasswordHandle);
             if (mUserPassword != null) {
                 builder.setPattern(mUserPassword);
             }
@@ -772,7 +773,7 @@
          * {@link DevicePolicyManager#PASSWORD_QUALITY_UNSPECIFIED}
          */
         void updateUnlockMethodAndFinish(int quality, boolean disabled, boolean chooseLockSkipped) {
-            // Sanity check. We should never get here without confirming user's existing password.
+            // We should never get here without confirming user's existing password.
             if (!mPasswordConfirmed) {
                 throw new IllegalStateException("Tried to update password without confirming it");
             }
@@ -784,8 +785,13 @@
                     intent.putExtra(EXTRA_SHOW_OPTIONS_BUTTON, chooseLockSkipped);
                 }
                 intent.putExtra(EXTRA_CHOOSE_LOCK_GENERIC_EXTRAS, getIntent().getExtras());
+                // If the caller requested Gatekeeper Password Handle to be returned, we assume it
+                // came from biometric enrollment. onActivityResult will put the LockSettingsService
+                // into the extras and launch biometric enrollment. This should be cleaned up,
+                // since requesting a Gatekeeper Password Handle should not imply it came from
+                // biometric setup/settings.
                 startActivityForResult(intent,
-                        mIsSetNewPassword && mHasChallenge
+                        mIsSetNewPassword && mRequestGatekeeperPasswordHandle
                                 ? CHOOSE_LOCK_BEFORE_BIOMETRIC_REQUEST
                                 : CHOOSE_LOCK_REQUEST);
                 return;
@@ -797,10 +803,10 @@
                 if (mUserPassword != null) {
                     // No need to call setLockCredential if the user currently doesn't
                     // have a password
-                    mChooseLockSettingsHelper.utils().setLockCredential(
+                    mLockPatternUtils.setLockCredential(
                             LockscreenCredential.createNone(), mUserPassword, mUserId);
                 }
-                mChooseLockSettingsHelper.utils().setLockScreenDisabled(disabled, mUserId);
+                mLockPatternUtils.setLockScreenDisabled(disabled, mUserId);
                 getActivity().setResult(Activity.RESULT_OK);
                 finish();
             }
diff --git a/src/com/android/settings/password/ChooseLockPassword.java b/src/com/android/settings/password/ChooseLockPassword.java
index 19cc9c8..6cfb1ef 100644
--- a/src/com/android/settings/password/ChooseLockPassword.java
+++ b/src/com/android/settings/password/ChooseLockPassword.java
@@ -73,10 +73,10 @@
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.widget.LockPatternUtils;
-import com.android.internal.widget.LockPatternUtils.RequestThrottledException;
 import com.android.internal.widget.LockscreenCredential;
 import com.android.internal.widget.PasswordValidationError;
 import com.android.internal.widget.TextViewInputDisabler;
+import com.android.internal.widget.VerifyCredentialResponse;
 import com.android.settings.EncryptionInterstitial;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
@@ -117,7 +117,6 @@
             mIntent = new Intent(context, ChooseLockPassword.class);
             mIntent.putExtra(ChooseLockGeneric.CONFIRM_CREDENTIALS, false);
             mIntent.putExtra(EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD, false);
-            mIntent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false);
         }
 
         public IntentBuilder setPasswordQuality(int quality) {
@@ -130,9 +129,10 @@
             return this;
         }
 
-        public IntentBuilder setChallenge(long challenge) {
-            mIntent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, true);
-            mIntent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, challenge);
+        public IntentBuilder setRequestGatekeeperPasswordHandle(
+                boolean requestGatekeeperPasswordHandle) {
+            mIntent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE,
+                    requestGatekeeperPasswordHandle);
             return this;
         }
 
@@ -211,8 +211,7 @@
 
         private LockscreenCredential mCurrentCredential;
         private LockscreenCredential mChosenPassword;
-        private boolean mHasChallenge;
-        private long mChallenge;
+        private boolean mRequestGatekeeperPassword;
         private ImeAwareEditText mPasswordEntry;
         private TextViewInputDisabler mPasswordEntryInputDisabler;
 
@@ -228,7 +227,6 @@
         private LockPatternUtils mLockPatternUtils;
         private SaveAndFinishWorker mSaveAndFinishWorker;
         private int mRequestedQuality = DevicePolicyManager.PASSWORD_QUALITY_NUMERIC;
-        private ChooseLockSettingsHelper mChooseLockSettingsHelper;
         protected Stage mUiStage = Stage.Introduction;
         private PasswordRequirementAdapter mPasswordRequirementAdapter;
         private GlifLayout mLayout;
@@ -396,8 +394,6 @@
                         mLockPatternUtils.getRequestedPasswordMetrics(mUnificationProfileId));
             }
 
-            mChooseLockSettingsHelper = new ChooseLockSettingsHelper(getActivity());
-
             if (intent.getBooleanExtra(
                     ChooseLockSettingsHelper.EXTRA_KEY_FOR_CHANGE_CRED_REQUIRED_FOR_BOOT, false)) {
                 SaveAndFinishWorker w = new SaveAndFinishWorker();
@@ -406,10 +402,12 @@
                 LockscreenCredential currentCredential = intent.getParcelableExtra(
                         ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD);
 
+                final LockPatternUtils utils = new LockPatternUtils(getActivity());
+
                 w.setBlocking(true);
                 w.setListener(this);
-                w.start(mChooseLockSettingsHelper.utils(), required, false, 0,
-                        currentCredential, currentCredential, mUserId);
+                w.start(utils, required, false /* requestGatekeeperPassword */, currentCredential,
+                        currentCredential, mUserId);
             }
             mTextChangedHandler = new TextChangedHandler();
         }
@@ -493,15 +491,19 @@
                     ChooseLockGeneric.CONFIRM_CREDENTIALS, true);
             mCurrentCredential = intent.getParcelableExtra(
                     ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD);
-            mHasChallenge = intent.getBooleanExtra(
-                    ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false);
-            mChallenge = intent.getLongExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0);
+            mRequestGatekeeperPassword = intent.getBooleanExtra(
+                    ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE, false);
             if (savedInstanceState == null) {
                 updateStage(Stage.Introduction);
                 if (confirmCredentials) {
-                    mChooseLockSettingsHelper.launchConfirmationActivity(CONFIRM_EXISTING_REQUEST,
-                            getString(R.string.unlock_set_unlock_launch_picker_title), true,
-                            mUserId);
+                    final ChooseLockSettingsHelper.Builder builder =
+                            new ChooseLockSettingsHelper.Builder(getActivity());
+                    builder.setRequestCode(CONFIRM_EXISTING_REQUEST)
+                            .setTitle(getString(R.string.unlock_set_unlock_launch_picker_title))
+                            .setReturnCredentials(true)
+                            .setRequestGatekeeperPasswordHandle(mRequestGatekeeperPassword)
+                            .setUserId(mUserId)
+                            .show();
                 }
             } else {
 
@@ -883,7 +885,7 @@
                             profileCredential);
                 }
             }
-            mSaveAndFinishWorker.start(mLockPatternUtils, required, mHasChallenge, mChallenge,
+            mSaveAndFinishWorker.start(mLockPatternUtils, required, mRequestGatekeeperPassword,
                     mChosenPassword, mCurrentCredential, mUserId);
         }
 
@@ -943,10 +945,9 @@
         private LockscreenCredential mCurrentCredential;
 
         public void start(LockPatternUtils utils, boolean required,
-                boolean hasChallenge, long challenge,
-                LockscreenCredential chosenPassword, LockscreenCredential currentCredential,
-                int userId) {
-            prepare(utils, required, hasChallenge, challenge, userId);
+                boolean requestGatekeeperPassword, LockscreenCredential chosenPassword,
+                LockscreenCredential currentCredential, int userId) {
+            prepare(utils, required, requestGatekeeperPassword, userId);
 
             mChosenPassword = chosenPassword;
             mCurrentCredential = currentCredential != null ? currentCredential
@@ -964,20 +965,21 @@
                 unifyProfileCredentialIfRequested();
             }
             Intent result = null;
-            if (success && mHasChallenge) {
-                byte[] token;
-                try {
-                    token = mUtils.verifyCredential(mChosenPassword, mChallenge, mUserId);
-                } catch (RequestThrottledException e) {
-                    token = null;
-                }
+            if (success && mRequestGatekeeperPassword) {
+                // If a Gatekeeper Password was requested, invoke the LockSettingsService code
+                // path to return a Gatekeeper Password based on the credential that the user
+                // chose. This should only be run if the credential was successfully set.
+                final VerifyCredentialResponse response = mUtils.verifyCredential(mChosenPassword,
+                        mUserId, LockPatternUtils.VERIFY_FLAG_REQUEST_GK_PW_HANDLE);
 
-                if (token == null) {
-                    Log.e(TAG, "critical: no token returned for known good password.");
+                if (!response.isMatched() || !response.containsGatekeeperPasswordHandle()) {
+                    Log.e(TAG, "critical: bad response or missing GK PW handle for known good"
+                            + " password: " + response.toString());
                 }
 
                 result = new Intent();
-                result.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, token);
+                result.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_GK_PW_HANDLE,
+                        response.getGatekeeperPasswordHandle());
             }
             return Pair.create(success, result);
         }
diff --git a/src/com/android/settings/password/ChooseLockPattern.java b/src/com/android/settings/password/ChooseLockPattern.java
index 27fc9f0..7ed9e6b 100644
--- a/src/com/android/settings/password/ChooseLockPattern.java
+++ b/src/com/android/settings/password/ChooseLockPattern.java
@@ -42,11 +42,11 @@
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient;
 import com.android.internal.widget.LockPatternUtils;
-import com.android.internal.widget.LockPatternUtils.RequestThrottledException;
 import com.android.internal.widget.LockPatternView;
 import com.android.internal.widget.LockPatternView.Cell;
 import com.android.internal.widget.LockPatternView.DisplayMode;
 import com.android.internal.widget.LockscreenCredential;
+import com.android.internal.widget.VerifyCredentialResponse;
 import com.android.settings.EncryptionInterstitial;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
@@ -54,7 +54,6 @@
 import com.android.settings.Utils;
 import com.android.settings.core.InstrumentedFragment;
 import com.android.settings.notification.RedactionInterstitial;
-import com.android.settings.password.ChooseLockPassword.IntentBuilder;
 
 import com.google.android.collect.Lists;
 import com.google.android.setupcompat.template.FooterBarMixin;
@@ -106,7 +105,6 @@
             mIntent = new Intent(context, ChooseLockPattern.class);
             mIntent.putExtra(EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD, false);
             mIntent.putExtra(ChooseLockGeneric.CONFIRM_CREDENTIALS, false);
-            mIntent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false);
         }
 
         public IntentBuilder setUserId(int userId) {
@@ -114,9 +112,10 @@
             return this;
         }
 
-        public IntentBuilder setChallenge(long challenge) {
-            mIntent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, true);
-            mIntent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, challenge);
+        public IntentBuilder setRequestGatekeeperPasswordHandle(
+                boolean requestGatekeeperPasswordHandle) {
+            mIntent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE,
+                    requestGatekeeperPasswordHandle);
             return this;
         }
 
@@ -206,8 +205,7 @@
         private static final String FRAGMENT_TAG_SAVE_AND_FINISH = "save_and_finish_worker";
 
         private LockscreenCredential mCurrentCredential;
-        private boolean mHasChallenge;
-        private long mChallenge;
+        private boolean mRequestGatekeeperPassword;
         protected TextView mTitleText;
         protected TextView mHeaderText;
         protected TextView mMessageText;
@@ -452,7 +450,7 @@
             }
         };
 
-        private ChooseLockSettingsHelper mChooseLockSettingsHelper;
+        private LockPatternUtils mLockPatternUtils;
         private SaveAndFinishWorker mSaveAndFinishWorker;
         protected int mUserId;
         protected boolean mForFingerprint;
@@ -465,7 +463,6 @@
         @Override
         public void onCreate(Bundle savedInstanceState) {
             super.onCreate(savedInstanceState);
-            mChooseLockSettingsHelper = new ChooseLockSettingsHelper(getActivity());
             if (!(getActivity() instanceof ChooseLockPattern)) {
                 throw new SecurityException("Fragment contained in wrong activity");
             }
@@ -473,6 +470,8 @@
             // Only take this argument into account if it belongs to the current profile.
             mUserId = Utils.getUserIdFromBundle(getActivity(), intent.getExtras());
 
+            mLockPatternUtils = new LockPatternUtils(getActivity());
+
             if (intent.getBooleanExtra(
                     ChooseLockSettingsHelper.EXTRA_KEY_FOR_CHANGE_CRED_REQUIRED_FOR_BOOT, false)) {
                 SaveAndFinishWorker w = new SaveAndFinishWorker();
@@ -482,8 +481,8 @@
                         ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD);
                 w.setBlocking(true);
                 w.setListener(this);
-                w.start(mChooseLockSettingsHelper.utils(), required,
-                        false, 0, current, current, mUserId);
+                w.start(mLockPatternUtils, required, false /* requestGatekeeperPassword */, current,
+                        current, mUserId);
             }
             mForFingerprint = intent.getBooleanExtra(
                     ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT, false);
@@ -543,7 +542,7 @@
             mLockPatternView = (LockPatternView) view.findViewById(R.id.lockPattern);
             mLockPatternView.setOnPatternListener(mChooseNewLockPatternListener);
             mLockPatternView.setTactileFeedbackEnabled(
-                    mChooseLockSettingsHelper.utils().isTactileFeedbackEnabled());
+                    mLockPatternUtils.isTactileFeedbackEnabled());
             mLockPatternView.setFadePattern(false);
 
             mFooterText = (TextView) view.findViewById(R.id.footerText);
@@ -563,21 +562,25 @@
             Intent intent = getActivity().getIntent();
             mCurrentCredential =
                     intent.getParcelableExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD);
-            mHasChallenge = intent.getBooleanExtra(
-                    ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false);
-            mChallenge = intent.getLongExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0);
+            mRequestGatekeeperPassword = intent.getBooleanExtra(
+                    ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE, false);
 
             if (savedInstanceState == null) {
                 if (confirmCredentials) {
                     // first launch. As a security measure, we're in NeedToConfirm mode until we
                     // know there isn't an existing password or the user confirms their password.
                     updateStage(Stage.NeedToConfirm);
-                    boolean launchedConfirmationActivity =
-                        mChooseLockSettingsHelper.launchConfirmationActivity(
-                                CONFIRM_EXISTING_REQUEST,
-                                getString(R.string.unlock_set_unlock_launch_picker_title), true,
-                                mUserId);
-                    if (!launchedConfirmationActivity) {
+
+                    final ChooseLockSettingsHelper.Builder builder =
+                            new ChooseLockSettingsHelper.Builder(getActivity());
+                    final boolean launched = builder.setRequestCode(CONFIRM_EXISTING_REQUEST)
+                            .setTitle(getString(R.string.unlock_set_unlock_launch_picker_title))
+                            .setReturnCredentials(true)
+                            .setRequestGatekeeperPasswordHandle(mRequestGatekeeperPassword)
+                            .setUserId(mUserId)
+                            .show();
+
+                    if (!launched) {
                         updateStage(Stage.Introduction);
                     }
                 } else {
@@ -853,8 +856,8 @@
                             profileCredential);
                 }
             }
-            mSaveAndFinishWorker.start(mChooseLockSettingsHelper.utils(), required,
-                    mHasChallenge, mChallenge, mChosenPattern, mCurrentCredential, mUserId);
+            mSaveAndFinishWorker.start(mLockPatternUtils, required,
+                    mRequestGatekeeperPassword, mChosenPattern, mCurrentCredential, mUserId);
         }
 
         @Override
@@ -884,10 +887,10 @@
         private LockscreenCredential mCurrentCredential;
         private boolean mLockVirgin;
 
-        public void start(LockPatternUtils utils, boolean credentialRequired, boolean hasChallenge,
-                long challenge, LockscreenCredential chosenPattern,
+        public void start(LockPatternUtils utils, boolean credentialRequired,
+                boolean requestGatekeeperPassword, LockscreenCredential chosenPattern,
                 LockscreenCredential currentCredential, int userId) {
-            prepare(utils, credentialRequired, hasChallenge, challenge, userId);
+            prepare(utils, credentialRequired, requestGatekeeperPassword, userId);
 
             mCurrentCredential = currentCredential != null ? currentCredential
                     : LockscreenCredential.createNone();
@@ -908,20 +911,21 @@
                 unifyProfileCredentialIfRequested();
             }
             Intent result = null;
-            if (success && mHasChallenge) {
-                byte[] token;
-                try {
-                    token = mUtils.verifyCredential(mChosenPattern, mChallenge, userId);
-                } catch (RequestThrottledException e) {
-                    token = null;
-                }
+            if (success && mRequestGatekeeperPassword) {
+                // If a Gatekeeper Password was requested, invoke the LockSettingsService code
+                // path to return a Gatekeeper Password based on the credential that the user
+                // chose. This should only be run if the credential was successfully set.
+                final VerifyCredentialResponse response = mUtils.verifyCredential(mChosenPattern,
+                        userId, LockPatternUtils.VERIFY_FLAG_REQUEST_GK_PW_HANDLE);
 
-                if (token == null) {
-                    Log.e(TAG, "critical: no token returned for known good pattern");
+                if (!response.isMatched() || !response.containsGatekeeperPasswordHandle()) {
+                    Log.e(TAG, "critical: bad response or missing GK PW handle for known good"
+                            + " pattern: " + response.toString());
                 }
 
                 result = new Intent();
-                result.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, token);
+                result.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_GK_PW_HANDLE,
+                        response.getGatekeeperPasswordHandle());
             }
             return Pair.create(success, result);
         }
diff --git a/src/com/android/settings/password/ChooseLockSettingsHelper.java b/src/com/android/settings/password/ChooseLockSettingsHelper.java
index 3989ee6..1d10408 100644
--- a/src/com/android/settings/password/ChooseLockSettingsHelper.java
+++ b/src/com/android/settings/password/ChooseLockSettingsHelper.java
@@ -18,14 +18,15 @@
 
 import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME;
 
+import android.annotation.NonNull;
 import android.annotation.Nullable;
 import android.app.Activity;
 import android.app.KeyguardManager;
 import android.app.admin.DevicePolicyManager;
 import android.content.Intent;
 import android.content.IntentSender;
-import android.os.Bundle;
 import android.os.UserManager;
+import android.util.Log;
 
 import androidx.annotation.VisibleForTesting;
 import androidx.fragment.app.Fragment;
@@ -39,16 +40,24 @@
 
 public final class ChooseLockSettingsHelper {
 
+    private static final String TAG = "ChooseLockSettingsHelper";
+
     public static final String EXTRA_KEY_TYPE = "type";
     public static final String EXTRA_KEY_PASSWORD = "password";
     public static final String EXTRA_KEY_RETURN_CREDENTIALS = "return_credentials";
-    public static final String EXTRA_KEY_HAS_CHALLENGE = "has_challenge";
-    public static final String EXTRA_KEY_CHALLENGE = "challenge";
+    // Force the verifyCredential path instead of checkCredential path. This will be removed
+    // after b/161956762 is resolved.
+    public static final String EXTRA_KEY_FORCE_VERIFY = "force_verify";
+    // Gatekeeper HardwareAuthToken
     public static final String EXTRA_KEY_CHALLENGE_TOKEN = "hw_auth_token";
     public static final String EXTRA_KEY_FOR_FINGERPRINT = "for_fingerprint";
     public static final String EXTRA_KEY_FOR_FACE = "for_face";
     public static final String EXTRA_KEY_FOR_CHANGE_CRED_REQUIRED_FOR_BOOT = "for_cred_req_boot";
     public static final String EXTRA_KEY_FOREGROUND_ONLY = "foreground_only";
+    public static final String EXTRA_KEY_REQUEST_GK_PW_HANDLE = "request_gk_pw_handle";
+    // Gatekeeper password handle, which can subsequently be used to generate Gatekeeper
+    // HardwareAuthToken(s) via LockSettingsService#verifyGatekeeperPasswordHandle
+    public static final String EXTRA_KEY_GK_PW_HANDLE = "gk_pw_handle";
 
     /**
      * When EXTRA_KEY_UNIFICATION_PROFILE_CREDENTIAL and EXTRA_KEY_UNIFICATION_PROFILE_ID are
@@ -84,330 +93,220 @@
      * controls if we relax the enforcement of
      * {@link Utils#enforceSameOwner(android.content.Context, int)}.
      */
-    public static final String EXTRA_ALLOW_ANY_USER = "allow_any_user";
+    public static final String EXTRA_KEY_ALLOW_ANY_USER = "allow_any_user";
 
-    @VisibleForTesting LockPatternUtils mLockPatternUtils;
-    private Activity mActivity;
-    private Fragment mFragment;
+    @VisibleForTesting @NonNull LockPatternUtils mLockPatternUtils;
+    @NonNull private final Activity mActivity;
+    @Nullable private final Fragment mFragment;
+    @NonNull private final Builder mBuilder;
 
-    public ChooseLockSettingsHelper(Activity activity) {
+    private ChooseLockSettingsHelper(@NonNull Builder builder, @NonNull Activity activity,
+            @Nullable Fragment fragment) {
+        mBuilder = builder;
         mActivity = activity;
+        mFragment = fragment;
         mLockPatternUtils = new LockPatternUtils(activity);
     }
 
-    public ChooseLockSettingsHelper(Activity activity, Fragment fragment) {
-        this(activity);
-        mFragment = fragment;
-    }
+    public static class Builder {
+        @NonNull private final Activity mActivity;
+        @Nullable private Fragment mFragment;
 
-    public LockPatternUtils utils() {
-        return mLockPatternUtils;
+        private int mRequestCode;
+        @Nullable private CharSequence mTitle;
+        @Nullable private CharSequence mHeader;
+        @Nullable private CharSequence mDescription;
+        @Nullable private CharSequence mAlternateButton;
+        private boolean mReturnCredentials;
+        private boolean mExternal;
+        private boolean mForegroundOnly;
+        // ChooseLockSettingsHelper will determine the caller's userId if none provided.
+        private int mUserId;
+        private boolean mAllowAnyUserId;
+        private boolean mForceVerifyPath;
+        boolean mRequestGatekeeperPasswordHandle;
+
+        public Builder(@NonNull Activity activity) {
+            mActivity = activity;
+            mUserId = Utils.getCredentialOwnerUserId(mActivity);
+        }
+
+        public Builder(@NonNull Activity activity, @NonNull Fragment fragment) {
+            this(activity);
+            mFragment = fragment;
+        }
+
+        /**
+         * @param requestCode for onActivityResult
+         */
+        @NonNull public Builder setRequestCode(int requestCode) {
+            mRequestCode = requestCode;
+            return this;
+        }
+
+        /**
+         * @param title of the confirmation screen; shown in the action bar
+         */
+        @NonNull public Builder setTitle(@Nullable CharSequence title) {
+            mTitle = title;
+            return this;
+        }
+
+        /**
+         * @param header of the confirmation screen; shown as large text
+         */
+        @NonNull public Builder setHeader(@Nullable CharSequence header) {
+            mHeader = header;
+            return this;
+        }
+
+        /**
+         * @param description of the confirmation screen
+         */
+        @NonNull public Builder setDescription(@Nullable CharSequence description) {
+            mDescription = description;
+            return this;
+        }
+
+        /**
+         * @param alternateButton text for an alternate button
+         */
+        @NonNull public Builder setAlternateButton(@Nullable CharSequence alternateButton) {
+            mAlternateButton = alternateButton;
+            return this;
+        }
+
+        /**
+         * @param returnCredentials if true, puts the following credentials into intent for
+         *                          onActivityResult with the following keys:
+         *                          {@link #EXTRA_KEY_TYPE}, {@link #EXTRA_KEY_PASSWORD},
+         *                          {@link #EXTRA_KEY_CHALLENGE_TOKEN},
+         *                          {@link #EXTRA_KEY_GK_PW_HANDLE}
+         *                          Note that if this is true, this can only be called internally.
+         *
+         *                          This should also generally be set if
+         *                          {@link #setRequestGatekeeperPasswordHandle(boolean)} is set.
+         */
+        @NonNull public Builder setReturnCredentials(boolean returnCredentials) {
+            mReturnCredentials = returnCredentials;
+            return this;
+        }
+
+        /**
+         * @param userId for whom the credential should be confirmed.
+         */
+        @NonNull public Builder setUserId(int userId) {
+            mUserId = userId;
+            return this;
+        }
+
+        /**
+         * @param allowAnyUserId Allows the caller to prompt for credentials of any user, including
+         *                       those which aren't associated with the current user. As an example,
+         *                       this is useful when unlocking the storage for secondary users.
+         */
+        @NonNull public Builder setAllowAnyUserId(boolean allowAnyUserId) {
+            mAllowAnyUserId = allowAnyUserId;
+            return this;
+        }
+
+        /**
+         * @param external specifies whether this activity is launched externally, meaning that it
+         *                 will get a dark theme, allow biometric authentication, and it will
+         *                 forward the activity result.
+         */
+        @NonNull public Builder setExternal(boolean external) {
+            mExternal = external;
+            return this;
+        }
+
+        /**
+         * @param foregroundOnly if true, the confirmation activity will be finished if it loses
+         *                       foreground.
+         */
+        @NonNull public Builder setForegroundOnly(boolean foregroundOnly) {
+            mForegroundOnly = foregroundOnly;
+            return this;
+        }
+
+        /**
+         * @param forceVerifyPath Forces the VerifyCredential path instead of the CheckCredential
+         *                        path. This will be removed after b/161956762 is resolved.
+         */
+        @NonNull public Builder setForceVerifyPath(boolean forceVerifyPath) {
+            mForceVerifyPath = forceVerifyPath;
+            return this;
+        }
+
+        /**
+         * Requests that LockSettingsService return a handle to the Gatekeeper Password (instead of
+         * the Gatekeeper HAT). This allows us to use a single entry of the user's credential
+         * to create multiple Gatekeeper HATs containing distinct challenges via
+         * {@link LockPatternUtils#verifyGatekeeperPasswordHandle(long, long, int)}.
+         *
+         * Upon confirmation of the user's password, the Gatekeeper Password Handle will be returned
+         * via onActivityResult with the key being {@link #EXTRA_KEY_GK_PW_HANDLE}.
+         * @param requestGatekeeperPasswordHandle
+         */
+        @NonNull public Builder setRequestGatekeeperPasswordHandle(
+                boolean requestGatekeeperPasswordHandle) {
+            mRequestGatekeeperPasswordHandle = requestGatekeeperPasswordHandle;
+            return this;
+        }
+
+        @NonNull public ChooseLockSettingsHelper build() {
+            if (!mAllowAnyUserId && mUserId != LockPatternUtils.USER_FRP) {
+                Utils.enforceSameOwner(mActivity, mUserId);
+            }
+
+            if (mExternal && mReturnCredentials) {
+                throw new IllegalArgumentException("External and ReturnCredentials specified. "
+                        + " External callers should never be allowed to receive credentials in"
+                        + " onActivityResult");
+            }
+
+            if (mRequestGatekeeperPasswordHandle && !mReturnCredentials) {
+                // HAT containing the signed challenge will not be available to the caller.
+                Log.w(TAG, "Requested gatekeeper password handle but not requesting"
+                        + " ReturnCredentials. Are you sure this is what you want?");
+            }
+
+            return new ChooseLockSettingsHelper(this, mActivity, mFragment);
+        }
+
+        public boolean show() {
+            return build().launch();
+        }
     }
 
     /**
-     * If a pattern, password or PIN exists, prompt the user before allowing them to change it.
-     *
-     * @param title title of the confirmation screen; shown in the action bar
-     * @return true if one exists and we launched an activity to confirm it
-     * @see Activity#onActivityResult(int, int, android.content.Intent)
+     * If a PIN, Pattern, or Password exists, prompt the user to confirm it.
+     * @return true if the confirmation activity is shown (e.g. user has a credential set up)
      */
-    public boolean launchConfirmationActivity(int request, CharSequence title) {
-        return launchConfirmationActivity(
-                request /* request */,
-                title /* title */,
-                null /* header */,
-                null /* description */,
-                false /* returnCredentials */,
-                false /* external */,
-                false /* foregroundOnly */);
-    }
-
-    /**
-     * If a pattern, password or PIN exists, prompt the user before allowing them to change it.
-     *
-     * @param title title of the confirmation screen; shown in the action bar
-     * @param returnCredentials if true, put credentials into intent. Note that if this is true,
-     *                          this can only be called internally.
-     * @return true if one exists and we launched an activity to confirm it
-     * @see Activity#onActivityResult(int, int, android.content.Intent)
-     */
-    public boolean launchConfirmationActivity(int request, CharSequence title, boolean returnCredentials) {
-        return launchConfirmationActivity(
-                request /* request */,
-                title /* title */,
-                null /* header */,
-                null /* description */,
-                returnCredentials /* returnCredentials */,
-                false /* external */,
-                false /* foregroundOnly */);
-    }
-
-    /**
-     * If a pattern, password or PIN exists, prompt the user before allowing them to change it.
-     *
-     * @param title title of the confirmation screen; shown in the action bar
-     * @param returnCredentials if true, put credentials into intent. Note that if this is true,
-     *                          this can only be called internally.
-     * @param userId The userId for whom the lock should be confirmed.
-     * @return true if one exists and we launched an activity to confirm it
-     * @see Activity#onActivityResult(int, int, android.content.Intent)
-     */
-    public boolean launchConfirmationActivity(int request, CharSequence title,
-            boolean returnCredentials, int userId) {
-        return launchConfirmationActivity(
-                request /* request */,
-                title /* title */,
-                null /* header */,
-                null /* description */,
-                returnCredentials /* returnCredentials */,
-                false /* external */,
-                false /* hasChallenge */,
-                0 /* challenge */,
-                Utils.enforceSameOwner(mActivity, userId) /* userId */,
-                false /* foregroundOnly */);
-    }
-
-    /**
-     * If a pattern, password or PIN exists, prompt the user before allowing them to change it.
-     *
-     * @param title title of the confirmation screen; shown in the action bar
-     * @param header header of the confirmation screen; shown as large text
-     * @param description description of the confirmation screen
-     * @param returnCredentials if true, put credentials into intent. Note that if this is true,
-     *                          this can only be called internally.
-     * @param external specifies whether this activity is launched externally, meaning that it will
-     *                 get a dark theme, allow fingerprint authentication and it will forward
-     *                 activity result.
-     * @param foregroundOnly if the confirmation activity should be finished if it loses foreground.
-     * @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, @Nullable CharSequence title,
-            @Nullable CharSequence header, @Nullable CharSequence description,
-            boolean returnCredentials, boolean external, boolean foregroundOnly) {
-        return launchConfirmationActivity(
-                request /* request */,
-                title /* title */,
-                header /* header */,
-                description /* description */,
-                returnCredentials /* returnCredentials */,
-                external /* external */,
-                false /* hasChallenge */,
-                0 /* challenge */,
-                Utils.getCredentialOwnerUserId(mActivity) /* userId */,
-                foregroundOnly /* foregroundOnly */);
-    }
-
-    /**
-     * If a pattern, password or PIN exists, prompt the user before allowing them to change it.
-     *
-     * @param title title of the confirmation screen; shown in the action bar
-     * @param header header of the confirmation screen; shown as large text
-     * @param description description of the confirmation screen
-     * @param returnCredentials if true, put credentials into intent. Note that if this is true,
-     *                          this can only be called internally.
-     * @param external specifies whether this activity is launched externally, meaning that it will
-     *                 get a dark theme, allow fingerprint authentication and it will forward
-     *                 activity result.
-     * @param userId The userId for whom the lock should be confirmed.
-     * @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, @Nullable CharSequence title,
-            @Nullable CharSequence header, @Nullable CharSequence description,
-            boolean returnCredentials, boolean external, int userId) {
-        return launchConfirmationActivity(
-                request /* request */,
-                title /* title */,
-                header /* header */,
-                description /* description */,
-                returnCredentials /* returnCredentials */,
-                external /* external */,
-                false /* hasChallenge */,
-                0 /* challenge */,
-                Utils.enforceSameOwner(mActivity, userId) /* userId */,
-                false /* foregroundOnly */);
-    }
-
-    /**
-     * If a pattern, password or PIN exists, prompt the user before allowing them to change it.
-     *
-     * @param title title of the confirmation screen; shown in the action bar
-     * @param header header of the confirmation screen; shown as large text
-     * @param description description of the confirmation screen
-     * @param challenge a challenge to be verified against the device credential.
-     * @param foregroundOnly if the confirmation activity should be finished if it loses foreground.
-     * @return true if one exists and we launched an activity to confirm it
-     * @see Activity#onActivityResult(int, int, android.content.Intent)
-     */
-    public boolean launchConfirmationActivity(int request, @Nullable CharSequence title,
-            @Nullable CharSequence header, @Nullable CharSequence description,
-            long challenge, boolean foregroundOnly) {
-        return launchConfirmationActivity(
-                request /* request */,
-                title /* title */,
-                header /* header */,
-                description /* description */,
-                true /* returnCredentials */,
-                false /* external */,
-                true /* hasChallenge */,
-                challenge /* challenge */,
-                Utils.getCredentialOwnerUserId(mActivity) /* userId */,
-                foregroundOnly /* foregroundOnly */);
-    }
-
-    /**
-     * If a pattern, password or PIN exists, prompt the user before allowing them to change it.
-     *
-     * @param title title of the confirmation screen; shown in the action bar
-     * @param header header of the confirmation screen; shown as large text
-     * @param description description of the confirmation screen
-     * @param challenge a challenge to be verified against the device credential.
-     * @param userId The userId for whom the lock should be confirmed.
-     * @param foregroundOnly if the confirmation activity should be finished if it loses foreground.
-     * @return true if one exists and we launched an activity to confirm it
-     * @see Activity#onActivityResult(int, int, android.content.Intent)
-     */
-    public boolean launchConfirmationActivity(int request, @Nullable CharSequence title,
-            @Nullable CharSequence header, @Nullable CharSequence description,
-            long challenge, int userId, boolean foregroundOnly) {
-        return launchConfirmationActivity(
-                request /* request */,
-                title /* title */,
-                header /* header */,
-                description /* description */,
-                true /* returnCredentials */,
-                false /* external */,
-                true /* hasChallenge */,
-                challenge /* challenge */,
-                Utils.enforceSameOwner(mActivity, userId) /* userId */,
-                foregroundOnly);
-    }
-
-    /**
-     * If a pattern, password or PIN exists, prompt the user before allowing them to change it.
-     *
-     * @param title title of the confirmation screen; shown in the action bar
-     * @param header header of the confirmation screen; shown as large text
-     * @param description description of the confirmation screen
-     * @param external specifies whether this activity is launched externally, meaning that it will
-     *                 get a dark theme, allow fingerprint authentication and it will forward
-     *                 activity result.
-     * @param challenge a challenge to be verified against the device credential.
-     * @param userId The userId for whom the lock should be confirmed.
-     * @return true if one exists and we launched an activity to confirm it
-     * @see Activity#onActivityResult(int, int, android.content.Intent)
-     */
-    public boolean launchConfirmationActivityWithExternalAndChallenge(int request,
-            @Nullable CharSequence title, @Nullable CharSequence header,
-            @Nullable CharSequence description, boolean external, long challenge, int userId) {
-        return launchConfirmationActivity(
-                request /* request */,
-                title /* title */,
-                header /* header */,
-                description /* description */,
-                false /* returnCredentials */,
-                external /* external */,
-                true /* hasChallenge */,
-                challenge /* challenge */,
-                Utils.enforceSameOwner(mActivity, userId) /* userId */,
-                false /* foregroundOnly */);
-    }
-
-    /**
-     * Variant that allows you to prompt for credentials of any user, including
-     * those which aren't associated with the current user. As an example, this
-     * is useful when unlocking the storage for secondary users.
-     */
-    public boolean launchConfirmationActivityForAnyUser(int request,
-            @Nullable CharSequence title, @Nullable CharSequence header,
-            @Nullable CharSequence description, int userId) {
-        final Bundle extras = new Bundle();
-        extras.putBoolean(EXTRA_ALLOW_ANY_USER, true);
-        return launchConfirmationActivity(
-                request /* request */,
-                title /* title */,
-                header /* header */,
-                description /* description */,
-                false /* returnCredentials */,
-                false /* external */,
-                true /* hasChallenge */,
-                0 /* challenge */,
-                userId /* userId */,
-                extras /* extras */);
+    public boolean launch() {
+        return launchConfirmationActivity(mBuilder.mRequestCode, mBuilder.mTitle, mBuilder.mHeader,
+                mBuilder.mDescription, mBuilder.mReturnCredentials, mBuilder.mExternal,
+                mBuilder.mForceVerifyPath, mBuilder.mUserId, mBuilder.mAlternateButton,
+                mBuilder.mAllowAnyUserId, mBuilder.mForegroundOnly,
+                mBuilder.mRequestGatekeeperPasswordHandle);
     }
 
     private boolean launchConfirmationActivity(int request, @Nullable CharSequence title,
             @Nullable CharSequence header, @Nullable CharSequence description,
-            boolean returnCredentials, boolean external, boolean hasChallenge,
-            long challenge, int userId, boolean foregroundOnly) {
-        return launchConfirmationActivity(
-                request /* request */,
-                title /* title */,
-                header /* header */,
-                description /* description */,
-                returnCredentials /* returnCredentials */,
-                external /* external */,
-                hasChallenge /* hasChallenge */,
-                challenge /* challenge */,
-                userId /* userId */,
-                null /* alternateButton */,
-                null /* extras */,
-                foregroundOnly /* foregroundOnly */);
-    }
-
-    private boolean launchConfirmationActivity(int request, @Nullable CharSequence title,
-            @Nullable CharSequence header, @Nullable CharSequence description,
-            boolean returnCredentials, boolean external, boolean hasChallenge,
-            long challenge, int userId, Bundle extras) {
-        return launchConfirmationActivity(
-                request /* request */,
-                title /* title */,
-                header /* header */,
-                description /* description */,
-                returnCredentials /* returnCredentials */,
-                external /* external */,
-                hasChallenge /* hasChallenge */,
-                challenge /* challenge */,
-                userId /* userId */,
-                null /* alternateButton */,
-                extras /* extras */,
-                false /* foregroundOnly */);
-    }
-
-    public boolean launchFrpConfirmationActivity(int request, @Nullable CharSequence header,
-            @Nullable CharSequence description, @Nullable CharSequence alternateButton) {
-        return launchConfirmationActivity(
-                request /* request */,
-                null /* title */,
-                header /* header */,
-                description /* description */,
-                false /* returnCredentials */,
-                true /* external */,
-                false /* hasChallenge */,
-                0 /* challenge */,
-                LockPatternUtils.USER_FRP /* userId */,
-                alternateButton /* alternateButton */,
-                null /* extras */,
-                false /* foregroundOnly */);
-    }
-
-    private boolean launchConfirmationActivity(int request, @Nullable CharSequence title,
-            @Nullable CharSequence header, @Nullable CharSequence description,
-            boolean returnCredentials, boolean external, boolean hasChallenge,
-            long challenge, int userId, @Nullable CharSequence alternateButton, Bundle extras,
-            boolean foregroundOnly) {
+            boolean returnCredentials, boolean external, boolean forceVerifyPath,
+            int userId, @Nullable CharSequence alternateButton, boolean allowAnyUser,
+            boolean foregroundOnly, boolean requestGatekeeperPasswordHandle) {
         final int effectiveUserId = UserManager.get(mActivity).getCredentialOwnerProfile(userId);
         boolean launched = false;
 
         switch (mLockPatternUtils.getKeyguardStoredPasswordQuality(effectiveUserId)) {
             case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING:
                 launched = launchConfirmationActivity(request, title, header, description,
-                        returnCredentials || hasChallenge
+                        returnCredentials
                                 ? ConfirmLockPattern.InternalActivity.class
                                 : ConfirmLockPattern.class, returnCredentials, external,
-                                hasChallenge, challenge, userId, alternateButton, extras,
-                                foregroundOnly);
+                                forceVerifyPath, userId, alternateButton, allowAnyUser,
+                                foregroundOnly, requestGatekeeperPasswordHandle);
                 break;
             case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC:
             case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX:
@@ -416,11 +315,11 @@
             case DevicePolicyManager.PASSWORD_QUALITY_COMPLEX:
             case DevicePolicyManager.PASSWORD_QUALITY_MANAGED:
                 launched = launchConfirmationActivity(request, title, header, description,
-                        returnCredentials || hasChallenge
+                        returnCredentials
                                 ? ConfirmLockPassword.InternalActivity.class
                                 : ConfirmLockPassword.class, returnCredentials, external,
-                                hasChallenge, challenge, userId, alternateButton, extras,
-                                foregroundOnly);
+                                forceVerifyPath, userId, alternateButton, allowAnyUser,
+                                foregroundOnly, requestGatekeeperPasswordHandle);
                 break;
         }
         return launched;
@@ -428,9 +327,9 @@
 
     private boolean launchConfirmationActivity(int request, CharSequence title, CharSequence header,
             CharSequence message, Class<?> activityClass, boolean returnCredentials,
-            boolean external, boolean hasChallenge, long challenge,
-            int userId, @Nullable CharSequence alternateButton, Bundle extras,
-            boolean foregroundOnly) {
+            boolean external, boolean forceVerifyPath, int userId,
+            @Nullable CharSequence alternateButton, boolean allowAnyUser,
+            boolean foregroundOnly, boolean requestGatekeeperPasswordHandle) {
         final Intent intent = new Intent();
         intent.putExtra(ConfirmDeviceCredentialBaseFragment.TITLE_TEXT, title);
         intent.putExtra(ConfirmDeviceCredentialBaseFragment.HEADER_TEXT, header);
@@ -441,14 +340,14 @@
         intent.putExtra(ConfirmDeviceCredentialBaseFragment.SHOW_WHEN_LOCKED, external);
         intent.putExtra(ConfirmDeviceCredentialBaseFragment.USE_FADE_ANIMATION, external);
         intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_RETURN_CREDENTIALS, returnCredentials);
-        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, hasChallenge);
-        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, challenge);
+        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_FORCE_VERIFY, forceVerifyPath);
         intent.putExtra(Intent.EXTRA_USER_ID, userId);
         intent.putExtra(KeyguardManager.EXTRA_ALTERNATE_BUTTON_LABEL, alternateButton);
         intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOREGROUND_ONLY, foregroundOnly);
-        if (extras != null) {
-            intent.putExtras(extras);
-        }
+        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_ALLOW_ANY_USER, allowAnyUser);
+        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE,
+                requestGatekeeperPasswordHandle);
+
         intent.setClassName(SETTINGS_PACKAGE_NAME, activityClass.getName());
         if (external) {
             intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
diff --git a/src/com/android/settings/password/ChooseLockTypeDialogFragment.java b/src/com/android/settings/password/ChooseLockTypeDialogFragment.java
index 8793471..8bc2976 100644
--- a/src/com/android/settings/password/ChooseLockTypeDialogFragment.java
+++ b/src/com/android/settings/password/ChooseLockTypeDialogFragment.java
@@ -74,7 +74,7 @@
 
             // Copy the original extras into the new intent
             copyBooleanExtra(activityIntent, intent,
-                    ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false);
+                    ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE, false);
             copyBooleanExtra(activityIntent, intent,
                     ChooseLockGenericFragment.EXTRA_SHOW_OPTIONS_BUTTON, false);
             if (activityIntent.hasExtra(
@@ -83,8 +83,6 @@
                         ChooseLockGenericFragment.EXTRA_CHOOSE_LOCK_GENERIC_EXTRAS));
             }
             intent.putExtra(LockPatternUtils.PASSWORD_TYPE_KEY, selectedLockType.defaultQuality);
-            intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE,
-                    activityIntent.getLongExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0));
             WizardManagerHelper.copyWizardManagerExtras(activityIntent, intent);
             activity.startActivity(intent);
             activity.finish();
diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java b/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
index 64812fd..6a97dcd 100644
--- a/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
+++ b/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
@@ -27,9 +27,9 @@
 import android.content.Intent;
 import android.graphics.Color;
 import android.hardware.biometrics.BiometricConstants;
-import android.hardware.biometrics.BiometricManager;
 import android.hardware.biometrics.BiometricPrompt;
 import android.hardware.biometrics.BiometricPrompt.AuthenticationCallback;
+import android.hardware.biometrics.PromptInfo;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
@@ -80,24 +80,11 @@
         return intent;
     }
 
-    public static Intent createIntent(CharSequence title, CharSequence details, long challenge) {
-        Intent intent = new Intent();
-        intent.setClassName(SETTINGS_PACKAGE_NAME,
-                ConfirmDeviceCredentialActivity.class.getName());
-        intent.putExtra(KeyguardManager.EXTRA_TITLE, title);
-        intent.putExtra(KeyguardManager.EXTRA_DESCRIPTION, details);
-        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, challenge);
-        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, true);
-        return intent;
-    }
-
-    private BiometricManager mBiometricManager;
     private BiometricFragment mBiometricFragment;
     private DevicePolicyManager mDevicePolicyManager;
     private LockPatternUtils mLockPatternUtils;
     private UserManager mUserManager;
     private TrustManager mTrustManager;
-    private ChooseLockSettingsHelper mChooseLockSettingsHelper;
     private Handler mHandler = new Handler(Looper.getMainLooper());
     private Context mContext;
     private boolean mCheckDevicePolicyManager;
@@ -181,7 +168,6 @@
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
         getWindow().setStatusBarColor(Color.TRANSPARENT);
 
-        mBiometricManager = getSystemService(BiometricManager.class);
         mDevicePolicyManager = getSystemService(DevicePolicyManager.class);
         mUserManager = UserManager.get(this);
         mTrustManager = getSystemService(TrustManager.class);
@@ -190,7 +176,7 @@
         Intent intent = getIntent();
         mContext = this;
         mCheckDevicePolicyManager = intent
-                .getBooleanExtra(BiometricPrompt.EXTRA_DISALLOW_BIOMETRICS_IF_POLICY_EXISTS, false);
+                .getBooleanExtra(KeyguardManager.EXTRA_DISALLOW_BIOMETRICS_IF_POLICY_EXISTS, false);
         mTitle = intent.getStringExtra(KeyguardManager.EXTRA_TITLE);
         mDetails = intent.getStringExtra(KeyguardManager.EXTRA_DESCRIPTION);
         String alternateButton = intent.getStringExtra(
@@ -213,24 +199,21 @@
             mTitle = getTitleFromOrganizationName(mUserId);
         }
 
-
-        mChooseLockSettingsHelper = new ChooseLockSettingsHelper(this);
         final LockPatternUtils lockPatternUtils = new LockPatternUtils(this);
 
-        final Bundle bpBundle = new Bundle();
-        bpBundle.putString(BiometricPrompt.KEY_TITLE, mTitle);
-        bpBundle.putString(BiometricPrompt.KEY_DESCRIPTION, mDetails);
-        bpBundle.putBoolean(BiometricPrompt.EXTRA_DISALLOW_BIOMETRICS_IF_POLICY_EXISTS,
-                mCheckDevicePolicyManager);
+        final PromptInfo promptInfo = new PromptInfo();
+        promptInfo.setTitle(mTitle);
+        promptInfo.setDescription(mDetails);
+        promptInfo.setDisallowBiometricsIfPolicyExists(mCheckDevicePolicyManager);
 
         final @LockPatternUtils.CredentialType int credentialType = Utils.getCredentialType(
                 mContext, effectiveUserId);
         if (mTitle == null) {
-            bpBundle.putString(BiometricPrompt.KEY_DEVICE_CREDENTIAL_TITLE,
+            promptInfo.setDeviceCredentialTitle(
                     getTitleFromCredentialType(credentialType, isManagedProfile));
         }
         if (mDetails == null) {
-            bpBundle.putString(BiometricPrompt.KEY_DEVICE_CREDENTIAL_SUBTITLE,
+            promptInfo.setSubtitle(
                     getDetailsFromCredentialType(credentialType, isManagedProfile));
         }
 
@@ -240,13 +223,19 @@
         // tied profile so it will enable work mode and unlock managed profile, when personal
         // challenge is unlocked.
         if (frp) {
-            launchedCDC = mChooseLockSettingsHelper.launchFrpConfirmationActivity(
-                    0, mTitle, mDetails, alternateButton);
+            final ChooseLockSettingsHelper.Builder builder =
+                    new ChooseLockSettingsHelper.Builder(this);
+            launchedCDC = builder.setHeader(mTitle) // Show the title in the header location
+                    .setDescription(mDetails)
+                    .setAlternateButton(alternateButton)
+                    .setExternal(true)
+                    .setUserId(LockPatternUtils.USER_FRP)
+                    .show();
         } else if (isManagedProfile && isInternalActivity()
                 && !lockPatternUtils.isSeparateProfileChallengeEnabled(mUserId)) {
             mCredentialMode = CREDENTIAL_MANAGED;
             if (isBiometricAllowed(effectiveUserId, mUserId)) {
-                showBiometricPrompt(bpBundle);
+                showBiometricPrompt(promptInfo);
                 launchedBiometric = true;
             } else {
                 showConfirmCredentials();
@@ -257,7 +246,7 @@
             if (isBiometricAllowed(effectiveUserId, mUserId)) {
                 // Don't need to check if biometrics / pin/pattern/pass are enrolled. It will go to
                 // onAuthenticationError and do the right thing automatically.
-                showBiometricPrompt(bpBundle);
+                showBiometricPrompt(promptInfo);
                 launchedBiometric = true;
             } else {
                 showConfirmCredentials();
@@ -350,15 +339,13 @@
                 .hasPendingEscrowToken(realUserId);
     }
 
-    private void showBiometricPrompt(Bundle bundle) {
-        mBiometricManager.setActiveUser(mUserId);
-
+    private void showBiometricPrompt(PromptInfo promptInfo) {
         mBiometricFragment = (BiometricFragment) getSupportFragmentManager()
                 .findFragmentByTag(TAG_BIOMETRIC_FRAGMENT);
         boolean newFragment = false;
 
         if (mBiometricFragment == null) {
-            mBiometricFragment = BiometricFragment.newInstance(bundle);
+            mBiometricFragment = BiometricFragment.newInstance(promptInfo);
             newFragment = true;
         }
         mBiometricFragment.setCallbacks(mExecutor, mAuthenticationCallback);
@@ -377,7 +364,7 @@
         boolean launched = false;
         // The only difference between CREDENTIAL_MANAGED and CREDENTIAL_NORMAL is that for
         // CREDENTIAL_MANAGED, we launch the real confirm credential activity with an explicit
-        // but dummy challenge value (0L). This will result in ConfirmLockPassword calling
+        // but fake challenge value (0L). This will result in ConfirmLockPassword calling
         // verifyTiedProfileChallenge() (if it's a profile with unified challenge), due to the
         // difference between ConfirmLockPassword.startVerifyPassword() and
         // ConfirmLockPassword.startCheckPassword(). Calling verifyTiedProfileChallenge() here is
@@ -387,15 +374,22 @@
         // LockPatternChecker and LockPatternUtils. verifyPassword should be the only API to use,
         // which optionally accepts a challenge.
         if (mCredentialMode == CREDENTIAL_MANAGED) {
-            launched = mChooseLockSettingsHelper
-                    .launchConfirmationActivityWithExternalAndChallenge(
-                            0 /* request code */, null /* title */, mTitle, mDetails,
-                            true /* isExternal */, 0L /* challenge */, mUserId);
+            final ChooseLockSettingsHelper.Builder builder =
+                    new ChooseLockSettingsHelper.Builder(this);
+            launched = builder.setHeader(mTitle)
+                    .setDescription(mDetails)
+                    .setExternal(true)
+                    .setUserId(mUserId)
+                    .setForceVerifyPath(true)
+                    .show();
         } else if (mCredentialMode == CREDENTIAL_NORMAL) {
-            launched = mChooseLockSettingsHelper.launchConfirmationActivity(
-                    0 /* request code */, null /* title */,
-                    mTitle, mDetails, false /* returnCredentials */, true /* isExternal */,
-                    mUserId);
+            final ChooseLockSettingsHelper.Builder builder =
+                    new ChooseLockSettingsHelper.Builder(this);
+            launched = builder.setHeader(mTitle) // Show the title string in the header area
+                    .setDescription(mDetails)
+                    .setExternal(true)
+                    .setUserId(mUserId)
+                    .show();
         }
         if (!launched) {
             Log.d(TAG, "No pin/pattern/pass set");
diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java b/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java
index 262a550..a60fab9 100644
--- a/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java
+++ b/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java
@@ -27,10 +27,6 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.UserInfo;
-import android.graphics.Point;
-import android.graphics.PorterDuff;
-import android.graphics.drawable.ColorDrawable;
-import android.graphics.drawable.Drawable;
 import android.hardware.biometrics.BiometricManager;
 import android.os.Bundle;
 import android.os.Handler;
@@ -39,10 +35,7 @@
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.Button;
-import android.widget.FrameLayout;
-import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.appcompat.app.AlertDialog;
@@ -78,6 +71,8 @@
     protected static final long CLEAR_WRONG_ATTEMPT_TIMEOUT_MS = 3000;
 
     protected boolean mReturnCredentials = false;
+    protected boolean mReturnGatekeeperPassword = false;
+    protected boolean mForceVerifyPath = false;
     protected Button mCancelButton;
     /** Button allowing managed profile password reset, null when is not shown. */
     @Nullable protected Button mForgotButton;
@@ -100,12 +95,18 @@
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        mFrpAlternateButtonText = getActivity().getIntent().getCharSequenceExtra(
+        final Intent intent = getActivity().getIntent();
+        mFrpAlternateButtonText = intent.getCharSequenceExtra(
                 KeyguardManager.EXTRA_ALTERNATE_BUTTON_LABEL);
-        mReturnCredentials = getActivity().getIntent().getBooleanExtra(
+        mReturnCredentials = intent.getBooleanExtra(
                 ChooseLockSettingsHelper.EXTRA_KEY_RETURN_CREDENTIALS, false);
+
+        mReturnGatekeeperPassword = intent.getBooleanExtra(
+                ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE, false);
+        mForceVerifyPath = intent.getBooleanExtra(
+                ChooseLockSettingsHelper.EXTRA_KEY_FORCE_VERIFY, false);
+
         // Only take this argument into account if it belongs to the current profile.
-        Intent intent = getActivity().getIntent();
         mUserId = Utils.getUserIdFromBundle(getActivity(), intent.getExtras(),
                 isInternalActivity());
         mFrp = (mUserId == LockPatternUtils.USER_FRP);
@@ -210,30 +211,6 @@
     public void startEnterAnimation() {
     }
 
-    private void setWorkChallengeBackground(View baseView, int userId) {
-        View mainContent = getActivity().findViewById(com.android.settings.R.id.main_content);
-        if (mainContent != null) {
-            // Remove the main content padding so that the background image is full screen.
-            mainContent.setPadding(0, 0, 0, 0);
-        }
-
-        baseView.setBackground(
-                new ColorDrawable(mDevicePolicyManager.getOrganizationColorForUser(userId)));
-        ImageView imageView = (ImageView) baseView.findViewById(R.id.background_image);
-        if (imageView != null) {
-            Drawable image = getResources().getDrawable(R.drawable.work_challenge_background);
-            image.setColorFilter(
-                    getResources().getColor(R.color.confirm_device_credential_transparent_black),
-                    PorterDuff.Mode.DARKEN);
-            imageView.setImageDrawable(image);
-            Point screenSize = new Point();
-            getActivity().getWindowManager().getDefaultDisplay().getSize(screenSize);
-            imageView.setLayoutParams(new FrameLayout.LayoutParams(
-                    ViewGroup.LayoutParams.MATCH_PARENT,
-                    screenSize.y));
-        }
-    }
-
     protected void reportFailedAttempt() {
         updateErrorMessage(
                 mLockPatternUtils.getCurrentFailedPasswordAttempts(mEffectiveUserId) + 1);
diff --git a/src/com/android/settings/password/ConfirmLockPassword.java b/src/com/android/settings/password/ConfirmLockPassword.java
index 8aa44e9..6092d9f 100644
--- a/src/com/android/settings/password/ConfirmLockPassword.java
+++ b/src/com/android/settings/password/ConfirmLockPassword.java
@@ -380,13 +380,18 @@
                     : LockscreenCredential.createPin(passwordText);
 
             mPasswordEntryInputDisabler.setInputEnabled(false);
-            final boolean verifyChallenge = getActivity().getIntent().getBooleanExtra(
-                    ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false);
 
             Intent intent = new Intent();
-            if (verifyChallenge)  {
+            // TODO(b/161956762): Sanitize this
+            if (mReturnGatekeeperPassword) {
                 if (isInternalActivity()) {
-                    startVerifyPassword(credential, intent);
+                    startVerifyPassword(credential, intent,
+                            LockPatternUtils.VERIFY_FLAG_REQUEST_GK_PW_HANDLE);
+                    return;
+                }
+            } else if (mForceVerifyPath)  {
+                if (isInternalActivity()) {
+                    startVerifyPassword(credential, intent, 0 /* flags */);
                     return;
                 }
             } else {
@@ -401,35 +406,31 @@
             return getActivity() instanceof ConfirmLockPassword.InternalActivity;
         }
 
-        private void startVerifyPassword(LockscreenCredential credential, final Intent intent) {
-            long challenge = getActivity().getIntent().getLongExtra(
-                    ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0);
+        private void startVerifyPassword(LockscreenCredential credential, final Intent intent,
+                @LockPatternUtils.VerifyFlag int flags) {
             final int localEffectiveUserId = mEffectiveUserId;
             final int localUserId = mUserId;
-            final LockPatternChecker.OnVerifyCallback onVerifyCallback =
-                    new LockPatternChecker.OnVerifyCallback() {
-                        @Override
-                        public void onVerified(byte[] token, int timeoutMs) {
-                            mPendingLockCheck = null;
-                            boolean matched = false;
-                            if (token != null) {
-                                matched = true;
-                                if (mReturnCredentials) {
-                                    intent.putExtra(
-                                            ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN,
-                                            token);
-                                }
-                            }
-                            mCredentialCheckResultTracker.setResult(matched, intent, timeoutMs,
-                                    localEffectiveUserId);
-                        }
+            final LockPatternChecker.OnVerifyCallback onVerifyCallback = (response, timeoutMs) -> {
+                mPendingLockCheck = null;
+                final boolean matched = response.isMatched();
+                if (matched && mReturnCredentials) {
+                    if ((flags & LockPatternUtils.VERIFY_FLAG_REQUEST_GK_PW_HANDLE) != 0) {
+                        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_GK_PW_HANDLE,
+                                response.getGatekeeperPasswordHandle());
+                    } else {
+                        intent.putExtra(
+                                ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN,
+                                response.getGatekeeperHAT());
+                    }
+                }
+                mCredentialCheckResultTracker.setResult(matched, intent, timeoutMs,
+                        localEffectiveUserId);
             };
             mPendingLockCheck = (localEffectiveUserId == localUserId)
-                    ? LockPatternChecker.verifyCredential(
-                            mLockPatternUtils, credential, challenge, localUserId, onVerifyCallback)
-                    : LockPatternChecker.verifyTiedProfileChallenge(
-                            mLockPatternUtils, credential, challenge, localUserId,
-                            onVerifyCallback);
+                    ? LockPatternChecker.verifyCredential(mLockPatternUtils, credential,
+                            localUserId, flags, onVerifyCallback)
+                    : LockPatternChecker.verifyTiedProfileChallenge(mLockPatternUtils, credential,
+                            localUserId, flags, onVerifyCallback);
         }
 
         private void startCheckPassword(final LockscreenCredential credential,
diff --git a/src/com/android/settings/password/ConfirmLockPattern.java b/src/com/android/settings/password/ConfirmLockPattern.java
index 48014cb..598e09a 100644
--- a/src/com/android/settings/password/ConfirmLockPattern.java
+++ b/src/com/android/settings/password/ConfirmLockPattern.java
@@ -422,14 +422,18 @@
 
                 mLockPatternView.setEnabled(false);
 
-                final boolean verifyChallenge = getActivity().getIntent().getBooleanExtra(
-                        ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false);
                 final LockscreenCredential credential = LockscreenCredential.createPattern(pattern);
-                //TODO: how to sanitize this?
+                // TODO(b/161956762): Sanitize this
                 Intent intent = new Intent();
-                if (verifyChallenge) {
+                if (mReturnGatekeeperPassword) {
                     if (isInternalActivity()) {
-                        startVerifyPattern(credential, intent);
+                        startVerifyPattern(credential, intent,
+                                LockPatternUtils.VERIFY_FLAG_REQUEST_GK_PW_HANDLE);
+                        return;
+                    }
+                } else if (mForceVerifyPath) {
+                    if (isInternalActivity()) {
+                        startVerifyPattern(credential, intent, 0 /* flags */);
                         return;
                     }
                 } else {
@@ -445,36 +449,33 @@
             }
 
             private void startVerifyPattern(final LockscreenCredential pattern,
-                    final Intent intent) {
+                    final Intent intent, @LockPatternUtils.VerifyFlag int flags) {
                 final int localEffectiveUserId = mEffectiveUserId;
                 final int localUserId = mUserId;
-                long challenge = getActivity().getIntent().getLongExtra(
-                        ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0);
                 final LockPatternChecker.OnVerifyCallback onVerifyCallback =
-                    new LockPatternChecker.OnVerifyCallback() {
-                        @Override
-                        public void onVerified(byte[] token, int timeoutMs) {
-                            mPendingLockCheck = null;
-                            boolean matched = false;
-                            if (token != null) {
-                                matched = true;
-                                if (mReturnCredentials) {
-                                    intent.putExtra(
-                                            ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN,
-                                            token);
-                                }
+                    (response, timeoutMs) -> {
+                        mPendingLockCheck = null;
+                        final boolean matched = response.isMatched();
+                        if (matched && mReturnCredentials) {
+                            if ((flags & LockPatternUtils.VERIFY_FLAG_REQUEST_GK_PW_HANDLE) != 0) {
+                                intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_GK_PW_HANDLE,
+                                        response.getGatekeeperPasswordHandle());
+                            } else {
+                                intent.putExtra(
+                                        ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN,
+                                        response.getGatekeeperHAT());
                             }
-                            mCredentialCheckResultTracker.setResult(matched, intent, timeoutMs,
-                                    localEffectiveUserId);
                         }
-                    };
+                        mCredentialCheckResultTracker.setResult(matched, intent, timeoutMs,
+                                localEffectiveUserId);
+                };
                 mPendingLockCheck = (localEffectiveUserId == localUserId)
                         ? LockPatternChecker.verifyCredential(
-                                mLockPatternUtils, pattern, challenge, localUserId,
+                                mLockPatternUtils, pattern, localUserId, flags,
                                 onVerifyCallback)
                         : LockPatternChecker.verifyTiedProfileChallenge(
-                                mLockPatternUtils, pattern,
-                                challenge, localUserId, onVerifyCallback);
+                                mLockPatternUtils, pattern, localUserId, flags,
+                                onVerifyCallback);
             }
 
             private void startCheckPattern(final LockscreenCredential pattern,
diff --git a/src/com/android/settings/password/SaveChosenLockWorkerBase.java b/src/com/android/settings/password/SaveChosenLockWorkerBase.java
index 26e4d5a..cea908b 100644
--- a/src/com/android/settings/password/SaveChosenLockWorkerBase.java
+++ b/src/com/android/settings/password/SaveChosenLockWorkerBase.java
@@ -42,8 +42,7 @@
     private Intent mResultData;
 
     protected LockPatternUtils mUtils;
-    protected boolean mHasChallenge;
-    protected long mChallenge;
+    protected boolean mRequestGatekeeperPassword;
     protected boolean mWasSecureBefore;
     protected int mUserId;
     protected int mUnificationProfileId = UserHandle.USER_NULL;
@@ -69,12 +68,10 @@
     }
 
     protected void prepare(LockPatternUtils utils, boolean credentialRequired,
-            boolean hasChallenge, long challenge, int userId) {
+            boolean requestGatekeeperPassword, int userId) {
         mUtils = utils;
         mUserId = userId;
-
-        mHasChallenge = hasChallenge;
-        mChallenge = challenge;
+        mRequestGatekeeperPassword = requestGatekeeperPassword;
         // This will be a no-op for non managed profiles.
         mWasSecureBefore = mUtils.isSecure(mUserId);
 
diff --git a/src/com/android/settings/password/SetNewPasswordController.java b/src/com/android/settings/password/SetNewPasswordController.java
index bf55271..393e8c7 100644
--- a/src/com/android/settings/password/SetNewPasswordController.java
+++ b/src/com/android/settings/password/SetNewPasswordController.java
@@ -135,26 +135,22 @@
 
     private Bundle getFingerprintChooseLockExtras() {
         Bundle chooseLockExtras = new Bundle();
-        long challenge = mFingerprintManager.preEnroll();
         chooseLockExtras.putInt(ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY,
                 PASSWORD_QUALITY_SOMETHING);
         chooseLockExtras.putBoolean(
                 ChooseLockGeneric.ChooseLockGenericFragment.HIDE_DISABLED_PREFS, true);
-        chooseLockExtras.putBoolean(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, true);
-        chooseLockExtras.putLong(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, challenge);
+        chooseLockExtras.putBoolean(ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE, true);
         chooseLockExtras.putBoolean(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT, true);
         return chooseLockExtras;
     }
 
     private Bundle getFaceChooseLockExtras() {
         Bundle chooseLockExtras = new Bundle();
-        long challenge = mFaceManager.generateChallenge();
         chooseLockExtras.putInt(ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY,
                 PASSWORD_QUALITY_SOMETHING);
         chooseLockExtras.putBoolean(
                 ChooseLockGeneric.ChooseLockGenericFragment.HIDE_DISABLED_PREFS, true);
-        chooseLockExtras.putBoolean(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, true);
-        chooseLockExtras.putLong(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, challenge);
+        chooseLockExtras.putBoolean(ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE, true);
         chooseLockExtras.putBoolean(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FACE, true);
         return chooseLockExtras;
     }
diff --git a/src/com/android/settings/search/CustomSiteMapRegistry.java b/src/com/android/settings/search/CustomSiteMapRegistry.java
index f1c6211..cd716fa 100644
--- a/src/com/android/settings/search/CustomSiteMapRegistry.java
+++ b/src/com/android/settings/search/CustomSiteMapRegistry.java
@@ -35,7 +35,7 @@
 import com.android.settings.security.screenlock.ScreenLockSettings;
 import com.android.settings.system.SystemDashboardFragment;
 import com.android.settings.wallpaper.WallpaperSuggestionActivity;
-import com.android.settings.wifi.WifiSettings2;
+import com.android.settings.wifi.WifiSettings;
 
 import java.util.Map;
 
@@ -55,7 +55,7 @@
         CUSTOM_SITE_MAP.put(
                 WallpaperSuggestionActivity.class.getName(), DisplaySettings.class.getName());
         CUSTOM_SITE_MAP.put(
-                WifiSettings2.class.getName(), NetworkDashboardFragment.class.getName());
+                WifiSettings.class.getName(), NetworkDashboardFragment.class.getName());
         CUSTOM_SITE_MAP.put(PowerUsageAdvanced.class.getName(), PowerUsageSummary.class.getName());
         CUSTOM_SITE_MAP.put(RecentLocationRequestSeeAllFragment.class.getName(),
                 LocationSettings.class.getName());
diff --git a/src/com/android/settings/search/SearchFeatureProviderImpl.java b/src/com/android/settings/search/SearchFeatureProviderImpl.java
index 63bf420..508d37d 100644
--- a/src/com/android/settings/search/SearchFeatureProviderImpl.java
+++ b/src/com/android/settings/search/SearchFeatureProviderImpl.java
@@ -45,13 +45,13 @@
         final String packageName = caller.getPackageName();
         final boolean isSettingsPackage = TextUtils.equals(packageName, context.getPackageName())
                 || TextUtils.equals(getSettingsIntelligencePkgName(context), packageName);
-        final boolean isWhitelistedPackage =
-                isSignatureWhitelisted(context, caller.getPackageName());
-        if (isSettingsPackage || isWhitelistedPackage) {
+        final boolean isAllowlistedPackage =
+                isSignatureAllowlisted(context, caller.getPackageName());
+        if (isSettingsPackage || isAllowlistedPackage) {
             return;
         }
         throw new SecurityException("Search result intents must be called with from a "
-                + "whitelisted package.");
+                + "allowlisted package.");
     }
 
     @Override
@@ -69,7 +69,7 @@
                 .putExtra(Intent.EXTRA_REFERRER, buildReferrer(context, pageId));
     }
 
-    protected boolean isSignatureWhitelisted(Context context, String callerPackage) {
+    protected boolean isSignatureAllowlisted(Context context, String callerPackage) {
         return false;
     }
 
diff --git a/src/com/android/settings/security/CredentialStorage.java b/src/com/android/settings/security/CredentialStorage.java
index 5e64723..2e3e2ed 100644
--- a/src/com/android/settings/security/CredentialStorage.java
+++ b/src/com/android/settings/security/CredentialStorage.java
@@ -357,9 +357,11 @@
      */
     private boolean confirmKeyGuard(int requestCode) {
         final Resources res = getResources();
-        return new ChooseLockSettingsHelper(this)
-                .launchConfirmationActivity(requestCode,
-                        res.getText(R.string.credentials_title), true);
+        final ChooseLockSettingsHelper.Builder builder =
+                new ChooseLockSettingsHelper.Builder(this);
+        return builder.setRequestCode(requestCode)
+                .setTitle(res.getText(R.string.credentials_title))
+                .show();
     }
 
     @Override
diff --git a/src/com/android/settings/security/CredentialStoragePreferenceController.java b/src/com/android/settings/security/CredentialStoragePreferenceController.java
deleted file mode 100644
index 060d964..0000000
--- a/src/com/android/settings/security/CredentialStoragePreferenceController.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.security;
-
-import android.content.Context;
-import android.os.UserManager;
-import android.security.KeyStore;
-
-import androidx.preference.Preference;
-
-import com.android.settings.R;
-
-public class CredentialStoragePreferenceController extends
-        RestrictedEncryptionPreferenceController {
-
-    private static final String KEY_CREDENTIAL_STORAGE_TYPE = "credential_storage_type";
-    private final KeyStore mKeyStore;
-
-    public CredentialStoragePreferenceController(Context context) {
-        super(context, UserManager.DISALLOW_CONFIG_CREDENTIALS);
-        mKeyStore = KeyStore.getInstance();
-    }
-
-    @Override
-    public String getPreferenceKey() {
-        return KEY_CREDENTIAL_STORAGE_TYPE;
-    }
-
-    @Override
-    public void updateState(Preference preference) {
-        preference.setSummary(mKeyStore.isHardwareBacked()
-                ? R.string.credential_storage_type_hardware
-                : R.string.credential_storage_type_software);
-    }
-}
diff --git a/src/com/android/settings/security/CryptKeeperSettings.java b/src/com/android/settings/security/CryptKeeperSettings.java
index aa47b2b..4fc17fb 100644
--- a/src/com/android/settings/security/CryptKeeperSettings.java
+++ b/src/com/android/settings/security/CryptKeeperSettings.java
@@ -37,6 +37,7 @@
 import androidx.appcompat.app.AlertDialog;
 import androidx.preference.Preference;
 
+import com.android.internal.widget.LockPatternUtils;
 import com.android.internal.widget.LockscreenCredential;
 import com.android.settings.CryptKeeperConfirm;
 import com.android.settings.R;
@@ -169,17 +170,20 @@
      * @return true if confirmation launched
      */
     private boolean runKeyguardConfirmation(int request) {
-        Resources res = getActivity().getResources();
-        ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(getActivity(), this);
-
-        if (helper.utils().getKeyguardStoredPasswordQuality(UserHandle.myUserId())
+        final LockPatternUtils utils = new LockPatternUtils(getActivity());
+        if (utils.getKeyguardStoredPasswordQuality(UserHandle.myUserId())
                 == DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED) {
             showFinalConfirmation(StorageManager.CRYPT_TYPE_DEFAULT, "".getBytes());
             return true;
         }
 
-        return helper.launchConfirmationActivity(request,
-                res.getText(R.string.crypt_keeper_encrypt_title), true);
+        final Resources res = getActivity().getResources();
+        final ChooseLockSettingsHelper.Builder builder =
+                new ChooseLockSettingsHelper.Builder(getActivity(), this);
+        return builder.setRequestCode(request)
+                .setTitle(res.getText(R.string.crypt_keeper_encrypt_title))
+                .setReturnCredentials(true)
+                .show();
     }
 
     @Override
diff --git a/src/com/android/settings/security/EncryptionAndCredential.java b/src/com/android/settings/security/EncryptionAndCredential.java
index d873271..5362ad0 100644
--- a/src/com/android/settings/security/EncryptionAndCredential.java
+++ b/src/com/android/settings/security/EncryptionAndCredential.java
@@ -72,7 +72,6 @@
         controllers.add(new PreferenceCategoryController(context,
                 "encryption_and_credentials_status_category").setChildren(
                 Arrays.asList(encryptStatusController)));
-        controllers.add(new CredentialStoragePreferenceController(context));
         controllers.add(new UserCredentialsPreferenceController(context));
         controllers.add(new ResetCredentialsPreferenceController(context, lifecycle));
         controllers.add(new InstallCertificatePreferenceController(context));
diff --git a/src/com/android/settings/security/LockUnificationPreferenceController.java b/src/com/android/settings/security/LockUnificationPreferenceController.java
index 9cacf8e..e47180e 100644
--- a/src/com/android/settings/security/LockUnificationPreferenceController.java
+++ b/src/com/android/settings/security/LockUnificationPreferenceController.java
@@ -118,11 +118,15 @@
             startUnification();
         } else {
             final String title = mContext.getString(R.string.unlock_set_unlock_launch_picker_title);
-            final ChooseLockSettingsHelper helper =
-                    new ChooseLockSettingsHelper(mHost.getActivity(), mHost);
-            if (!helper.launchConfirmationActivity(
-                    UNUNIFY_LOCK_CONFIRM_DEVICE_REQUEST,
-                    title, true /* returnCredentials */, MY_USER_ID)) {
+            final ChooseLockSettingsHelper.Builder builder =
+                    new ChooseLockSettingsHelper.Builder(mHost.getActivity(), mHost);
+            final boolean launched = builder.setRequestCode(UNUNIFY_LOCK_CONFIRM_DEVICE_REQUEST)
+                    .setTitle(title)
+                    .setReturnCredentials(true)
+                    .setUserId(MY_USER_ID)
+                    .show();
+
+            if (!launched) {
                 ununifyLocks();
             }
         }
@@ -176,10 +180,14 @@
         // Confirm profile lock
         final String title = mContext.getString(
                 R.string.unlock_set_unlock_launch_picker_title_profile);
-        final ChooseLockSettingsHelper helper =
-                new ChooseLockSettingsHelper(mHost.getActivity(), mHost);
-        if (!helper.launchConfirmationActivity(
-                UNIFY_LOCK_CONFIRM_PROFILE_REQUEST, title, true, mProfileUserId)) {
+        final ChooseLockSettingsHelper.Builder builder =
+                new ChooseLockSettingsHelper.Builder(mHost.getActivity(), mHost);
+        final boolean launched = builder.setRequestCode(UNIFY_LOCK_CONFIRM_PROFILE_REQUEST)
+                .setTitle(title)
+                .setReturnCredentials(true)
+                .setUserId(mProfileUserId)
+                .show();
+        if (!launched) {
             // If profile has no lock, go straight to unification.
             unifyLocks();
             // TODO: update relevant prefs.
diff --git a/src/com/android/settings/security/ScreenPinningSettings.java b/src/com/android/settings/security/ScreenPinningSettings.java
index c532366..1e620cf 100644
--- a/src/com/android/settings/security/ScreenPinningSettings.java
+++ b/src/com/android/settings/security/ScreenPinningSettings.java
@@ -186,7 +186,7 @@
     }
 
     /**
-     * Listens to the state change of the lock-to-app master switch.
+     * Listens to the state change of the overall lock-to-app switch.
      */
     @Override
     public void onSwitchChanged(Switch switchView, boolean isChecked) {
diff --git a/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java b/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java
index 999c945..abeef2d 100644
--- a/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java
+++ b/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java
@@ -112,7 +112,7 @@
                     mDPM.getMaximumTimeToLock(null /* admin */, UserHandle.myUserId());
             final long displayTimeout = Math.max(0,
                     Settings.System.getInt(mContext.getContentResolver(), SCREEN_OFF_TIMEOUT, 0));
-            // This setting is a slave to display timeout when a device policy is enforced.
+            // This setting is a secondary to display timeout when a device policy is enforced.
             // As such, maxLockTimeout = adminTimeout - displayTimeout.
             // If there isn't enough time, shows "immediately" setting.
             final long maxTimeout = Math.max(0, adminTimeout - displayTimeout);
diff --git a/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java b/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java
index ffd0183..d3c10b0 100644
--- a/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java
+++ b/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java
@@ -78,7 +78,7 @@
                     R.string.lockpattern_settings_power_button_instantly_locks_summary,
                     trustAgentLabel));
         } else {
-            preference.setSummary(R.string.summary_placeholder);
+            preference.setSummary(R.string.summary_empty);
         }
     }
 
diff --git a/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java b/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java
index 19e25fc..5e624cc 100644
--- a/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java
+++ b/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java
@@ -120,11 +120,14 @@
         if (!mTrustAgentsKeyList.contains(preference.getKey())) {
             return super.handlePreferenceTreeClick(preference);
         }
-        final ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(
-                mHost.getActivity(), mHost);
+
+        final ChooseLockSettingsHelper.Builder builder =
+                new ChooseLockSettingsHelper.Builder(mHost.getActivity(), mHost);
+        final boolean confirmationLaunched = builder.setRequestCode(CHANGE_TRUST_AGENT_SETTINGS)
+                .setTitle(preference.getTitle())
+                .show();
+
         mTrustAgentClickIntent = preference.getIntent();
-        boolean confirmationLaunched = helper.launchConfirmationActivity(
-                CHANGE_TRUST_AGENT_SETTINGS, preference.getTitle());
 
         if (!confirmationLaunched && mTrustAgentClickIntent != null) {
             // If this returns false, it means no password confirmation is required.
diff --git a/src/com/android/settings/shortcut/CreateShortcutPreferenceController.java b/src/com/android/settings/shortcut/CreateShortcutPreferenceController.java
index 4843736..c0f7e1f 100644
--- a/src/com/android/settings/shortcut/CreateShortcutPreferenceController.java
+++ b/src/com/android/settings/shortcut/CreateShortcutPreferenceController.java
@@ -32,7 +32,6 @@
 import android.graphics.drawable.Icon;
 import android.graphics.drawable.LayerDrawable;
 import android.net.ConnectivityManager;
-import android.util.FeatureFlagUtils;
 import android.util.Log;
 import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
@@ -46,8 +45,6 @@
 
 import com.android.settings.R;
 import com.android.settings.Settings.TetherSettingsActivity;
-import com.android.settings.Settings.WifiSettings2Activity;
-import com.android.settings.Settings.WifiSettingsActivity;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
@@ -190,15 +187,6 @@
                 Log.d(TAG, "Skipping non-system app: " + info.activityInfo);
                 continue;
             }
-            if (FeatureFlagUtils.isEnabled(mContext, FeatureFlagUtils.SETTINGS_WIFITRACKER2)) {
-                if (info.activityInfo.name.endsWith(WifiSettingsActivity.class.getSimpleName())) {
-                    continue;
-                }
-            } else {
-                if (info.activityInfo.name.endsWith(WifiSettings2Activity.class.getSimpleName())) {
-                    continue;
-                }
-            }
             shortcuts.add(info);
         }
         Collections.sort(shortcuts, SHORTCUT_COMPARATOR);
diff --git a/src/com/android/settings/sim/SimSelectNotification.java b/src/com/android/settings/sim/SimSelectNotification.java
index ae36f35..6bd4c24 100644
--- a/src/com/android/settings/sim/SimSelectNotification.java
+++ b/src/com/android/settings/sim/SimSelectNotification.java
@@ -20,6 +20,7 @@
 import static android.provider.Settings.ENABLE_MMS_DATA_REQUEST_REASON_OUTGOING_MMS;
 import static android.provider.Settings.EXTRA_ENABLE_MMS_DATA_REQUEST_REASON;
 import static android.provider.Settings.EXTRA_SUB_ID;
+import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME;
 import static android.telephony.TelephonyManager.EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE;
 import static android.telephony.TelephonyManager.EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_ALL;
 import static android.telephony.TelephonyManager.EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_DATA;
@@ -209,6 +210,7 @@
                 .setContentText(resources.getText(R.string.sim_notification_summary))
                 .setAutoCancel(true);
         Intent resultIntent = new Intent(Settings.ACTION_WIRELESS_SETTINGS);
+        resultIntent.setPackage(SETTINGS_PACKAGE_NAME);
         resultIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         PendingIntent resultPendingIntent = PendingIntent.getActivity(context, 0, resultIntent,
                 PendingIntent.FLAG_CANCEL_CURRENT);
diff --git a/src/com/android/settings/slices/SettingsSliceProvider.java b/src/com/android/settings/slices/SettingsSliceProvider.java
index c22d001..23af461 100644
--- a/src/com/android/settings/slices/SettingsSliceProvider.java
+++ b/src/com/android/settings/slices/SettingsSliceProvider.java
@@ -328,7 +328,7 @@
                     .collect(Collectors.toList());
             descendants.addAll(customSlices);
         }
-        grantWhitelistedPackagePermissions(getContext(), descendants);
+        grantAllowlistedPackagePermissions(getContext(), descendants);
         return descendants;
     }
 
@@ -344,23 +344,23 @@
     }
 
     @VisibleForTesting
-    static void grantWhitelistedPackagePermissions(Context context, List<Uri> descendants) {
+    static void grantAllowlistedPackagePermissions(Context context, List<Uri> descendants) {
         if (descendants == null) {
             Log.d(TAG, "No descendants to grant permission with, skipping.");
         }
-        final String[] whitelistPackages =
-                context.getResources().getStringArray(R.array.slice_whitelist_package_names);
-        if (whitelistPackages == null || whitelistPackages.length == 0) {
-            Log.d(TAG, "No packages to whitelist, skipping.");
+        final String[] allowlistPackages =
+                context.getResources().getStringArray(R.array.slice_allowlist_package_names);
+        if (allowlistPackages == null || allowlistPackages.length == 0) {
+            Log.d(TAG, "No packages to allowlist, skipping.");
             return;
         } else {
             Log.d(TAG, String.format(
-                    "Whitelisting %d uris to %d pkgs.",
-                    descendants.size(), whitelistPackages.length));
+                    "Allowlisting %d uris to %d pkgs.",
+                    descendants.size(), allowlistPackages.length));
         }
         final SliceManager sliceManager = context.getSystemService(SliceManager.class);
         for (Uri descendant : descendants) {
-            for (String toPackage : whitelistPackages) {
+            for (String toPackage : allowlistPackages) {
                 sliceManager.grantSlicePermission(toPackage, descendant);
             }
         }
@@ -426,7 +426,7 @@
         try {
             KEY_VALUE_LIST_PARSER.setString(value);
         } catch (IllegalArgumentException e) {
-            Log.e(TAG, "Bad Settings Slices Whitelist flags", e);
+            Log.e(TAG, "Bad Settings Slices Allowlist flags", e);
             return set;
         }
 
diff --git a/src/com/android/settings/sound/MediaControlsPreferenceController.java b/src/com/android/settings/sound/MediaControlsPreferenceController.java
index 050cf93..219eb24 100644
--- a/src/com/android/settings/sound/MediaControlsPreferenceController.java
+++ b/src/com/android/settings/sound/MediaControlsPreferenceController.java
@@ -35,12 +35,12 @@
     @Override
     public boolean isChecked() {
         int val = Settings.Secure.getInt(mContext.getContentResolver(), MEDIA_CONTROLS_RESUME, 1);
-        return val == 0;
+        return val == 1;
     }
 
     @Override
     public boolean setChecked(boolean isChecked) {
-        int val = isChecked ? 0 : 1;
+        int val = isChecked ? 1 : 0;
         return Settings.Secure.putInt(mContext.getContentResolver(), MEDIA_CONTROLS_RESUME, val);
     }
 
diff --git a/src/com/android/settings/sound/ResumableMediaAppsController.java b/src/com/android/settings/sound/ResumableMediaAppsController.java
new file mode 100644
index 0000000..383cd41
--- /dev/null
+++ b/src/com/android/settings/sound/ResumableMediaAppsController.java
@@ -0,0 +1,138 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.sound;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.graphics.drawable.Drawable;
+import android.provider.Settings;
+import android.service.media.MediaBrowserService;
+import android.text.TextUtils;
+import android.util.ArraySet;
+import android.util.Log;
+
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
+import com.android.settings.core.BasePreferenceController;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Section of media controls settings that contains a list of potentially resumable apps
+ */
+public class ResumableMediaAppsController extends BasePreferenceController {
+    private static final String TAG = "ResumableMediaAppsCtrl";
+
+    private PreferenceGroup mPreferenceGroup;
+    private PackageManager mPackageManager;
+    private List<ResolveInfo> mResumeInfo;
+
+    public ResumableMediaAppsController(Context context, String key) {
+        super(context, key);
+        mPackageManager = mContext.getPackageManager();
+        Intent serviceIntent = new Intent(MediaBrowserService.SERVICE_INTERFACE);
+        mResumeInfo = mPackageManager.queryIntentServices(serviceIntent, 0);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        // Update list, since this will be called when the app goes to onStart / onPause
+        Intent serviceIntent = new Intent(MediaBrowserService.SERVICE_INTERFACE);
+        mResumeInfo = mPackageManager.queryIntentServices(serviceIntent, 0);
+        return (mResumeInfo.size() > 0) ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreferenceGroup = screen.findPreference(getPreferenceKey());
+        Set<String> blockedApps = getBlockedMediaApps();
+        for (ResolveInfo inf : mResumeInfo) {
+            String packageName = inf.getComponentInfo().packageName;
+            MediaSwitchPreference pref = new MediaSwitchPreference(mContext, packageName);
+            CharSequence appTitle = packageName;
+            try {
+                appTitle = mPackageManager.getApplicationLabel(
+                        mPackageManager.getApplicationInfo(packageName, 0));
+                Drawable appIcon = mPackageManager.getApplicationIcon(packageName);
+                pref.setIcon(appIcon);
+            } catch (PackageManager.NameNotFoundException e) {
+                Log.e(TAG, "Couldn't get app title", e);
+            }
+            pref.setTitle(appTitle);
+
+            pref.setOnPreferenceChangeListener((preference, status) -> {
+                MediaSwitchPreference mediaPreference = (MediaSwitchPreference) preference;
+                boolean isEnabled = (boolean) status;
+                Log.d(TAG, "preference " + mediaPreference + " changed " + isEnabled);
+
+                if (isEnabled) {
+                    blockedApps.remove(mediaPreference.getPackageName());
+                } else {
+                    blockedApps.add(mediaPreference.getPackageName());
+                }
+                setBlockedMediaApps(blockedApps);
+                return true;
+            });
+
+            pref.setChecked(!blockedApps.contains(packageName));
+            mPreferenceGroup.addPreference(pref);
+        }
+    }
+
+    class MediaSwitchPreference extends SwitchPreference {
+        private String mPackageName;
+
+        MediaSwitchPreference(Context context, String packageName) {
+            super(context);
+            mPackageName = packageName;
+        }
+
+        public String getPackageName() {
+            return mPackageName;
+        }
+    }
+
+    private Set<String> getBlockedMediaApps() {
+        String list = Settings.Secure.getString(mContext.getContentResolver(),
+                Settings.Secure.MEDIA_CONTROLS_RESUME_BLOCKED);
+        if (TextUtils.isEmpty(list)) {
+            return new ArraySet<>();
+        }
+        String[] names = list.split(":");
+        Set<String> set = new ArraySet<>(names.length);
+        Collections.addAll(set, names);
+        return set;
+    }
+
+    private void setBlockedMediaApps(Set<String> apps) {
+        if (apps == null || apps.size() == 0) {
+            Settings.Secure.putString(mContext.getContentResolver(),
+                    Settings.Secure.MEDIA_CONTROLS_RESUME_BLOCKED, "");
+            return;
+        }
+        String list = String.join(":", apps);
+        Settings.Secure.putString(mContext.getContentResolver(),
+                Settings.Secure.MEDIA_CONTROLS_RESUME_BLOCKED, list);
+    }
+}
diff --git a/src/com/android/settings/users/AppRestrictionsFragment.java b/src/com/android/settings/users/AppRestrictionsFragment.java
index 9f6a2b6..a23aeef 100644
--- a/src/com/android/settings/users/AppRestrictionsFragment.java
+++ b/src/com/android/settings/users/AppRestrictionsFragment.java
@@ -393,7 +393,7 @@
             p.setChecked(false);
             p.setTitle(app.activityName);
             p.setKey(getKeyForPackage(packageName));
-            p.setSettingsEnabled(hasSettings && app.masterEntry == null);
+            p.setSettingsEnabled(hasSettings && app.primaryEntry == null);
             p.setPersistent(false);
             p.setOnPreferenceChangeListener(this);
             p.setOnPreferenceClickListener(this);
@@ -406,14 +406,14 @@
                 // Get and populate the defaults, since the user is not going to be
                 // able to toggle this app ON (it's ON by default and immutable).
                 // Only do this for restricted profiles, not single-user restrictions
-                // Also don't do this for slave icons
-                if (app.masterEntry == null) {
+                // Also don't do this for secondary icons
+                if (app.primaryEntry == null) {
                     requestRestrictionsForApp(packageName, p, false);
                 }
             } else if (!mNewUser && isAppEnabledForUser(pi)) {
                 p.setChecked(true);
             }
-            if (app.masterEntry != null) {
+            if (app.primaryEntry != null) {
                 p.setImmutable(true);
                 p.setChecked(mHelper.isPackageSelected(packageName));
             }
@@ -432,17 +432,17 @@
 
     private String getPackageSummary(PackageInfo pi, AppRestrictionsHelper.SelectableAppInfo app) {
         // Check for 3 cases:
-        // - Slave entry that can see primary user accounts
-        // - Slave entry that cannot see primary user accounts
-        // - Master entry that can see primary user accounts
+        // - Secondary entry that can see primary user accounts
+        // - Secondary entry that cannot see primary user accounts
+        // - Primary entry that can see primary user accounts
         // Otherwise no summary is returned
-        if (app.masterEntry != null) {
+        if (app.primaryEntry != null) {
             if (mRestrictedProfile && pi.restrictedAccountType != null) {
                 return getString(R.string.app_sees_restricted_accounts_and_controlled_by,
-                        app.masterEntry.activityName);
+                        app.primaryEntry.activityName);
             }
             return getString(R.string.user_restrictions_controlled_by,
-                    app.masterEntry.activityName);
+                    app.primaryEntry.activityName);
         } else if (pi.restrictedAccountType != null) {
             return getString(R.string.app_sees_restricted_accounts);
         }
diff --git a/src/com/android/settings/users/EditUserInfoController.java b/src/com/android/settings/users/EditUserInfoController.java
index d205968..6b5e670 100644
--- a/src/com/android/settings/users/EditUserInfoController.java
+++ b/src/com/android/settings/users/EditUserInfoController.java
@@ -99,8 +99,7 @@
     }
 
     public void onSaveInstanceState(Bundle outState) {
-        if (mEditUserInfoDialog != null && mEditUserInfoDialog.isShowing()
-                && mEditUserPhotoController != null) {
+        if (mEditUserInfoDialog != null && mEditUserPhotoController != null) {
             // Bitmap cannot be stored into bundle because it may exceed parcel limit
             // Store it in a temporary file instead
             File file = mEditUserPhotoController.saveNewUserPhotoBitmap();
diff --git a/src/com/android/settings/users/UserDetailsSettings.java b/src/com/android/settings/users/UserDetailsSettings.java
index 897b3c7..53d9849 100644
--- a/src/com/android/settings/users/UserDetailsSettings.java
+++ b/src/com/android/settings/users/UserDetailsSettings.java
@@ -309,7 +309,7 @@
             // Update the guest's restrictions, if there is a guest
             // TODO: Maybe setDefaultGuestRestrictions() can internally just set the restrictions
             // on any existing guest rather than do it here with multiple Binder calls.
-            List<UserInfo> users = mUserManager.getUsers(true);
+            List<UserInfo> users = mUserManager.getAliveUsers();
             for (UserInfo user : users) {
                 if (user.isGuest()) {
                     UserHandle userHandle = UserHandle.of(user.id);
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 9669190..8bfac91 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -820,7 +820,7 @@
         if (context == null) {
             return;
         }
-        final List<UserInfo> users = mUserManager.getUsers(true);
+        final List<UserInfo> users = mUserManager.getAliveUsers();
 
         final ArrayList<Integer> missingIcons = new ArrayList<>();
         final ArrayList<UserPreference> userPreferences = new ArrayList<>();
diff --git a/src/com/android/settings/utils/ContentCaptureUtils.java b/src/com/android/settings/utils/ContentCaptureUtils.java
index a92651f..b01749f 100644
--- a/src/com/android/settings/utils/ContentCaptureUtils.java
+++ b/src/com/android/settings/utils/ContentCaptureUtils.java
@@ -45,7 +45,7 @@
 
     public static boolean isFeatureAvailable() {
         // We cannot look for ContentCaptureManager, because it's not available if the service
-        // didn't whitelist Settings
+        // didn't allowlist Settings
         IBinder service = ServiceManager.checkService(Context.CONTENT_CAPTURE_MANAGER_SERVICE);
         return service != null;
     }
diff --git a/src/com/android/settings/vpn2/AppDialogFragment.java b/src/com/android/settings/vpn2/AppDialogFragment.java
index ea9e546..9c73784 100644
--- a/src/com/android/settings/vpn2/AppDialogFragment.java
+++ b/src/com/android/settings/vpn2/AppDialogFragment.java
@@ -167,7 +167,7 @@
         try {
             if (mPackageInfo.packageName.equals(VpnUtils.getConnectedPackage(mService, userId))) {
                 mService.setAlwaysOnVpnPackage(userId, null, /* lockdownEnabled */ false,
-                        /* lockdownWhitelist */ null);
+                        /* lockdownAllowlist */ null);
                 mService.prepareVpn(mPackageInfo.packageName, VpnConfig.LEGACY_VPN, userId);
             }
         } catch (RemoteException e) {
diff --git a/src/com/android/settings/vpn2/AppManagementFragment.java b/src/com/android/settings/vpn2/AppManagementFragment.java
index 8280a3d..d2cbcd5 100644
--- a/src/com/android/settings/vpn2/AppManagementFragment.java
+++ b/src/com/android/settings/vpn2/AppManagementFragment.java
@@ -231,7 +231,7 @@
 
     private boolean setAlwaysOnVpn(boolean isEnabled, boolean isLockdown) {
         return mConnectivityManager.setAlwaysOnVpnPackageForUser(mUserId,
-                isEnabled ? mPackageName : null, isLockdown, /* lockdownWhitelist */ null);
+                isEnabled ? mPackageName : null, isLockdown, /* lockdownAllowlist */ null);
     }
 
     private void updateUI() {
diff --git a/src/com/android/settings/vpn2/ConfigDialog.java b/src/com/android/settings/vpn2/ConfigDialog.java
index 12d91ec..26c1565 100644
--- a/src/com/android/settings/vpn2/ConfigDialog.java
+++ b/src/com/android/settings/vpn2/ConfigDialog.java
@@ -348,14 +348,14 @@
         mView.findViewById(R.id.vpn_proxy_fields).setVisibility(visible);
     }
 
-    private boolean hasAdvancedOptionsEnabled() {
+    private boolean isAdvancedOptionsEnabled() {
         return mSearchDomains.getText().length() > 0 || mDnsServers.getText().length() > 0 ||
                     mRoutes.getText().length() > 0 || mProxyHost.getText().length() > 0
                     || mProxyPort.getText().length() > 0;
     }
 
     private void configureAdvancedOptionsVisibility() {
-        if (mShowOptions.isChecked() || hasAdvancedOptionsEnabled()) {
+        if (mShowOptions.isChecked() || isAdvancedOptionsEnabled()) {
             mView.findViewById(R.id.options).setVisibility(View.VISIBLE);
             mShowOptions.setVisibility(View.GONE);
 
diff --git a/src/com/android/settings/vpn2/ConfigDialogFragment.java b/src/com/android/settings/vpn2/ConfigDialogFragment.java
index 57ba8bf..d6b92d7 100644
--- a/src/com/android/settings/vpn2/ConfigDialogFragment.java
+++ b/src/com/android/settings/vpn2/ConfigDialogFragment.java
@@ -180,7 +180,7 @@
 
             final ConnectivityManager conn = ConnectivityManager.from(mContext);
             conn.setAlwaysOnVpnPackageForUser(UserHandle.myUserId(), null,
-                    /* lockdownEnabled */ false, /* lockdownWhitelist */ null);
+                    /* lockdownEnabled */ false, /* lockdownAllowlist */ null);
             VpnUtils.setLockdownVpn(mContext, profile.key);
         } else {
             // update only if lockdown vpn has been changed
diff --git a/src/com/android/settings/wallpaper/StyleSuggestionActivityBase.java b/src/com/android/settings/wallpaper/StyleSuggestionActivityBase.java
index abbf3dc..f6b5a84 100644
--- a/src/com/android/settings/wallpaper/StyleSuggestionActivityBase.java
+++ b/src/com/android/settings/wallpaper/StyleSuggestionActivityBase.java
@@ -38,7 +38,7 @@
         super.onCreate(savedInstanceState);
         final PackageManager pm = getPackageManager();
         final Intent intent = new Intent()
-                .setComponent(new WallpaperPreferenceController(this, "dummy key")
+                .setComponent(new WallpaperPreferenceController(this, "unused key")
                         .getComponentName())
                 .addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
 
diff --git a/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java b/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java
index a5cc414..999e92c 100644
--- a/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java
+++ b/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java
@@ -69,7 +69,7 @@
                         boolean enabled) {
                     final List<SearchIndexableRaw> result = new ArrayList<>();
                     WallpaperPreferenceController controller =
-                            new WallpaperPreferenceController(context, "dummy key");
+                            new WallpaperPreferenceController(context, "unused key");
                     SearchIndexableRaw data = new SearchIndexableRaw(context);
                     data.title = controller.getTitle();
                     data.screenTitle = data.title;
diff --git a/src/com/android/settings/widget/MatchParentShrinkingLinearLayout.java b/src/com/android/settings/widget/MatchParentShrinkingLinearLayout.java
index c7d4d92..271378a 100644
--- a/src/com/android/settings/widget/MatchParentShrinkingLinearLayout.java
+++ b/src/com/android/settings/widget/MatchParentShrinkingLinearLayout.java
@@ -40,7 +40,7 @@
  * A LinearLayout with a twist: if the contents don't fit, it takes space away from the
  * MATCH_PARENT children, instead of taking it from the weighted ones.
  *
- * TODO: Remove once we redesign the ChooseLockPattern screen with a sane layout.
+ * TODO: Remove once we redesign the ChooseLockPattern screen with a rational layout.
  */
 public class MatchParentShrinkingLinearLayout extends ViewGroup {
     /** @hide */
diff --git a/src/com/android/settings/widget/MasterCheckBoxPreference.java b/src/com/android/settings/widget/PrimaryCheckBoxPreference.java
similarity index 84%
rename from src/com/android/settings/widget/MasterCheckBoxPreference.java
rename to src/com/android/settings/widget/PrimaryCheckBoxPreference.java
index 48e09c9..a784d5d 100644
--- a/src/com/android/settings/widget/MasterCheckBoxPreference.java
+++ b/src/com/android/settings/widget/PrimaryCheckBoxPreference.java
@@ -31,32 +31,32 @@
  * A custom preference that provides inline checkbox. It has a mandatory field for title, and
  * optional fields for icon and sub-text.
  */
-public class MasterCheckBoxPreference extends TwoTargetPreference {
+public class PrimaryCheckBoxPreference extends TwoTargetPreference {
 
     private CheckBox mCheckBox;
     private boolean mChecked;
     private boolean mEnableCheckBox = true;
 
-    public MasterCheckBoxPreference(Context context, AttributeSet attrs,
+    public PrimaryCheckBoxPreference(Context context, AttributeSet attrs,
             int defStyleAttr, int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
     }
 
-    public MasterCheckBoxPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+    public PrimaryCheckBoxPreference(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
     }
 
-    public MasterCheckBoxPreference(Context context, AttributeSet attrs) {
+    public PrimaryCheckBoxPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
     }
 
-    public MasterCheckBoxPreference(Context context) {
+    public PrimaryCheckBoxPreference(Context context) {
         super(context);
     }
 
     @Override
     protected int getSecondTargetResId() {
-        return R.layout.preference_widget_master_checkbox;
+        return R.layout.preference_widget_primary_checkbox;
     }
 
     @Override
@@ -98,6 +98,10 @@
         return mCheckBox != null && mChecked;
     }
 
+    /**
+     * Set the check status of checkbox
+     * @param checked
+     */
     public void setChecked(boolean checked) {
         mChecked = checked;
         if (mCheckBox != null) {
@@ -105,6 +109,10 @@
         }
     }
 
+    /**
+     * Set the enabled status of CheckBox
+     * @param enabled
+     */
     public void setCheckBoxEnabled(boolean enabled) {
         mEnableCheckBox = enabled;
         if (mCheckBox != null) {
diff --git a/src/com/android/settings/widget/MasterSwitchController.java b/src/com/android/settings/widget/PrimarySwitchController.java
similarity index 89%
rename from src/com/android/settings/widget/MasterSwitchController.java
rename to src/com/android/settings/widget/PrimarySwitchController.java
index 92e3884..3718a89 100644
--- a/src/com/android/settings/widget/MasterSwitchController.java
+++ b/src/com/android/settings/widget/PrimarySwitchController.java
@@ -23,17 +23,17 @@
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
-/*
- * The switch controller that is used to update the switch widget in the MasterSwitchPreference
+/**
+ * The switch controller that is used to update the switch widget in the PrimarySwitchPreference
  * layout.
  */
-public class MasterSwitchController extends SwitchWidgetController implements
-    Preference.OnPreferenceChangeListener {
+public class PrimarySwitchController extends SwitchWidgetController implements
+        Preference.OnPreferenceChangeListener {
 
-    private final MasterSwitchPreference mPreference;
+    private final PrimarySwitchPreference mPreference;
     private final MetricsFeatureProvider mMetricsFeatureProvider;
 
-    public MasterSwitchController(MasterSwitchPreference preference) {
+    public PrimarySwitchController(PrimarySwitchPreference preference) {
         mPreference = preference;
         mMetricsFeatureProvider = FeatureFactory.getFactory(preference.getContext())
                 .getMetricsFeatureProvider();
diff --git a/src/com/android/settings/widget/MasterSwitchPreference.java b/src/com/android/settings/widget/PrimarySwitchPreference.java
similarity index 80%
rename from src/com/android/settings/widget/MasterSwitchPreference.java
rename to src/com/android/settings/widget/PrimarySwitchPreference.java
index 9fe077e..b70ae4e 100644
--- a/src/com/android/settings/widget/MasterSwitchPreference.java
+++ b/src/com/android/settings/widget/PrimarySwitchPreference.java
@@ -23,6 +23,8 @@
 import android.view.View.OnClickListener;
 import android.widget.Switch;
 
+import androidx.annotation.Keep;
+import androidx.annotation.Nullable;
 import androidx.preference.PreferenceViewHolder;
 
 import com.android.settings.R;
@@ -33,33 +35,33 @@
  * A custom preference that provides inline switch toggle. It has a mandatory field for title, and
  * optional fields for icon and sub-text. And it can be restricted by admin state.
  */
-public class MasterSwitchPreference extends RestrictedPreference {
+public class PrimarySwitchPreference extends RestrictedPreference {
 
     private Switch mSwitch;
     private boolean mChecked;
     private boolean mCheckedSet;
     private boolean mEnableSwitch = true;
 
-    public MasterSwitchPreference(Context context, AttributeSet attrs,
+    public PrimarySwitchPreference(Context context, AttributeSet attrs,
             int defStyleAttr, int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
     }
 
-    public MasterSwitchPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+    public PrimarySwitchPreference(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
     }
 
-    public MasterSwitchPreference(Context context, AttributeSet attrs) {
+    public PrimarySwitchPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
     }
 
-    public MasterSwitchPreference(Context context) {
+    public PrimarySwitchPreference(Context context) {
         super(context);
     }
 
     @Override
     protected int getSecondTargetResId() {
-        return R.layout.restricted_preference_widget_master_switch;
+        return R.layout.restricted_preference_widget_primary_switch;
     }
 
     @Override
@@ -101,6 +103,21 @@
         return mSwitch != null && mChecked;
     }
 
+    /**
+     * Used to validate the state of mChecked and mCheckedSet when testing, without requiring
+     * that a ViewHolder be bound to the object.
+     */
+    @Keep
+    @Nullable
+    public Boolean getCheckedState() {
+        return mCheckedSet ? mChecked : null;
+    }
+
+    /**
+     * Set the checked status to be {@code checked}.
+     *
+     * @param checked The new checked status
+     */
     public void setChecked(boolean checked) {
         // Always set checked the first time; don't assume the field's default of false.
         final boolean changed = mChecked != checked;
@@ -113,6 +130,11 @@
         }
     }
 
+    /**
+     * Set the Switch to be the status of {@code enabled}.
+     *
+     * @param enabled The new enabled status
+     */
     public void setSwitchEnabled(boolean enabled) {
         mEnableSwitch = enabled;
         if (mSwitch != null) {
diff --git a/src/com/android/settings/widget/SeekBarPreference.java b/src/com/android/settings/widget/SeekBarPreference.java
index bdd1ba9..ac28382 100644
--- a/src/com/android/settings/widget/SeekBarPreference.java
+++ b/src/com/android/settings/widget/SeekBarPreference.java
@@ -51,6 +51,7 @@
     private boolean mShouldBlink;
     private int mAccessibilityRangeInfoType = AccessibilityNodeInfo.RangeInfo.RANGE_TYPE_INT;
     private CharSequence mSeekBarContentDescription;
+    private CharSequence mSeekBarStateDescription;
 
     public SeekBarPreference(
             Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
@@ -124,6 +125,9 @@
         } else if (!TextUtils.isEmpty(title)) {
             mSeekBar.setContentDescription(title);
         }
+        if (!TextUtils.isEmpty(mSeekBarStateDescription)) {
+            mSeekBar.setStateDescription(mSeekBarStateDescription);
+        }
         if (mSeekBar instanceof DefaultIndicatorSeekBar) {
             ((DefaultIndicatorSeekBar) mSeekBar).setDefaultProgress(mDefaultProgress);
         }
@@ -304,6 +308,18 @@
         }
     }
 
+    /**
+     * Specify the state description for this seek bar represents.
+     *
+     * @param stateDescription the state description of seek bar
+     */
+    public void setSeekBarStateDescription(CharSequence stateDescription) {
+        mSeekBarStateDescription = stateDescription;
+        if (mSeekBar != null) {
+            mSeekBar.setStateDescription(stateDescription);
+        }
+    }
+
     @Override
     protected Parcelable onSaveInstanceState() {
         /*
diff --git a/src/com/android/settings/wifi/AddNetworkFragment.java b/src/com/android/settings/wifi/AddNetworkFragment.java
index 2f0ecad..7b86936 100644
--- a/src/com/android/settings/wifi/AddNetworkFragment.java
+++ b/src/com/android/settings/wifi/AddNetworkFragment.java
@@ -32,9 +32,13 @@
 
 import com.android.settings.R;
 import com.android.settings.core.InstrumentedFragment;
+import com.android.settings.wifi.dpp.WifiDppQrCodeScannerFragment;
 import com.android.settings.wifi.dpp.WifiDppUtils;
 
-public class AddNetworkFragment extends InstrumentedFragment implements WifiConfigUiBase,
+/**
+ * A full screen UI component for users to edit and add a Wi-Fi network.
+ */
+public class AddNetworkFragment extends InstrumentedFragment implements WifiConfigUiBase2,
         View.OnClickListener {
 
     final static String WIFI_CONFIG_KEY = "wifi_config_key";
@@ -46,7 +50,7 @@
 
     private static final int REQUEST_CODE_WIFI_DPP_ENROLLEE_QR_CODE_SCANNER = 0;
 
-    private WifiConfigController mUIController;
+    private WifiConfigController2 mUIController;
     private Button mSubmitBtn;
     private Button mCancelBtn;
 
@@ -76,7 +80,7 @@
         mSubmitBtn.setOnClickListener(this);
         mCancelBtn.setOnClickListener(this);
         ssidScannerButton.setOnClickListener(this);
-        mUIController = new WifiConfigController(this, rootView, null, getMode());
+        mUIController = new WifiConfigController2(this, rootView, null, getMode());
 
         return rootView;
     }
@@ -113,18 +117,18 @@
             }
 
             final WifiConfiguration config = data.getParcelableExtra(
-                    WifiDialogActivity.KEY_WIFI_CONFIGURATION);
+                    WifiDppQrCodeScannerFragment.KEY_WIFI_CONFIGURATION);
             successfullyFinish(config);
         }
     }
 
     @Override
     public int getMode() {
-        return WifiConfigUiBase.MODE_CONNECT;
+        return WifiConfigUiBase2.MODE_CONNECT;
     }
 
     @Override
-    public WifiConfigController getController() {
+    public WifiConfigController2 getController() {
         return mUIController;
     }
 
diff --git a/src/com/android/settings/wifi/CaptivePortalNetworkCallback.java b/src/com/android/settings/wifi/CaptivePortalNetworkCallback.java
deleted file mode 100644
index 630476f..0000000
--- a/src/com/android/settings/wifi/CaptivePortalNetworkCallback.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.wifi;
-
-import android.net.ConnectivityManager.NetworkCallback;
-import android.net.Network;
-import android.net.NetworkCapabilities;
-
-import com.android.internal.util.Preconditions;
-
-/** Listens for changes to NetworkCapabilities to update the ConnectedAccessPointPreference. */
-class CaptivePortalNetworkCallback extends NetworkCallback {
-
-    private final ConnectedAccessPointPreference mConnectedApPreference;
-    private final Network mNetwork;
-
-    private boolean mIsCaptivePortal;
-
-    CaptivePortalNetworkCallback(
-            Network network, ConnectedAccessPointPreference connectedApPreference) {
-        mNetwork = Preconditions.checkNotNull(network);
-        mConnectedApPreference = Preconditions.checkNotNull(connectedApPreference);
-    }
-
-    @Override
-    public final void onLost(Network network) {
-        if (mNetwork.equals(network)) {
-            setIsCaptivePortal(false);
-        }
-    }
-
-    @Override
-    public final void onCapabilitiesChanged(Network network,
-            NetworkCapabilities networkCapabilities) {
-        if (mNetwork.equals(network)) {
-            boolean isCaptivePortal = WifiUtils.canSignIntoNetwork(networkCapabilities);
-            setIsCaptivePortal(isCaptivePortal);
-            mConnectedApPreference.setCaptivePortal(isCaptivePortal);
-        }
-    }
-
-    /**
-     * Called when captive portal capability changes for the current network. Default implementation
-     * is a no-op. Use {@link CaptivePortalNetworkCallback#isCaptivePortal()} to read new
-     * capability.
-     */
-    public void onCaptivePortalCapabilityChanged() {}
-
-    private void setIsCaptivePortal(boolean isCaptivePortal) {
-        if (isCaptivePortal == mIsCaptivePortal) {
-            return;
-        }
-        mIsCaptivePortal = isCaptivePortal;
-        onCaptivePortalCapabilityChanged();
-    }
-
-    /**
-     * Returns true if the supplied network and preference are not null and are the same as the
-     * originally supplied values.
-     */
-    public final boolean isSameNetworkAndPreference(
-            Network network, ConnectedAccessPointPreference connectedApPreference) {
-        return mNetwork.equals(network) && mConnectedApPreference == connectedApPreference;
-    }
-
-    /**
-     * Returns true if the most recent update to the NetworkCapabilities indicates a captive portal
-     * network and the Network was not lost in the interim.
-     */
-    public final boolean isCaptivePortal() {
-        return mIsCaptivePortal;
-    }
-
-    /** Returns the currently associated network. */
-    public final Network getNetwork() {
-        return mNetwork;
-    }
-}
diff --git a/src/com/android/settings/wifi/ConfigureAccessPointFragment.java b/src/com/android/settings/wifi/ConfigureAccessPointFragment.java
deleted file mode 100644
index 508d549..0000000
--- a/src/com/android/settings/wifi/ConfigureAccessPointFragment.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi;
-
-import android.app.ActionBar;
-import android.app.Activity;
-import android.app.settings.SettingsEnums;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-
-import androidx.annotation.VisibleForTesting;
-
-import com.android.settings.R;
-import com.android.settings.core.InstrumentedFragment;
-import com.android.settingslib.wifi.AccessPoint;
-
-/**
- * Detail page for configuring Wi-Fi network.
- *
- * The AccessPoint should be saved to the argument when launching this class in order to properly
- * render this page.
- *
- * Migrating from Wi-Fi SettingsLib to to WifiTrackerLib, this object will be removed in the near
- * future, please develop in {@link ConfigureWifiEntryFragment}.
- */
-public class ConfigureAccessPointFragment extends InstrumentedFragment implements WifiConfigUiBase {
-
-    public static final String NETWORK_CONFIG_KEY = "network_config_key";
-
-    private static final int SUBMIT_BUTTON_ID = android.R.id.button1;
-    private static final int CANCEL_BUTTON_ID = android.R.id.button2;
-
-    private WifiConfigController mUiController;
-    private Button mSubmitBtn;
-    private Button mCancelBtn;
-    private AccessPoint mAccessPoint;
-
-    @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-        mAccessPoint = new AccessPoint(context, getArguments());
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return SettingsEnums.SETTINGS_WIFI_CONFIGURE_NETWORK;
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-            Bundle savedInstanceState) {
-        final View rootView = inflater.inflate(R.layout.wifi_add_network_view,
-                container, false /* attachToRoot */);
-
-        final Button neutral = rootView.findViewById(android.R.id.button3);
-        if (neutral != null) {
-            neutral.setVisibility(View.GONE);
-        }
-
-        mSubmitBtn = rootView.findViewById(SUBMIT_BUTTON_ID);
-        mCancelBtn = rootView.findViewById(CANCEL_BUTTON_ID);
-        mSubmitBtn.setOnClickListener(view -> handleSubmitAction());
-        mCancelBtn.setOnClickListener(view -> handleCancelAction());
-
-        mUiController = new WifiConfigController(this, rootView, mAccessPoint,
-                getMode(), false /* requestFocus */);
-
-        /**
-         * For this add AccessPoint UI, need to remove the Home button, so set related feature as
-         * false.
-         */
-        final ActionBar actionBar = getActivity().getActionBar();
-        if (actionBar != null) {
-            actionBar.setDisplayHomeAsUpEnabled(false);
-            actionBar.setHomeButtonEnabled(false);
-            actionBar.setDisplayShowHomeEnabled(false);
-        }
-
-        return rootView;
-    }
-
-    @Override
-    public void onViewStateRestored(Bundle savedInstanceState) {
-        super.onViewStateRestored(savedInstanceState);
-        mUiController.updatePassword();
-    }
-
-    @Override
-    public int getMode() {
-        return WifiConfigUiBase.MODE_CONNECT;
-    }
-
-    @Override
-    public WifiConfigController getController() {
-        return mUiController;
-    }
-
-    @Override
-    public void dispatchSubmit() {
-        handleSubmitAction();
-    }
-
-    @Override
-    public void setTitle(int id) {
-        getActivity().setTitle(id);
-    }
-
-    @Override
-    public void setTitle(CharSequence title) {
-        getActivity().setTitle(title);
-    }
-
-    @Override
-    public void setSubmitButton(CharSequence text) {
-        mSubmitBtn.setText(text);
-    }
-
-    @Override
-    public void setCancelButton(CharSequence text) {
-        mCancelBtn.setText(text);
-    }
-
-    @Override
-    public void setForgetButton(CharSequence text) {
-        // AddNetwork doesn't need forget button.
-    }
-
-    @Override
-    public Button getSubmitButton() {
-        return mSubmitBtn;
-    }
-
-    @Override
-    public Button getCancelButton() {
-        return mCancelBtn;
-    }
-
-    @Override
-    public Button getForgetButton() {
-        // AddNetwork doesn't need forget button.
-        return null;
-    }
-
-    @VisibleForTesting
-    void handleSubmitAction() {
-        final Intent intent = new Intent();
-        final Activity activity = getActivity();
-        intent.putExtra(NETWORK_CONFIG_KEY, mUiController.getConfig());
-        activity.setResult(Activity.RESULT_OK, intent);
-        activity.finish();
-    }
-
-    @VisibleForTesting
-    void handleCancelAction() {
-        final Activity activity = getActivity();
-        activity.setResult(Activity.RESULT_CANCELED);
-        activity.finish();
-    }
-}
diff --git a/src/com/android/settings/wifi/ConnectedAccessPointPreference.java b/src/com/android/settings/wifi/ConnectedAccessPointPreference.java
deleted file mode 100644
index e904602..0000000
--- a/src/com/android/settings/wifi/ConnectedAccessPointPreference.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi;
-
-import android.content.Context;
-import android.view.View;
-
-import androidx.annotation.DrawableRes;
-import androidx.fragment.app.Fragment;
-import androidx.preference.PreferenceViewHolder;
-
-import com.android.settings.R;
-import com.android.settingslib.wifi.AccessPoint;
-
-/**
- * An AP preference for the currently connected AP.
- *
- * Migrating from Wi-Fi SettingsLib to to WifiTrackerLib, this object will be removed in the near
- * future, please develop in {@link ConnectedWifiEntryPreference}.
- */
-public class ConnectedAccessPointPreference extends LongPressAccessPointPreference implements
-        View.OnClickListener {
-
-    private OnGearClickListener mOnGearClickListener;
-    private boolean mIsCaptivePortal;
-
-    public ConnectedAccessPointPreference(AccessPoint accessPoint, Context context,
-            UserBadgeCache cache, @DrawableRes int iconResId, boolean forSavedNetworks,
-            Fragment fragment) {
-        super(accessPoint, context, cache, forSavedNetworks, iconResId, fragment);
-    }
-
-    @Override
-    protected int getWidgetLayoutResourceId() {
-        return R.layout.preference_widget_gear_optional_background;
-    }
-
-    @Override
-    public void refresh() {
-        super.refresh();
-
-        setShowDivider(mIsCaptivePortal);
-        if (mIsCaptivePortal) {
-            setSummary(R.string.wifi_tap_to_sign_in);
-        }
-    }
-
-    public void setOnGearClickListener(OnGearClickListener l) {
-        mOnGearClickListener = l;
-        notifyChanged();
-    }
-
-    @Override
-    public void onBindViewHolder(PreferenceViewHolder holder) {
-        super.onBindViewHolder(holder);
-
-        final View gear = holder.findViewById(R.id.settings_button);
-        gear.setOnClickListener(this);
-
-        final View gearNoBg = holder.findViewById(R.id.settings_button_no_background);
-        gearNoBg.setVisibility(mIsCaptivePortal ? View.INVISIBLE : View.VISIBLE);
-        gear.setVisibility(mIsCaptivePortal ? View.VISIBLE : View.INVISIBLE);
-    }
-
-    @Override
-    public void onClick(View v) {
-        if (v.getId() == R.id.settings_button) {
-            if (mOnGearClickListener != null) {
-                mOnGearClickListener.onGearClick(this);
-            }
-        }
-    }
-
-    public void setCaptivePortal(boolean isCaptivePortal) {
-        if (mIsCaptivePortal != isCaptivePortal) {
-            mIsCaptivePortal = isCaptivePortal;
-            refresh();
-        }
-    }
-
-    public interface OnGearClickListener {
-        void onGearClick(ConnectedAccessPointPreference p);
-    }
-
-}
diff --git a/src/com/android/settings/wifi/LongPressAccessPointPreference.java b/src/com/android/settings/wifi/LongPressAccessPointPreference.java
deleted file mode 100644
index 1590325..0000000
--- a/src/com/android/settings/wifi/LongPressAccessPointPreference.java
+++ /dev/null
@@ -1,51 +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.wifi;
-
-import android.content.Context;
-
-import androidx.fragment.app.Fragment;
-import androidx.preference.PreferenceViewHolder;
-
-import com.android.settingslib.wifi.AccessPoint;
-import com.android.settingslib.wifi.AccessPointPreference;
-
-/**
- * An AP preference for the currently connected AP.
- *
- * Migrating from Wi-Fi SettingsLib to to WifiTrackerLib, this object will be removed in the near
- * future, please develop in {@link com.android.settingslib.wifi.LongPressWifiEntryPreference}.
- */
-public class LongPressAccessPointPreference extends AccessPointPreference {
-
-    private final Fragment mFragment;
-
-    public LongPressAccessPointPreference(AccessPoint accessPoint, Context context,
-            UserBadgeCache cache, boolean forSavedNetworks, int iconResId, Fragment fragment) {
-        super(accessPoint, context, cache, iconResId, forSavedNetworks);
-        mFragment = fragment;
-    }
-
-    @Override
-    public void onBindViewHolder(final PreferenceViewHolder view) {
-        super.onBindViewHolder(view);
-        if (mFragment != null) {
-            view.itemView.setOnCreateContextMenuListener(mFragment);
-            view.itemView.setTag(this);
-            view.itemView.setLongClickable(true);
-        }
-    }
-}
diff --git a/src/com/android/settings/wifi/NetworkRequestDialogActivity.java b/src/com/android/settings/wifi/NetworkRequestDialogActivity.java
index 90a0de3..b160d90 100644
--- a/src/com/android/settings/wifi/NetworkRequestDialogActivity.java
+++ b/src/com/android/settings/wifi/NetworkRequestDialogActivity.java
@@ -31,6 +31,7 @@
 import android.widget.Toast;
 
 import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 import androidx.fragment.app.FragmentActivity;
 
 import com.android.settings.R;
@@ -57,12 +58,12 @@
     final static String EXTRA_IS_SPECIFIED_SSID =
         "com.android.settings.wifi.extra.REQUEST_IS_FOR_SINGLE_NETWORK";
 
-    private NetworkRequestDialogBaseFragment mDialogFragment;
+    @VisibleForTesting NetworkRequestDialogBaseFragment mDialogFragment;
     private NetworkRequestUserSelectionCallback mUserSelectionCallback;
     private boolean mIsSpecifiedSsid;
     private boolean mShowingErrorDialog;
     private WifiConfiguration mMatchedConfig;
-    private ProgressDialog mProgressDialog;
+    @VisibleForTesting ProgressDialog mProgressDialog;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -193,8 +194,7 @@
         if (mIsSpecifiedSsid) {
             // Prevent from throwing same dialog, because onMatch() will be called many times.
             if (mMatchedConfig == null) {
-                mMatchedConfig = WifiUtils.getWifiConfig(
-                    null /* accesspoint */, scanResults.get(0), null /* password */);
+                mMatchedConfig = WifiUtils.getWifiConfig(null /* wifiEntry */, scanResults.get(0));
                 showSingleSsidRequestDialog(
                         WifiInfo.sanitizeSsid(mMatchedConfig.SSID), false /* isTryAgain */);
             }
diff --git a/src/com/android/settings/wifi/NetworkRequestDialogFragment.java b/src/com/android/settings/wifi/NetworkRequestDialogFragment.java
index f179df0..887f09f 100644
--- a/src/com/android/settings/wifi/NetworkRequestDialogFragment.java
+++ b/src/com/android/settings/wifi/NetworkRequestDialogFragment.java
@@ -16,15 +16,28 @@
 
 package com.android.settings.wifi;
 
+import static com.android.settings.wifi.WifiUtils.getWifiEntrySecurity;
+
+import static java.util.stream.Collectors.toList;
+
 import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.graphics.drawable.Drawable;
+import android.net.ConnectivityManager;
+import android.net.NetworkScoreManager;
 import android.net.wifi.ScanResult;
 import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiManager;
 import android.net.wifi.WifiManager.NetworkRequestMatchCallback;
 import android.net.wifi.WifiManager.NetworkRequestUserSelectionCallback;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.Looper;
+import android.os.Process;
+import android.os.SimpleClock;
+import android.os.SystemClock;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -42,11 +55,11 @@
 
 import com.android.settings.R;
 import com.android.settingslib.Utils;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-import com.android.settingslib.wifi.AccessPoint;
-import com.android.settingslib.wifi.WifiTracker;
-import com.android.settingslib.wifi.WifiTrackerFactory;
+import com.android.wifitrackerlib.WifiEntry;
+import com.android.wifitrackerlib.WifiPickerTracker;
 
+import java.time.Clock;
+import java.time.ZoneOffset;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -56,7 +69,9 @@
  * happens, {@link NetworkRequestErrorDialogFragment} will be called to display error message.
  */
 public class NetworkRequestDialogFragment extends NetworkRequestDialogBaseFragment implements
-        DialogInterface.OnClickListener{
+        DialogInterface.OnClickListener, WifiPickerTracker.WifiPickerTrackerCallback {
+
+    private static final String TAG = "NetworkRequestDialogFragment";
 
     /**
      * Spec defines there should be 5 wifi ap on the list at most or just show all if {@code
@@ -65,18 +80,52 @@
     private static final int MAX_NUMBER_LIST_ITEM = 5;
     private boolean mShowLimitedItem = true;
 
-    private List<AccessPoint> mAccessPointList;
-    @VisibleForTesting
-    FilterWifiTracker mFilterWifiTracker;
-    private AccessPointAdapter mDialogAdapter;
+    @VisibleForTesting List<WifiEntry> mFilteredWifiEntries = new ArrayList<>();
+    @VisibleForTesting List<ScanResult> mMatchedScanResults = new ArrayList<>();
+    private WifiEntryAdapter mDialogAdapter;
     private NetworkRequestUserSelectionCallback mUserSelectionCallback;
 
+    @VisibleForTesting WifiPickerTracker mWifiPickerTracker;
+    // Worker thread used for WifiPickerTracker work.
+    private HandlerThread mWorkerThread;
+    // Max age of tracked WifiEntries.
+    private static final long MAX_SCAN_AGE_MILLIS = 15_000;
+    // Interval between initiating WifiPickerTracker scans.
+    private static final long SCAN_INTERVAL_MILLIS = 10_000;
+
     public static NetworkRequestDialogFragment newInstance() {
         NetworkRequestDialogFragment dialogFragment = new NetworkRequestDialogFragment();
         return dialogFragment;
     }
 
     @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mWorkerThread = new HandlerThread(
+                TAG + "{" + Integer.toHexString(System.identityHashCode(this)) + "}",
+                Process.THREAD_PRIORITY_BACKGROUND);
+        mWorkerThread.start();
+        final Clock elapsedRealtimeClock = new SimpleClock(ZoneOffset.UTC) {
+            @Override
+            public long millis() {
+                return SystemClock.elapsedRealtime();
+            }
+        };
+        final Context context = getContext();
+        mWifiPickerTracker = new WifiPickerTracker(getSettingsLifecycle(), context,
+                context.getSystemService(WifiManager.class),
+                context.getSystemService(ConnectivityManager.class),
+                context.getSystemService(NetworkScoreManager.class),
+                new Handler(Looper.getMainLooper()),
+                mWorkerThread.getThreadHandler(),
+                elapsedRealtimeClock,
+                MAX_SCAN_AGE_MILLIS,
+                SCAN_INTERVAL_MILLIS,
+                this);
+    }
+
+    @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         final Context context = getContext();
 
@@ -94,8 +143,8 @@
         progressBar.setVisibility(View.VISIBLE);
 
         // Prepares adapter.
-        mDialogAdapter = new AccessPointAdapter(context,
-                R.layout.preference_access_point, getAccessPointList());
+        mDialogAdapter = new WifiEntryAdapter(context,
+                R.layout.preference_access_point, mFilteredWifiEntries);
 
         final AlertDialog.Builder builder = new AlertDialog.Builder(context)
                 .setCustomTitle(customTitle)
@@ -107,9 +156,8 @@
 
         // Clicking list item is to connect wifi ap.
         final AlertDialog dialog = builder.create();
-        dialog.getListView()
-                .setOnItemClickListener(
-                        (parent, view, position, id) -> this.onClick(dialog, position));
+        dialog.getListView().setOnItemClickListener(
+                (parent, view, position, id) -> this.onClick(dialog, position));
 
         // Don't dismiss dialog when touching outside. User reports it is easy to touch outside.
         // This causes dialog to close.
@@ -121,76 +169,49 @@
             neutralBtn.setVisibility(View.GONE);
             neutralBtn.setOnClickListener(v -> {
                 mShowLimitedItem = false;
-                renewAccessPointList(null /* scanResults */);
-                notifyAdapterRefresh();
+                updateWifiEntries();
+                updateUi();
                 neutralBtn.setVisibility(View.GONE);
             });
         });
         return dialog;
     }
 
-    @NonNull
-    List<AccessPoint> getAccessPointList() {
-        // Initials list for adapter, in case of display crashing.
-        if (mAccessPointList == null) {
-            mAccessPointList = new ArrayList<>();
-        }
-        return mAccessPointList;
-    }
-
     private BaseAdapter getDialogAdapter() {
         return mDialogAdapter;
     }
 
     @Override
     public void onClick(DialogInterface dialog, int which) {
-        final List<AccessPoint> accessPointList = getAccessPointList();
-        if (accessPointList.size() == 0) {
+        if (mFilteredWifiEntries.size() == 0 || which >= mFilteredWifiEntries.size()) {
             return;  // Invalid values.
         }
         if (mUserSelectionCallback == null) {
             return; // Callback is missing or not ready.
         }
 
-        if (which < accessPointList.size()) {
-            final AccessPoint selectedAccessPoint = accessPointList.get(which);
-            WifiConfiguration wifiConfig = selectedAccessPoint.getConfig();
-            if (wifiConfig == null) {
-                wifiConfig = WifiUtils.getWifiConfig(selectedAccessPoint, /* scanResult */
-                        null, /* password */ null);
-            }
-
-            if (wifiConfig != null) {
-                mUserSelectionCallback.select(wifiConfig);
-            }
+        final WifiEntry wifiEntry = mFilteredWifiEntries.get(which);
+        WifiConfiguration config = wifiEntry.getWifiConfiguration();
+        if (config == null) {
+            config = WifiUtils.getWifiConfig(wifiEntry, null /* scanResult */);
         }
+        mUserSelectionCallback.select(config);
     }
 
     @Override
     public void onCancel(@NonNull DialogInterface dialog) {
         super.onCancel(dialog);
+
         if (mUserSelectionCallback != null) {
             mUserSelectionCallback.reject();
         }
     }
 
     @Override
-    public void onPause() {
-        super.onPause();
-
-        if (mFilterWifiTracker != null) {
-            mFilterWifiTracker.onPause();
-        }
-    }
-
-    @Override
     public void onDestroy() {
-        super.onDestroy();
+        mWorkerThread.quit();
 
-        if (mFilterWifiTracker != null) {
-            mFilterWifiTracker.onDestroy();
-            mFilterWifiTracker = null;
-        }
+        super.onDestroy();
     }
 
     private void showAllButton() {
@@ -217,22 +238,65 @@
         }
     }
 
+    /** Called when the state of Wifi has changed. */
     @Override
-    public void onResume() {
-        super.onResume();
-
-        if (mFilterWifiTracker == null) {
-            mFilterWifiTracker = new FilterWifiTracker(getContext(), getSettingsLifecycle());
+    public void onWifiStateChanged() {
+        if (mMatchedScanResults.size() == 0) {
+            return;
         }
-        mFilterWifiTracker.onResume();
+        updateWifiEntries();
+        updateUi();
     }
 
-    private class AccessPointAdapter extends ArrayAdapter<AccessPoint> {
+    /**
+     * Update the results when data changes
+     */
+    @Override
+    public void onWifiEntriesChanged() {
+        if (mMatchedScanResults.size() == 0) {
+            return;
+        }
+        updateWifiEntries();
+        updateUi();
+    }
+
+    @Override
+    public void onNumSavedSubscriptionsChanged() {
+        // Do nothing.
+    }
+
+    @Override
+    public void onNumSavedNetworksChanged() {
+        // Do nothing.
+    }
+
+    @VisibleForTesting
+    void updateWifiEntries() {
+        final List<WifiEntry> wifiEntries = new ArrayList<>();
+        if (mWifiPickerTracker.getConnectedWifiEntry() != null) {
+            wifiEntries.add(mWifiPickerTracker.getConnectedWifiEntry());
+        }
+        wifiEntries.addAll(mWifiPickerTracker.getWifiEntries());
+
+        mFilteredWifiEntries.clear();
+        mFilteredWifiEntries.addAll(wifiEntries.stream().filter(entry -> {
+            for (ScanResult matchedScanResult : mMatchedScanResults) {
+                if (TextUtils.equals(entry.getSsid(), matchedScanResult.SSID)
+                        && entry.getSecurity() == getWifiEntrySecurity(matchedScanResult)) {
+                    return true;
+                }
+            }
+            return false;
+        }).limit(mShowLimitedItem ? MAX_NUMBER_LIST_ITEM : Long.MAX_VALUE)
+                .collect(toList()));
+    }
+
+    private class WifiEntryAdapter extends ArrayAdapter<WifiEntry> {
 
         private final int mResourceId;
         private final LayoutInflater mInflater;
 
-        public AccessPointAdapter(Context context, int resourceId, List<AccessPoint> objects) {
+        WifiEntryAdapter(Context context, int resourceId, List<WifiEntry> objects) {
             super(context, resourceId, objects);
             mResourceId = resourceId;
             mInflater = LayoutInflater.from(context);
@@ -248,18 +312,18 @@
                 divider.setVisibility(View.GONE);
             }
 
-            final AccessPoint accessPoint = getItem(position);
+            final WifiEntry wifiEntry = getItem(position);
 
             final TextView titleView = view.findViewById(android.R.id.title);
             if (titleView != null) {
                 // Shows whole SSID for better UX.
                 titleView.setSingleLine(false);
-                titleView.setText(accessPoint.getTitle());
+                titleView.setText(wifiEntry.getTitle());
             }
 
             final TextView summary = view.findViewById(android.R.id.summary);
             if (summary != null) {
-                final String summaryString = accessPoint.getSettingsSummary();
+                final String summaryString = wifiEntry.getSummary();
                 if (TextUtils.isEmpty(summaryString)) {
                     summary.setVisibility(View.GONE);
                 } else {
@@ -269,7 +333,7 @@
             }
 
             final PreferenceImageView imageView = view.findViewById(android.R.id.icon);
-            final int level = accessPoint.getLevel();
+            final int level = wifiEntry.getLevel();
             if (imageView != null) {
                 final Drawable drawable = getContext().getDrawable(
                         Utils.getWifiIconResource(level));
@@ -290,137 +354,23 @@
 
     @Override
     public void onMatch(List<ScanResult> scanResults) {
-        // Shouldn't need to renew cached list, since input result is empty.
-        if (scanResults != null && scanResults.size() > 0) {
-            renewAccessPointList(scanResults);
-
-            notifyAdapterRefresh();
-        }
-    }
-
-    // Updates internal AccessPoint list from WifiTracker. scanResults are used to update key list
-    // of AccessPoint, and could be null if there is no necessary to update key list.
-    private void renewAccessPointList(List<ScanResult> scanResults) {
-        if (mFilterWifiTracker == null) {
-            return;
-        }
-
-        // TODO(b/119846365): Checks if we could escalate the converting effort.
-        // Updates keys of scanResults into FilterWifiTracker for updating matched AccessPoints.
-        if (scanResults != null) {
-            mFilterWifiTracker.updateKeys(scanResults);
-        }
-
-        // Re-gets matched AccessPoints from WifiTracker.
-        final List<AccessPoint> list = getAccessPointList();
-        list.clear();
-        list.addAll(mFilterWifiTracker.getAccessPoints());
+        mMatchedScanResults = scanResults;
+        updateWifiEntries();
+        updateUi();
     }
 
     @VisibleForTesting
-    void notifyAdapterRefresh() {
+    void updateUi() {
+        // Update related UI buttons
+        if (mShowLimitedItem && mFilteredWifiEntries.size() >= MAX_NUMBER_LIST_ITEM) {
+            showAllButton();
+        }
+        if (mFilteredWifiEntries.size() > 0) {
+            hideProgressIcon();
+        }
+
         if (getDialogAdapter() != null) {
             getDialogAdapter().notifyDataSetChanged();
         }
     }
-
-    @VisibleForTesting
-    final class FilterWifiTracker {
-        private final List<String> mAccessPointKeys;
-        private final WifiTracker mWifiTracker;
-        private final Context mContext;
-
-        public FilterWifiTracker(Context context, Lifecycle lifecycle) {
-            mWifiTracker = WifiTrackerFactory.create(context, mWifiListener,
-                    lifecycle, /* includeSaved */ true, /* includeScans */ true);
-            mAccessPointKeys = new ArrayList<>();
-            mContext = context;
-        }
-
-        /**
-         * Updates key list from input. {@code onMatch()} may be called in multi-times according
-         * wifi scanning result, so needs patchwork here.
-         */
-        public void updateKeys(List<ScanResult> scanResults) {
-            for (ScanResult scanResult : scanResults) {
-                final String key = AccessPoint.getKey(mContext, scanResult);
-                if (!mAccessPointKeys.contains(key)) {
-                    mAccessPointKeys.add(key);
-                }
-            }
-        }
-
-        /**
-         * Returns only AccessPoints whose key is in {@code mAccessPointKeys}.
-         *
-         * @return List of matched AccessPoints.
-         */
-        public List<AccessPoint> getAccessPoints() {
-            final List<AccessPoint> allAccessPoints = mWifiTracker.getAccessPoints();
-            final List<AccessPoint> result = new ArrayList<>();
-
-            // The order should be kept, because order means wifi score (sorting in WifiTracker).
-            int count = 0;
-            for (AccessPoint accessPoint : allAccessPoints) {
-                final String key = accessPoint.getKey();
-                if (mAccessPointKeys.contains(key)) {
-                    result.add(accessPoint);
-
-                    count++;
-                    // Limits how many count of items could show.
-                    if (mShowLimitedItem && count >= MAX_NUMBER_LIST_ITEM) {
-                        break;
-                    }
-                }
-            }
-
-            // Update related UI buttons
-            if (mShowLimitedItem && (count >= MAX_NUMBER_LIST_ITEM)) {
-                showAllButton();
-            }
-            if (count > 0) {
-                hideProgressIcon();
-            }
-
-            return result;
-        }
-
-        @VisibleForTesting
-        WifiTracker.WifiListener mWifiListener = new WifiTracker.WifiListener() {
-
-            @Override
-            public void onWifiStateChanged(int state) {
-                notifyAdapterRefresh();
-            }
-
-            @Override
-            public void onConnectedChanged() {
-                notifyAdapterRefresh();
-            }
-
-            @Override
-            public void onAccessPointsChanged() {
-                renewAccessPointList(null /* scanResults */);
-                notifyAdapterRefresh();
-            }
-        };
-
-        public void onDestroy() {
-            if (mWifiTracker != null) {
-                mWifiTracker.onDestroy();
-            }
-        }
-
-        public void onResume() {
-            if (mWifiTracker != null) {
-                mWifiTracker.onStart();
-            }
-        }
-
-        public void onPause() {
-            if (mWifiTracker != null) {
-                mWifiTracker.onStop();
-            }
-        }
-    }
 }
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index 1579188..59de675 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -37,12 +37,13 @@
 import android.os.UserManager;
 import android.security.Credentials;
 import android.security.KeyStore;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.SpannableString;
 import android.text.TextUtils;
 import android.text.TextWatcher;
-import android.util.FeatureFlagUtils;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
@@ -69,8 +70,6 @@
 
 import com.android.settings.ProxySelector;
 import com.android.settings.R;
-import com.android.settings.wifi.details.WifiPrivacyPreferenceController;
-import com.android.settings.wifi.details2.WifiPrivacyPreferenceController2;
 import com.android.settings.wifi.dpp.WifiDppUtils;
 import com.android.settingslib.Utils;
 import com.android.settingslib.utils.ThreadUtils;
@@ -80,7 +79,9 @@
 import java.net.InetAddress;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.Iterator;
+import java.util.List;
 import java.util.stream.Collectors;
 
 /**
@@ -144,6 +145,10 @@
         UNDESIRED_CERTIFICATE_MACRANDSAPSECRET
     };
 
+    // Should be the same index value as wifi_privacy_entries in arrays.xml
+    @VisibleForTesting static final int PRIVACY_SPINNER_INDEX_RANDOMIZED_MAC = 0;
+    @VisibleForTesting static final int PRIVACY_SPINNER_INDEX_DEVICE_MAC = 1;
+
     /* Phase2 methods supported by PEAP are limited */
     private ArrayAdapter<CharSequence> mPhase2PeapAdapter;
     /* Phase2 methods supported by TTLS are limited */
@@ -159,11 +164,11 @@
     private String mMultipleCertSetString;
     private String mUseSystemCertsString;
     private String mDoNotProvideEapUserCertString;
-    private String mDoNotValidateEapServerString;
 
     private ScrollView mDialogContainer;
     private Spinner mSecuritySpinner;
-    private Spinner mEapMethodSpinner;
+    @VisibleForTesting Spinner mEapMethodSpinner;
+    @VisibleForTesting Spinner mEapSimSpinner;    // For EAP-SIM, EAP-AKA and EAP-AKA-PRIME.
     private Spinner mEapCaCertSpinner;
     private Spinner mEapOcspSpinner;
     private TextView mEapDomainView;
@@ -209,6 +214,8 @@
 
     private final WifiManager mWifiManager;
 
+    private final List<SubscriptionInfo> mActiveSubscriptionInfos = new ArrayList<>();
+
     public WifiConfigController(WifiConfigUiBase parent, View view, AccessPoint accessPoint,
             int mode) {
         this (parent, view, accessPoint, mode, true /* requestFocus */);
@@ -264,8 +271,6 @@
         mUseSystemCertsString = mContext.getString(R.string.wifi_use_system_certs);
         mDoNotProvideEapUserCertString =
             mContext.getString(R.string.wifi_do_not_provide_eap_user_cert);
-        mDoNotValidateEapServerString =
-            mContext.getString(R.string.wifi_do_not_validate_eap_server);
 
         mSsidScanButton = (ImageButton) mView.findViewById(R.id.ssid_scanner_button);
         mDialogContainer = mView.findViewById(R.id.dialog_scrollview);
@@ -305,15 +310,9 @@
                         ? HIDDEN_NETWORK
                         : NOT_HIDDEN_NETWORK);
 
-                int prefMacValue;
-                if (FeatureFlagUtils.isEnabled(mContext, FeatureFlagUtils.SETTINGS_WIFITRACKER2)) {
-                    prefMacValue = WifiPrivacyPreferenceController2
-                            .translateMacRandomizedValueToPrefValue(config.macRandomizationSetting);
-                } else {
-                    prefMacValue = WifiPrivacyPreferenceController
-                            .translateMacRandomizedValueToPrefValue(config.macRandomizationSetting);
-                }
-                mPrivacySettingsSpinner.setSelection(prefMacValue);
+                mPrivacySettingsSpinner.setSelection(
+                        config.macRandomizationSetting == WifiConfiguration.RANDOMIZATION_PERSISTENT
+                        ? PRIVACY_SPINNER_INDEX_RANDOMIZED_MAC : PRIVACY_SPINNER_INDEX_DEVICE_MAC);
 
                 if (config.getIpConfiguration().getIpAssignment() == IpAssignment.STATIC) {
                     mIpSettingsSpinner.setSelection(STATIC_IP);
@@ -554,12 +553,10 @@
                 // Disallow submit if the user has not selected a CA certificate for an EAP network
                 // configuration.
                 enabled = false;
-            }
-            if (caCertSelection.equals(mUseSystemCertsString)
-                    && mEapDomainView != null
+            } else if (mEapDomainView != null
                     && mView.findViewById(R.id.l_domain).getVisibility() != View.GONE
                     && TextUtils.isEmpty(mEapDomainView.getText().toString())) {
-                // Disallow submit if the user chooses to use system certificates for EAP server
+                // Disallow submit if the user chooses to use a certificate for EAP server
                 // validation, but does not provide a domain.
                 enabled = false;
             }
@@ -577,7 +574,6 @@
     }
 
     void showWarningMessagesIfAppropriate() {
-        mView.findViewById(R.id.no_ca_cert_warning).setVisibility(View.GONE);
         mView.findViewById(R.id.no_user_cert_warning).setVisibility(View.GONE);
         mView.findViewById(R.id.no_domain_warning).setVisibility(View.GONE);
         mView.findViewById(R.id.ssid_too_long_warning).setVisibility(View.GONE);
@@ -590,19 +586,11 @@
         }
         if (mEapCaCertSpinner != null
                 && mView.findViewById(R.id.l_ca_cert).getVisibility() != View.GONE) {
-            String caCertSelection = (String) mEapCaCertSpinner.getSelectedItem();
-            if (caCertSelection.equals(mDoNotValidateEapServerString)) {
-                // Display warning if user chooses not to validate the EAP server with a
-                // user-supplied CA certificate in an EAP network configuration.
-                mView.findViewById(R.id.no_ca_cert_warning).setVisibility(View.VISIBLE);
-            }
-            if (caCertSelection.equals(mUseSystemCertsString)
-                    && mEapDomainView != null
+            if (mEapDomainView != null
                     && mView.findViewById(R.id.l_domain).getVisibility() != View.GONE
                     && TextUtils.isEmpty(mEapDomainView.getText().toString())) {
-                // Display warning if user chooses to use pre-installed public CA certificates
-                // without restricting the server domain that these certificates can be used to
-                // validate.
+                // Display warning if user chooses to use a certificate without restricting the
+                // server domain that these certificates can be used to validate.
                 mView.findViewById(R.id.no_domain_warning).setVisibility(View.VISIBLE);
             }
         }
@@ -736,8 +724,7 @@
                 config.enterpriseConfig.setCaCertificateAliases(null);
                 config.enterpriseConfig.setCaPath(null);
                 config.enterpriseConfig.setDomainSuffixMatch(mEapDomainView.getText().toString());
-                if (caCert.equals(mUnspecifiedCertString)
-                        || caCert.equals(mDoNotValidateEapServerString)) {
+                if (caCert.equals(mUnspecifiedCertString)) {
                     // ca_cert already set to null, so do nothing.
                 } else if (caCert.equals(mUseSystemCertsString)) {
                     config.enterpriseConfig.setCaPath(SYSTEM_CA_STORE_PATH);
@@ -771,8 +758,7 @@
                 }
 
                 // Only set OCSP option if there is a valid CA certificate.
-                if (caCert.equals(mUnspecifiedCertString)
-                        || caCert.equals(mDoNotValidateEapServerString)) {
+                if (caCert.equals(mUnspecifiedCertString)) {
                     config.enterpriseConfig.setOcsp(WifiEnterpriseConfig.OCSP_NONE);
                 } else {
                     config.enterpriseConfig.setOcsp(mEapOcspSpinner.getSelectedItemPosition());
@@ -825,6 +811,12 @@
                 return null;
         }
 
+        if (config.enterpriseConfig.isAuthenticationSimBased()
+                && mActiveSubscriptionInfos.size() > 0) {
+            config.carrierId = mActiveSubscriptionInfos
+                    .get(mEapSimSpinner.getSelectedItemPosition()).getCarrierId();
+        }
+
         config.setIpConfiguration(
                 new IpConfiguration(mIpAssignment, mProxySettings,
                                     mStaticIpConfiguration, mHttpProxy));
@@ -833,15 +825,10 @@
         }
 
         if (mPrivacySettingsSpinner != null) {
-            int macValue;
-            if (FeatureFlagUtils.isEnabled(mContext, FeatureFlagUtils.SETTINGS_WIFITRACKER2)) {
-                macValue = WifiPrivacyPreferenceController2.translatePrefValueToMacRandomizedValue(
-                        mPrivacySettingsSpinner.getSelectedItemPosition());
-            } else {
-                macValue = WifiPrivacyPreferenceController.translatePrefValueToMacRandomizedValue(
-                        mPrivacySettingsSpinner.getSelectedItemPosition());
-            }
-            config.macRandomizationSetting = macValue;
+            config.macRandomizationSetting = mPrivacySettingsSpinner.getSelectedItemPosition()
+                    == PRIVACY_SPINNER_INDEX_RANDOMIZED_MAC
+                    ? WifiConfiguration.RANDOMIZATION_PERSISTENT
+                    : WifiConfiguration.RANDOMIZATION_NONE;
         }
 
         return config;
@@ -1013,6 +1000,7 @@
             initiateEnterpriseNetworkUi = true;
             mEapMethodSpinner = (Spinner) mView.findViewById(R.id.method);
             mEapMethodSpinner.setOnItemSelectedListener(this);
+            mEapSimSpinner = (Spinner) mView.findViewById(R.id.sim);
             mPhase2Spinner = (Spinner) mView.findViewById(R.id.phase2);
             mPhase2Spinner.setOnItemSelectedListener(this);
             mEapCaCertSpinner = (Spinner) mView.findViewById(R.id.ca_cert);
@@ -1049,18 +1037,20 @@
         }
 
         if (refreshCertificates) {
+            loadSims();
+
             loadCertificates(
                     mEapCaCertSpinner,
                     Credentials.CA_CERTIFICATE,
-                    mDoNotValidateEapServerString,
-                    false,
-                    true);
+                    null /* noCertificateString */,
+                    false /* showMultipleCerts */,
+                    true /* showUsePreinstalledCertOption */);
             loadCertificates(
                     mEapUserCertSpinner,
                     Credentials.USER_PRIVATE_KEY,
                     mDoNotProvideEapUserCertString,
-                    false,
-                    false);
+                    false /* showMultipleCerts */,
+                    false /* showUsePreinstalledCertOption */);
             // To avoid the user connects to a non-secure network unexpectedly,
             // request using system trusted certificates by default
             // unless the user explicitly chooses "Do not validate" or other
@@ -1070,9 +1060,10 @@
 
         // Modifying an existing network
         if (initiateEnterpriseNetworkUi && mAccessPoint != null && mAccessPoint.isSaved()) {
-            WifiEnterpriseConfig enterpriseConfig = mAccessPoint.getConfig().enterpriseConfig;
-            int eapMethod = enterpriseConfig.getEapMethod();
-            int phase2Method = enterpriseConfig.getPhase2Method();
+            final WifiConfiguration wifiConfig = mAccessPoint.getConfig();
+            final WifiEnterpriseConfig enterpriseConfig = wifiConfig.enterpriseConfig;
+            final int eapMethod = enterpriseConfig.getEapMethod();
+            final int phase2Method = enterpriseConfig.getPhase2Method();
             mEapMethodSpinner.setSelection(eapMethod);
             showEapFieldsByMethod(eapMethod);
             switch (eapMethod) {
@@ -1120,12 +1111,22 @@
                 default:
                     break;
             }
+
+            if (enterpriseConfig.isAuthenticationSimBased()) {
+                for (int i = 0; i < mActiveSubscriptionInfos.size(); i++) {
+                    if (wifiConfig.carrierId == mActiveSubscriptionInfos.get(i).getCarrierId()) {
+                        mEapSimSpinner.setSelection(i);
+                        break;
+                    }
+                }
+            }
+
             if (!TextUtils.isEmpty(enterpriseConfig.getCaPath())) {
                 setSelection(mEapCaCertSpinner, mUseSystemCertsString);
             } else {
                 String[] caCerts = enterpriseConfig.getCaCertificateAliases();
                 if (caCerts == null) {
-                    setSelection(mEapCaCertSpinner, mDoNotValidateEapServerString);
+                    setSelection(mEapCaCertSpinner, mUnspecifiedCertString);
                 } else if (caCerts.length == 1) {
                     setSelection(mEapCaCertSpinner, caCerts[0]);
                 } else {
@@ -1133,9 +1134,9 @@
                     loadCertificates(
                             mEapCaCertSpinner,
                             Credentials.CA_CERTIFICATE,
-                            mDoNotValidateEapServerString,
-                            true,
-                            true);
+                            null /* noCertificateString */,
+                            true /* showMultipleCerts */,
+                            true /* showUsePreinstalledCertOption */);
                     setSelection(mEapCaCertSpinner, mMultipleCertSetString);
                 }
             }
@@ -1208,6 +1209,7 @@
         mView.findViewById(R.id.l_ocsp).setVisibility(View.VISIBLE);
         mView.findViewById(R.id.password_layout).setVisibility(View.VISIBLE);
         mView.findViewById(R.id.show_password_layout).setVisibility(View.VISIBLE);
+        mView.findViewById(R.id.l_sim).setVisibility(View.VISIBLE);
 
         Context context = mConfigUi.getContext();
         switch (eapMethod) {
@@ -1218,12 +1220,14 @@
                 setDomainInvisible();
                 setAnonymousIdentInvisible();
                 setUserCertInvisible();
+                mView.findViewById(R.id.l_sim).setVisibility(View.GONE);
                 break;
             case WIFI_EAP_METHOD_TLS:
                 mView.findViewById(R.id.l_user_cert).setVisibility(View.VISIBLE);
                 setPhase2Invisible();
                 setAnonymousIdentInvisible();
                 setPasswordInvisible();
+                mView.findViewById(R.id.l_sim).setVisibility(View.GONE);
                 break;
             case WIFI_EAP_METHOD_PEAP:
                 // Reset adapter if needed
@@ -1245,6 +1249,7 @@
                 mView.findViewById(R.id.l_phase2).setVisibility(View.VISIBLE);
                 mView.findViewById(R.id.l_anonymous).setVisibility(View.VISIBLE);
                 setUserCertInvisible();
+                mView.findViewById(R.id.l_sim).setVisibility(View.GONE);
                 break;
             case WIFI_EAP_METHOD_SIM:
             case WIFI_EAP_METHOD_AKA:
@@ -1262,8 +1267,7 @@
 
         if (mView.findViewById(R.id.l_ca_cert).getVisibility() != View.GONE) {
             String eapCertSelection = (String) mEapCaCertSpinner.getSelectedItem();
-            if (eapCertSelection.equals(mDoNotValidateEapServerString)
-                    || eapCertSelection.equals(mUnspecifiedCertString)) {
+            if (eapCertSelection.equals(mUnspecifiedCertString)) {
                 // Domain suffix matching is not relevant if the user hasn't chosen a CA
                 // certificate yet, or chooses not to validate the EAP server.
                 setDomainInvisible();
@@ -1282,11 +1286,13 @@
             mEapIdentityView.setText("");
             mView.findViewById(R.id.l_identity).setVisibility(View.GONE);
             setPasswordInvisible();
+            mView.findViewById(R.id.l_sim).setVisibility(View.VISIBLE);
         } else {
             mView.findViewById(R.id.l_identity).setVisibility(View.VISIBLE);
             mView.findViewById(R.id.l_anonymous).setVisibility(View.VISIBLE);
             mView.findViewById(R.id.password_layout).setVisibility(View.VISIBLE);
             mView.findViewById(R.id.show_password_layout).setVisibility(View.VISIBLE);
+            mView.findViewById(R.id.l_sim).setVisibility(View.GONE);
         }
     }
 
@@ -1450,6 +1456,44 @@
     }
 
     @VisibleForTesting
+    void loadSims() {
+        List<SubscriptionInfo> activeSubscriptionInfos = mContext
+                .getSystemService(SubscriptionManager.class).getActiveSubscriptionInfoList();
+        if (activeSubscriptionInfos == null) {
+            activeSubscriptionInfos = Collections.EMPTY_LIST;
+        }
+        mActiveSubscriptionInfos.clear();
+
+        // De-duplicates active subscriptions and caches in mActiveSubscriptionInfos.
+        for (SubscriptionInfo newInfo : activeSubscriptionInfos) {
+            for (SubscriptionInfo cachedInfo : mActiveSubscriptionInfos) {
+                if (newInfo.getCarrierId() == cachedInfo.getCarrierId()) {
+                    continue;
+                }
+            }
+            mActiveSubscriptionInfos.add(newInfo);
+        }
+
+        // Shows disabled 'No SIM' when there is no active subscription.
+        if (mActiveSubscriptionInfos.size() == 0) {
+            final String[] noSim = new String[]{mContext.getString(R.string.wifi_no_sim_card)};
+            mEapSimSpinner.setAdapter(getSpinnerAdapter(noSim));
+            mEapSimSpinner.setSelection(0 /* position */);
+            mEapSimSpinner.setEnabled(false);
+            return;
+        }
+
+        // Shows display name of each active subscription.
+        final String[] displayNames = mActiveSubscriptionInfos.stream().map(
+                SubscriptionInfo::getDisplayName).toArray(String[]::new);
+        mEapSimSpinner.setAdapter(getSpinnerAdapter(displayNames));
+        mEapSimSpinner.setSelection(0 /* position */);
+        if (displayNames.length == 1) {
+            mEapSimSpinner.setEnabled(false);
+        }
+    }
+
+    @VisibleForTesting
     void loadCertificates(
             Spinner spinner,
             String prefix,
@@ -1485,7 +1529,8 @@
                     }).collect(Collectors.toList()));
         }
 
-        if (mAccessPointSecurity != AccessPoint.SECURITY_EAP_SUITE_B) {
+        if (!TextUtils.isEmpty(noCertificateString)
+                && mAccessPointSecurity != AccessPoint.SECURITY_EAP_SUITE_B) {
             certs.add(noCertificateString);
         }
 
@@ -1713,7 +1758,8 @@
                 mContext.getResources().getStringArray(contentStringArrayResId));
     }
 
-    private ArrayAdapter<CharSequence> getSpinnerAdapter(
+    @VisibleForTesting
+    ArrayAdapter<CharSequence> getSpinnerAdapter(
             String[] contentStringArray) {
         ArrayAdapter<CharSequence> spinnerAdapter = new ArrayAdapter<>(mContext,
                 android.R.layout.simple_spinner_item, contentStringArray);
diff --git a/src/com/android/settings/wifi/WifiConfigController2.java b/src/com/android/settings/wifi/WifiConfigController2.java
index 99907f3..a80029b 100644
--- a/src/com/android/settings/wifi/WifiConfigController2.java
+++ b/src/com/android/settings/wifi/WifiConfigController2.java
@@ -35,12 +35,13 @@
 import android.os.UserManager;
 import android.security.Credentials;
 import android.security.KeyStore;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.SpannableString;
 import android.text.TextUtils;
 import android.text.TextWatcher;
-import android.util.FeatureFlagUtils;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
@@ -67,12 +68,10 @@
 
 import com.android.settings.ProxySelector;
 import com.android.settings.R;
-import com.android.settings.wifi.details.WifiPrivacyPreferenceController;
 import com.android.settings.wifi.details2.WifiPrivacyPreferenceController2;
 import com.android.settings.wifi.dpp.WifiDppUtils;
 import com.android.settingslib.Utils;
 import com.android.settingslib.utils.ThreadUtils;
-import com.android.settingslib.wifi.AccessPoint;
 import com.android.wifitrackerlib.WifiEntry;
 import com.android.wifitrackerlib.WifiEntry.ConnectedInfo;
 
@@ -80,7 +79,9 @@
 import java.net.InetAddress;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.Iterator;
+import java.util.List;
 import java.util.stream.Collectors;
 
 /**
@@ -156,11 +157,11 @@
     private String mMultipleCertSetString;
     private String mUseSystemCertsString;
     private String mDoNotProvideEapUserCertString;
-    private String mDoNotValidateEapServerString;
 
     private ScrollView mDialogContainer;
     private Spinner mSecuritySpinner;
-    private Spinner mEapMethodSpinner;
+    @VisibleForTesting Spinner mEapMethodSpinner;
+    @VisibleForTesting Spinner mEapSimSpinner;    // For EAP-SIM, EAP-AKA and EAP-AKA-PRIME.
     private Spinner mEapCaCertSpinner;
     private Spinner mEapOcspSpinner;
     private TextView mEapDomainView;
@@ -205,6 +206,8 @@
 
     private final WifiManager mWifiManager;
 
+    private final List<SubscriptionInfo> mActiveSubscriptionInfos = new ArrayList<>();
+
     public WifiConfigController2(WifiConfigUiBase2 parent, View view, WifiEntry wifiEntry,
             int mode) {
         mConfigUi = parent;
@@ -253,8 +256,6 @@
         mUseSystemCertsString = mContext.getString(R.string.wifi_use_system_certs);
         mDoNotProvideEapUserCertString =
             mContext.getString(R.string.wifi_do_not_provide_eap_user_cert);
-        mDoNotValidateEapServerString =
-            mContext.getString(R.string.wifi_do_not_validate_eap_server);
 
         mSsidScanButton = (ImageButton) mView.findViewById(R.id.ssid_scanner_button);
         mDialogContainer = mView.findViewById(R.id.dialog_scrollview);
@@ -294,14 +295,8 @@
                         ? HIDDEN_NETWORK
                         : NOT_HIDDEN_NETWORK);
 
-                int prefMacValue;
-                if (FeatureFlagUtils.isEnabled(mContext, FeatureFlagUtils.SETTINGS_WIFITRACKER2)) {
-                    prefMacValue = WifiPrivacyPreferenceController2
-                            .translateMacRandomizedValueToPrefValue(config.macRandomizationSetting);
-                } else {
-                    prefMacValue = WifiPrivacyPreferenceController
-                            .translateMacRandomizedValueToPrefValue(config.macRandomizationSetting);
-                }
+                final int prefMacValue = WifiPrivacyPreferenceController2
+                        .translateMacRandomizedValueToPrefValue(config.macRandomizationSetting);
                 mPrivacySettingsSpinner.setSelection(prefMacValue);
 
                 if (config.getIpConfiguration().getIpAssignment() == IpAssignment.STATIC) {
@@ -371,19 +366,6 @@
                             && signalLevel != null) {
                     mConfigUi.setSubmitButton(res.getString(R.string.wifi_connect));
                 } else {
-                    // TODO(b/143326832): Add fine-grained state information.
-                    //WifiConfiguration config = mWifiEntry.getWifiConfiguration();
-                    //String suggestionOrSpecifierPackageName = null;
-                    //if (config != null
-                    //        && (config.fromWifiNetworkSpecifier
-                    //        || config.fromWifiNetworkSuggestion)) {
-                    //    suggestionOrSpecifierPackageName = config.creatorName;
-                    //}
-                    //String summary = AccessPoint.getSummary(
-                    //        mConfigUi.getContext(), /* ssid */ null, state, isEphemeral,
-                    //        suggestionOrSpecifierPackageName);
-                    //addRow(group, R.string.wifi_status, summary);
-
                     if (signalLevel != null) {
                         addRow(group, R.string.wifi_signal, signalLevel);
                     }
@@ -398,11 +380,11 @@
                         final int frequency = info.frequencyMhz;
                         String band = null;
 
-                        if (frequency >= WifiEntryShell.LOWER_FREQ_24GHZ
-                                && frequency < WifiEntryShell.HIGHER_FREQ_24GHZ) {
+                        if (frequency >= WifiEntry.MIN_FREQ_24GHZ
+                                && frequency < WifiEntry.MAX_FREQ_24GHZ) {
                             band = res.getString(R.string.wifi_band_24ghz);
-                        } else if (frequency >= WifiEntryShell.LOWER_FREQ_5GHZ
-                                && frequency < WifiEntryShell.HIGHER_FREQ_5GHZ) {
+                        } else if (frequency >= WifiEntry.MIN_FREQ_5GHZ
+                                && frequency < WifiEntry.MAX_FREQ_5GHZ) {
                             band = res.getString(R.string.wifi_band_5ghz);
                         } else {
                             Log.e(TAG, "Unexpected frequency " + frequency);
@@ -533,12 +515,10 @@
                 // Disallow submit if the user has not selected a CA certificate for an EAP network
                 // configuration.
                 enabled = false;
-            }
-            if (caCertSelection.equals(mUseSystemCertsString)
-                    && mEapDomainView != null
+            } else if (mEapDomainView != null
                     && mView.findViewById(R.id.l_domain).getVisibility() != View.GONE
                     && TextUtils.isEmpty(mEapDomainView.getText().toString())) {
-                // Disallow submit if the user chooses to use system certificates for EAP server
+                // Disallow submit if the user chooses to use a certificate for EAP server
                 // validation, but does not provide a domain.
                 enabled = false;
             }
@@ -556,7 +536,6 @@
     }
 
     void showWarningMessagesIfAppropriate() {
-        mView.findViewById(R.id.no_ca_cert_warning).setVisibility(View.GONE);
         mView.findViewById(R.id.no_user_cert_warning).setVisibility(View.GONE);
         mView.findViewById(R.id.no_domain_warning).setVisibility(View.GONE);
         mView.findViewById(R.id.ssid_too_long_warning).setVisibility(View.GONE);
@@ -569,19 +548,11 @@
         }
         if (mEapCaCertSpinner != null
                 && mView.findViewById(R.id.l_ca_cert).getVisibility() != View.GONE) {
-            String caCertSelection = (String) mEapCaCertSpinner.getSelectedItem();
-            if (caCertSelection.equals(mDoNotValidateEapServerString)) {
-                // Display warning if user chooses not to validate the EAP server with a
-                // user-supplied CA certificate in an EAP network configuration.
-                mView.findViewById(R.id.no_ca_cert_warning).setVisibility(View.VISIBLE);
-            }
-            if (caCertSelection.equals(mUseSystemCertsString)
-                    && mEapDomainView != null
+            if (mEapDomainView != null
                     && mView.findViewById(R.id.l_domain).getVisibility() != View.GONE
                     && TextUtils.isEmpty(mEapDomainView.getText().toString())) {
-                // Display warning if user chooses to use pre-installed public CA certificates
-                // without restricting the server domain that these certificates can be used to
-                // validate.
+                // Display warning if user chooses to use a certificate without restricting the
+                // server domain that these certificates can be used to validate.
                 mView.findViewById(R.id.no_domain_warning).setVisibility(View.VISIBLE);
             }
         }
@@ -606,13 +577,11 @@
         WifiConfiguration config = new WifiConfiguration();
 
         if (mWifiEntry == null) {
-            config.SSID = AccessPoint.convertToQuotedString(
-                    mSsidView.getText().toString());
+            config.SSID = "\"" + mSsidView.getText().toString() + "\"";
             // If the user adds a network manually, assume that it is hidden.
             config.hiddenSSID = mHiddenSettingsSpinner.getSelectedItemPosition() == HIDDEN_NETWORK;
         } else if (!mWifiEntry.isSaved()) {
-            config.SSID = AccessPoint.convertToQuotedString(
-                    mWifiEntry.getTitle());
+            config.SSID = "\"" + mWifiEntry.getTitle() + "\"";
         } else {
             config.networkId = mWifiEntry.getWifiConfiguration().networkId;
             config.hiddenSSID = mWifiEntry.getWifiConfiguration().hiddenSSID;
@@ -714,12 +683,17 @@
                         break;
                 }
 
+                if (config.enterpriseConfig.isAuthenticationSimBased()
+                        && mActiveSubscriptionInfos.size() > 0) {
+                    config.carrierId = mActiveSubscriptionInfos
+                            .get(mEapSimSpinner.getSelectedItemPosition()).getCarrierId();
+                }
+
                 String caCert = (String) mEapCaCertSpinner.getSelectedItem();
                 config.enterpriseConfig.setCaCertificateAliases(null);
                 config.enterpriseConfig.setCaPath(null);
                 config.enterpriseConfig.setDomainSuffixMatch(mEapDomainView.getText().toString());
-                if (caCert.equals(mUnspecifiedCertString)
-                        || caCert.equals(mDoNotValidateEapServerString)) {
+                if (caCert.equals(mUnspecifiedCertString)) {
                     // ca_cert already set to null, so do nothing.
                 } else if (caCert.equals(mUseSystemCertsString)) {
                     config.enterpriseConfig.setCaPath(SYSTEM_CA_STORE_PATH);
@@ -752,8 +726,7 @@
                 }
 
                 // Only set OCSP option if there is a valid CA certificate.
-                if (caCert.equals(mUnspecifiedCertString)
-                        || caCert.equals(mDoNotValidateEapServerString)) {
+                if (caCert.equals(mUnspecifiedCertString)) {
                     config.enterpriseConfig.setOcsp(WifiEnterpriseConfig.OCSP_NONE);
                 } else {
                     config.enterpriseConfig.setOcsp(mEapOcspSpinner.getSelectedItemPosition());
@@ -814,15 +787,9 @@
         }
 
         if (mPrivacySettingsSpinner != null) {
-            int macValue;
-            if (FeatureFlagUtils.isEnabled(mContext, FeatureFlagUtils.SETTINGS_WIFITRACKER2)) {
-                macValue = WifiPrivacyPreferenceController2.translatePrefValueToMacRandomizedValue(
-                        mPrivacySettingsSpinner.getSelectedItemPosition());
-            } else {
-                macValue = WifiPrivacyPreferenceController.translatePrefValueToMacRandomizedValue(
-                        mPrivacySettingsSpinner.getSelectedItemPosition());
-            }
-            config.macRandomizationSetting = macValue;
+            config.macRandomizationSetting = WifiPrivacyPreferenceController2
+                    .translatePrefValueToMacRandomizedValue(mPrivacySettingsSpinner
+                            .getSelectedItemPosition());
         }
 
         return config;
@@ -994,6 +961,7 @@
             initiateEnterpriseNetworkUi = true;
             mEapMethodSpinner = (Spinner) mView.findViewById(R.id.method);
             mEapMethodSpinner.setOnItemSelectedListener(this);
+            mEapSimSpinner = (Spinner) mView.findViewById(R.id.sim);
             mPhase2Spinner = (Spinner) mView.findViewById(R.id.phase2);
             mPhase2Spinner.setOnItemSelectedListener(this);
             mEapCaCertSpinner = (Spinner) mView.findViewById(R.id.ca_cert);
@@ -1031,18 +999,20 @@
         }
 
         if (refreshCertificates) {
+            loadSims();
+
             loadCertificates(
                     mEapCaCertSpinner,
                     Credentials.CA_CERTIFICATE,
-                    mDoNotValidateEapServerString,
-                    false,
-                    true);
+                    null /* noCertificateString */,
+                    false /* showMultipleCerts */,
+                    true /* showUsePreinstalledCertOption */);
             loadCertificates(
                     mEapUserCertSpinner,
                     Credentials.USER_PRIVATE_KEY,
                     mDoNotProvideEapUserCertString,
-                    false,
-                    false);
+                    false /* showMultipleCerts */,
+                    false /* showUsePreinstalledCertOption */);
             // To avoid the user connects to a non-secure network unexpectedly,
             // request using system trusted certificates by default
             // unless the user explicitly chooses "Do not validate" or other
@@ -1052,10 +1022,10 @@
 
         // Modifying an existing network
         if (initiateEnterpriseNetworkUi && mWifiEntry != null && mWifiEntry.isSaved()) {
-            WifiEnterpriseConfig enterpriseConfig = mWifiEntry.getWifiConfiguration()
-                    .enterpriseConfig;
-            int eapMethod = enterpriseConfig.getEapMethod();
-            int phase2Method = enterpriseConfig.getPhase2Method();
+            final WifiConfiguration wifiConfig = mWifiEntry.getWifiConfiguration();
+            final WifiEnterpriseConfig enterpriseConfig = wifiConfig.enterpriseConfig;
+            final int eapMethod = enterpriseConfig.getEapMethod();
+            final int phase2Method = enterpriseConfig.getPhase2Method();
             mEapMethodSpinner.setSelection(eapMethod);
             showEapFieldsByMethod(eapMethod);
             switch (eapMethod) {
@@ -1103,12 +1073,22 @@
                 default:
                     break;
             }
+
+            if (enterpriseConfig.isAuthenticationSimBased()) {
+                for (int i = 0; i < mActiveSubscriptionInfos.size(); i++) {
+                    if (wifiConfig.carrierId == mActiveSubscriptionInfos.get(i).getCarrierId()) {
+                        mEapSimSpinner.setSelection(i);
+                        break;
+                    }
+                }
+            }
+
             if (!TextUtils.isEmpty(enterpriseConfig.getCaPath())) {
                 setSelection(mEapCaCertSpinner, mUseSystemCertsString);
             } else {
                 String[] caCerts = enterpriseConfig.getCaCertificateAliases();
                 if (caCerts == null) {
-                    setSelection(mEapCaCertSpinner, mDoNotValidateEapServerString);
+                    setSelection(mEapCaCertSpinner, mUnspecifiedCertString);
                 } else if (caCerts.length == 1) {
                     setSelection(mEapCaCertSpinner, caCerts[0]);
                 } else {
@@ -1116,9 +1096,9 @@
                     loadCertificates(
                             mEapCaCertSpinner,
                             Credentials.CA_CERTIFICATE,
-                            mDoNotValidateEapServerString,
-                            true,
-                            true);
+                            null /* noCertificateString */,
+                            true /* showMultipleCerts */,
+                            true /* showUsePreinstalledCertOption */);
                     setSelection(mEapCaCertSpinner, mMultipleCertSetString);
                 }
             }
@@ -1191,6 +1171,7 @@
         mView.findViewById(R.id.l_ocsp).setVisibility(View.VISIBLE);
         mView.findViewById(R.id.password_layout).setVisibility(View.VISIBLE);
         mView.findViewById(R.id.show_password_layout).setVisibility(View.VISIBLE);
+        mView.findViewById(R.id.l_sim).setVisibility(View.VISIBLE);
 
         Context context = mConfigUi.getContext();
         switch (eapMethod) {
@@ -1201,12 +1182,14 @@
                 setDomainInvisible();
                 setAnonymousIdentInvisible();
                 setUserCertInvisible();
+                mView.findViewById(R.id.l_sim).setVisibility(View.GONE);
                 break;
             case WIFI_EAP_METHOD_TLS:
                 mView.findViewById(R.id.l_user_cert).setVisibility(View.VISIBLE);
                 setPhase2Invisible();
                 setAnonymousIdentInvisible();
                 setPasswordInvisible();
+                mView.findViewById(R.id.l_sim).setVisibility(View.GONE);
                 break;
             case WIFI_EAP_METHOD_PEAP:
                 // Reset adapter if needed
@@ -1228,6 +1211,7 @@
                 mView.findViewById(R.id.l_phase2).setVisibility(View.VISIBLE);
                 mView.findViewById(R.id.l_anonymous).setVisibility(View.VISIBLE);
                 setUserCertInvisible();
+                mView.findViewById(R.id.l_sim).setVisibility(View.GONE);
                 break;
             case WIFI_EAP_METHOD_SIM:
             case WIFI_EAP_METHOD_AKA:
@@ -1245,8 +1229,7 @@
 
         if (mView.findViewById(R.id.l_ca_cert).getVisibility() != View.GONE) {
             String eapCertSelection = (String) mEapCaCertSpinner.getSelectedItem();
-            if (eapCertSelection.equals(mDoNotValidateEapServerString)
-                    || eapCertSelection.equals(mUnspecifiedCertString)) {
+            if (eapCertSelection.equals(mUnspecifiedCertString)) {
                 // Domain suffix matching is not relevant if the user hasn't chosen a CA
                 // certificate yet, or chooses not to validate the EAP server.
                 setDomainInvisible();
@@ -1265,11 +1248,13 @@
             mEapIdentityView.setText("");
             mView.findViewById(R.id.l_identity).setVisibility(View.GONE);
             setPasswordInvisible();
+            mView.findViewById(R.id.l_sim).setVisibility(View.VISIBLE);
         } else {
             mView.findViewById(R.id.l_identity).setVisibility(View.VISIBLE);
             mView.findViewById(R.id.l_anonymous).setVisibility(View.VISIBLE);
             mView.findViewById(R.id.password_layout).setVisibility(View.VISIBLE);
             mView.findViewById(R.id.show_password_layout).setVisibility(View.VISIBLE);
+            mView.findViewById(R.id.l_sim).setVisibility(View.GONE);
         }
     }
 
@@ -1433,6 +1418,44 @@
     }
 
     @VisibleForTesting
+    void loadSims() {
+        List<SubscriptionInfo> activeSubscriptionInfos = mContext
+                .getSystemService(SubscriptionManager.class).getActiveSubscriptionInfoList();
+        if (activeSubscriptionInfos == null) {
+            activeSubscriptionInfos = Collections.EMPTY_LIST;
+        }
+        mActiveSubscriptionInfos.clear();
+
+        // De-duplicates active subscriptions and caches in mActiveSubscriptionInfos.
+        for (SubscriptionInfo newInfo : activeSubscriptionInfos) {
+            for (SubscriptionInfo cachedInfo : mActiveSubscriptionInfos) {
+                if (newInfo.getCarrierId() == cachedInfo.getCarrierId()) {
+                    continue;
+                }
+            }
+            mActiveSubscriptionInfos.add(newInfo);
+        }
+
+        // Shows disabled 'No SIM' when there is no active subscription.
+        if (mActiveSubscriptionInfos.size() == 0) {
+            final String[] noSim = new String[]{mContext.getString(R.string.wifi_no_sim_card)};
+            mEapSimSpinner.setAdapter(getSpinnerAdapter(noSim));
+            mEapSimSpinner.setSelection(0 /* position */);
+            mEapSimSpinner.setEnabled(false);
+            return;
+        }
+
+        // Shows display name of each active subscription.
+        final String[] displayNames = mActiveSubscriptionInfos.stream().map(
+                SubscriptionInfo::getDisplayName).toArray(String[]::new);
+        mEapSimSpinner.setAdapter(getSpinnerAdapter(displayNames));
+        mEapSimSpinner.setSelection(0 /* position */);
+        if (displayNames.length == 1) {
+            mEapSimSpinner.setEnabled(false);
+        }
+    }
+
+    @VisibleForTesting
     void loadCertificates(
             Spinner spinner,
             String prefix,
@@ -1468,7 +1491,8 @@
                     }).collect(Collectors.toList()));
         }
 
-        if (mWifiEntrySecurity != WifiEntry.SECURITY_EAP_SUITE_B) {
+        if (!TextUtils.isEmpty(noCertificateString)
+                && mWifiEntrySecurity != WifiEntry.SECURITY_EAP_SUITE_B) {
             certs.add(noCertificateString);
         }
 
@@ -1696,7 +1720,8 @@
                 mContext.getResources().getStringArray(contentStringArrayResId));
     }
 
-    private ArrayAdapter<CharSequence> getSpinnerAdapter(
+    @VisibleForTesting
+    ArrayAdapter<CharSequence> getSpinnerAdapter(
             String[] contentStringArray) {
         ArrayAdapter<CharSequence> spinnerAdapter = new ArrayAdapter<>(mContext,
                 android.R.layout.simple_spinner_item, contentStringArray);
diff --git a/src/com/android/settings/wifi/WifiConnectionPreferenceController.java b/src/com/android/settings/wifi/WifiConnectionPreferenceController.java
index 742edd1..13d5082 100644
--- a/src/com/android/settings/wifi/WifiConnectionPreferenceController.java
+++ b/src/com/android/settings/wifi/WifiConnectionPreferenceController.java
@@ -29,6 +29,8 @@
 import android.os.SystemClock;
 
 import androidx.annotation.VisibleForTesting;
+import androidx.lifecycle.LifecycleObserver;
+import androidx.lifecycle.OnLifecycleEvent;
 import androidx.preference.PreferenceGroup;
 import androidx.preference.PreferenceScreen;
 
@@ -50,7 +52,7 @@
  * controller class when there is a wifi connection present.
  */
 public class WifiConnectionPreferenceController extends AbstractPreferenceController implements
-        WifiPickerTracker.WifiPickerTrackerCallback {
+        WifiPickerTracker.WifiPickerTrackerCallback, LifecycleObserver {
 
     private static final String TAG = "WifiConnPrefCtrl";
 
@@ -97,6 +99,7 @@
             UpdateListener updateListener, String preferenceGroupKey, int order,
             int metricsCategory) {
         super(context);
+        lifecycle.addObserver(this);
         mUpdateListener = updateListener;
         mPreferenceGroupKey = preferenceGroupKey;
         this.order = order;
@@ -124,6 +127,14 @@
                 this);
     }
 
+    /**
+     * This event is triggered when users click back button at 'Network & internet'.
+     */
+    @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
+    public void onDestroy() {
+        mWorkerThread.quit();
+    }
+
     @Override
     public boolean isAvailable() {
         return mWifiPickerTracker.getConnectedWifiEntry() != null;
diff --git a/src/com/android/settings/wifi/WifiDialogActivity.java b/src/com/android/settings/wifi/WifiDialogActivity.java
index 7782786..754f99d 100644
--- a/src/com/android/settings/wifi/WifiDialogActivity.java
+++ b/src/com/android/settings/wifi/WifiDialogActivity.java
@@ -16,14 +16,22 @@
 
 package com.android.settings.wifi;
 
-import android.app.Activity;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
+import android.net.NetworkScoreManager;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiManager;
 import android.net.wifi.WifiManager.ActionListener;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.Looper;
+import android.os.Process;
+import android.os.SimpleClock;
+import android.os.SystemClock;
+import android.text.TextUtils;
 import android.util.Log;
 
 import androidx.annotation.VisibleForTesting;
@@ -31,15 +39,33 @@
 import com.android.settings.R;
 import com.android.settings.SetupWizardUtils;
 import com.android.settings.wifi.dpp.WifiDppUtils;
+import com.android.settingslib.core.lifecycle.ObservableActivity;
 import com.android.settingslib.wifi.AccessPoint;
+import com.android.wifitrackerlib.NetworkDetailsTracker;
+import com.android.wifitrackerlib.WifiEntry;
 
 import com.google.android.setupcompat.util.WizardManagerHelper;
 
-public class WifiDialogActivity extends Activity implements WifiDialog.WifiDialogListener,
-        DialogInterface.OnDismissListener {
+import java.time.Clock;
+import java.time.ZoneOffset;
+
+/**
+ * The activity shows a Wi-fi editor dialog.
+ *
+ * TODO(b/152571756): This activity supports both WifiTrackerLib and SettingsLib because this is an
+ *                    exported UI component, some other APPs (e.g., SetupWizard) still use
+ *                    SettingsLib. Remove the SettingsLib compatible part after these APPs use
+ *                    WifiTrackerLib.
+ */
+public class WifiDialogActivity extends ObservableActivity implements WifiDialog.WifiDialogListener,
+        WifiDialog2.WifiDialog2Listener, DialogInterface.OnDismissListener {
 
     private static final String TAG = "WifiDialogActivity";
 
+    // For the callers which support WifiTrackerLib.
+    public static final String KEY_CHOSEN_WIFIENTRY_KEY = "key_chosen_wifientry_key";
+
+    // For the callers which support SettingsLib.
     public static final String KEY_ACCESS_POINT_STATE = "access_point_state";
 
     /**
@@ -58,9 +84,22 @@
 
     private static final int REQUEST_CODE_WIFI_DPP_ENROLLEE_QR_CODE_SCANNER = 0;
 
+    // Max age of tracked WifiEntries.
+    private static final long MAX_SCAN_AGE_MILLIS = 15_000;
+    // Interval between initiating NetworkDetailsTracker scans.
+    private static final long SCAN_INTERVAL_MILLIS = 10_000;
+
     private WifiDialog mDialog;
+    private AccessPoint mAccessPoint;
+
+    private WifiDialog2 mDialog2;
+
+    // The received intent supports a key of WifiTrackerLib or SettingsLib.
+    private boolean mIsWifiTrackerLib;
 
     private Intent mIntent;
+    private NetworkDetailsTracker mNetworkDetailsTracker;
+    private HandlerThread mWorkerThread;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -71,36 +110,108 @@
 
         super.onCreate(savedInstanceState);
 
-        final Bundle accessPointState = mIntent.getBundleExtra(KEY_ACCESS_POINT_STATE);
-        AccessPoint accessPoint = null;
-        if (accessPointState != null) {
-            accessPoint = new AccessPoint(this, accessPointState);
+        mIsWifiTrackerLib = !TextUtils.isEmpty(mIntent.getStringExtra(KEY_CHOSEN_WIFIENTRY_KEY));
+
+        if (mIsWifiTrackerLib) {
+            mWorkerThread = new HandlerThread(
+                    TAG + "{" + Integer.toHexString(System.identityHashCode(this)) + "}",
+                    Process.THREAD_PRIORITY_BACKGROUND);
+            mWorkerThread.start();
+            final Clock elapsedRealtimeClock = new SimpleClock(ZoneOffset.UTC) {
+                @Override
+                public long millis() {
+                    return SystemClock.elapsedRealtime();
+                }
+            };
+            mNetworkDetailsTracker = NetworkDetailsTracker.createNetworkDetailsTracker(
+                    getLifecycle(),
+                    this,
+                    getSystemService(WifiManager.class),
+                    getSystemService(ConnectivityManager.class),
+                    getSystemService(NetworkScoreManager.class),
+                    new Handler(Looper.getMainLooper()),
+                    mWorkerThread.getThreadHandler(),
+                    elapsedRealtimeClock,
+                    MAX_SCAN_AGE_MILLIS,
+                    SCAN_INTERVAL_MILLIS,
+                    mIntent.getStringExtra(KEY_CHOSEN_WIFIENTRY_KEY));
+        } else {
+            final Bundle accessPointState = mIntent.getBundleExtra(KEY_ACCESS_POINT_STATE);
+            if (accessPointState != null) {
+                mAccessPoint = new AccessPoint(this, accessPointState);
+            }
+        }
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+        if (mDialog2 != null || mDialog != null) {
+            return;
         }
 
         if (WizardManagerHelper.isAnySetupWizard(getIntent())) {
-            mDialog = WifiDialog.createModal(this, this, accessPoint,
-                    WifiConfigUiBase.MODE_CONNECT, R.style.SuwAlertDialogThemeCompat_Light);
+            if (mIsWifiTrackerLib) {
+                mDialog2 = WifiDialog2.createModal(this, this,
+                        mNetworkDetailsTracker.getWifiEntry(),
+                        WifiConfigUiBase2.MODE_CONNECT, R.style.SuwAlertDialogThemeCompat_Light);
+            } else {
+                mDialog = WifiDialog.createModal(this, this, mAccessPoint,
+                        WifiConfigUiBase.MODE_CONNECT, R.style.SuwAlertDialogThemeCompat_Light);
+            }
         } else {
-            mDialog = WifiDialog.createModal(
-                    this, this, accessPoint, WifiConfigUiBase.MODE_CONNECT);
+            if (mIsWifiTrackerLib) {
+                mDialog2 = WifiDialog2.createModal(this, this,
+                        mNetworkDetailsTracker.getWifiEntry(), WifiConfigUiBase2.MODE_CONNECT);
+            } else {
+                mDialog = WifiDialog.createModal(
+                        this, this, mAccessPoint, WifiConfigUiBase.MODE_CONNECT);
+            }
         }
-        mDialog.show();
-        mDialog.setOnDismissListener(this);
+
+        if (mIsWifiTrackerLib) {
+            mDialog2.show();
+            mDialog2.setOnDismissListener(this);
+        } else {
+            mDialog.show();
+            mDialog.setOnDismissListener(this);
+        }
     }
 
     @Override
     public void finish() {
-        super.finish();
         overridePendingTransition(0, 0);
+
+        super.finish();
     }
 
     @Override
     public void onDestroy() {
-        super.onDestroy();
-        if (mDialog != null && mDialog.isShowing()) {
-            mDialog.dismiss();
-            mDialog = null;
+        if (mIsWifiTrackerLib) {
+            if (mDialog2 != null && mDialog2.isShowing()) {
+                mDialog2.dismiss();
+                mDialog2 = null;
+            }
+            mWorkerThread.quit();
+        } else {
+            if (mDialog != null && mDialog.isShowing()) {
+                mDialog.dismiss();
+                mDialog = null;
+            }
         }
+
+        super.onDestroy();
+    }
+
+    @Override
+    public void onForget(WifiDialog2 dialog) {
+        final WifiEntry wifiEntry = dialog.getController().getWifiEntry();
+        if (wifiEntry != null && wifiEntry.canForget()) {
+            wifiEntry.forget(null /* callback */);
+        }
+
+        setResult(RESULT_FORGET);
+        finish();
     }
 
     @Override
@@ -134,6 +245,27 @@
     }
 
     @Override
+    public void onSubmit(WifiDialog2 dialog) {
+        final WifiEntry wifiEntry = dialog.getController().getWifiEntry();
+        final WifiConfiguration config = dialog.getController().getConfig();
+
+        if (getIntent().getBooleanExtra(KEY_CONNECT_FOR_CALLER, true)) {
+            if (config == null && wifiEntry != null && wifiEntry.canConnect()) {
+                wifiEntry.connect(null /* callback */);
+            } else {
+                getSystemService(WifiManager.class).connect(config, null /* listener */);
+            }
+        }
+
+        final Intent resultData = new Intent();
+        if (config != null) {
+            resultData.putExtra(KEY_WIFI_CONFIGURATION, config);
+        }
+        setResult(RESULT_CONNECTED, resultData);
+        finish();
+    }
+
+    @Override
     public void onSubmit(WifiDialog dialog) {
         final WifiConfiguration config = dialog.getController().getConfig();
         final AccessPoint accessPoint = dialog.getController().getAccessPoint();
@@ -171,11 +303,21 @@
 
     @Override
     public void onDismiss(DialogInterface dialogInterface) {
+        mDialog2 = null;
         mDialog = null;
         finish();
     }
 
     @Override
+    public void onScan(WifiDialog2 dialog, String ssid) {
+        Intent intent = WifiDppUtils.getEnrolleeQrCodeScannerIntent(ssid);
+        WizardManagerHelper.copyWizardManagerExtras(mIntent, intent);
+
+        // Launch QR code scanner to join a network.
+        startActivityForResult(intent, REQUEST_CODE_WIFI_DPP_ENROLLEE_QR_CODE_SCANNER);
+    }
+
+    @Override
     public void onScan(WifiDialog dialog, String ssid) {
         Intent intent = WifiDppUtils.getEnrolleeQrCodeScannerIntent(ssid);
         WizardManagerHelper.copyWizardManagerExtras(mIntent, intent);
diff --git a/src/com/android/settings/wifi/WifiEntryShell.java b/src/com/android/settings/wifi/WifiEntryShell.java
deleted file mode 100644
index 385cca1..0000000
--- a/src/com/android/settings/wifi/WifiEntryShell.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi;
-
-import com.android.wifitrackerlib.WifiEntry;
-
-/**
- * {@link WifiEntry is working in progess, many methods are not available, this class is to group
- * all the unavalable {@link AccessPoint} methods & constants.
- *
- * TODO(b/143326832): Replace all methods & constants with WifiEntry version when it's available.
- */
-public class WifiEntryShell {
-    public WifiEntryShell(){};
-
-    /**
-     * Lower bound on the 2.4 GHz (802.11b/g/n) WLAN channels
-     */
-    public static final int LOWER_FREQ_24GHZ = 2400;
-
-    /**
-     * Upper bound on the 2.4 GHz (802.11b/g/n) WLAN channels
-     */
-    public static final int HIGHER_FREQ_24GHZ = 2500;
-
-    /**
-     * Lower bound on the 5.0 GHz (802.11a/h/j/n/ac) WLAN channels
-     */
-    public static final int LOWER_FREQ_5GHZ = 4900;
-
-    /**
-     * Upper bound on the 5.0 GHz (802.11a/h/j/n/ac) WLAN channels
-     */
-    public static final int HIGHER_FREQ_5GHZ = 5900;
-}
diff --git a/src/com/android/settings/wifi/WifiNoInternetDialog.java b/src/com/android/settings/wifi/WifiNoInternetDialog.java
index ccfda3a..9d90b6a 100644
--- a/src/com/android/settings/wifi/WifiNoInternetDialog.java
+++ b/src/com/android/settings/wifi/WifiNoInternetDialog.java
@@ -38,11 +38,16 @@
 import android.view.View;
 import android.widget.CheckBox;
 
+import androidx.annotation.VisibleForTesting;
+
 import com.android.internal.app.AlertActivity;
 import com.android.internal.app.AlertController;
 import com.android.settings.R;
 
-public final class WifiNoInternetDialog extends AlertActivity implements
+/**
+ * To display a dialog that asks the user whether to connect to a network that is not validated.
+ */
+public class WifiNoInternetDialog extends AlertActivity implements
         DialogInterface.OnClickListener {
     private static final String TAG = "WifiNoInternetDialog";
 
@@ -50,7 +55,7 @@
     private Network mNetwork;
     private String mNetworkName;
     private ConnectivityManager.NetworkCallback mNetworkCallback;
-    private CheckBox mAlwaysAllow;
+    @VisibleForTesting CheckBox mAlwaysAllow;
     private String mAction;
     private boolean mButtonClicked;
 
diff --git a/src/com/android/settings/wifi/WifiPickerActivity.java b/src/com/android/settings/wifi/WifiPickerActivity.java
index adfc7ec..d56e7e5 100644
--- a/src/com/android/settings/wifi/WifiPickerActivity.java
+++ b/src/com/android/settings/wifi/WifiPickerActivity.java
@@ -16,7 +16,6 @@
 package com.android.settings.wifi;
 
 import android.content.Intent;
-import android.util.FeatureFlagUtils;
 
 import androidx.preference.PreferenceFragmentCompat;
 
@@ -24,7 +23,6 @@
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.wifi.p2p.WifiP2pSettings;
-import com.android.settings.wifi.savedaccesspoints.SavedAccessPointsWifiSettings;
 import com.android.settings.wifi.savedaccesspoints2.SavedAccessPointsWifiSettings2;
 
 public class WifiPickerActivity extends SettingsActivity implements ButtonBarHandler {
@@ -41,14 +39,8 @@
 
     @Override
     protected boolean isValidFragment(String fragmentName) {
-        boolean isSavedAccessPointsWifiSettings;
-        if (FeatureFlagUtils.isEnabled(this, FeatureFlagUtils.SETTINGS_WIFITRACKER2)) {
-            isSavedAccessPointsWifiSettings =
-                    SavedAccessPointsWifiSettings2.class.getName().equals(fragmentName);
-        } else {
-            isSavedAccessPointsWifiSettings =
-                    SavedAccessPointsWifiSettings.class.getName().equals(fragmentName);
-        }
+        final boolean isSavedAccessPointsWifiSettings =
+                SavedAccessPointsWifiSettings2.class.getName().equals(fragmentName);
 
         if (WifiSettings.class.getName().equals(fragmentName)
                 || WifiP2pSettings.class.getName().equals(fragmentName)
diff --git a/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java b/src/com/android/settings/wifi/WifiPrimarySwitchPreferenceController.java
similarity index 83%
rename from src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java
rename to src/com/android/settings/wifi/WifiPrimarySwitchPreferenceController.java
index 1e18c59..9356e6b 100644
--- a/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java
+++ b/src/com/android/settings/wifi/WifiPrimarySwitchPreferenceController.java
@@ -21,8 +21,8 @@
 
 import com.android.settings.R;
 import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.widget.MasterSwitchController;
-import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settings.widget.PrimarySwitchController;
+import com.android.settings.widget.PrimarySwitchPreference;
 import com.android.settings.widget.SummaryUpdater;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
@@ -32,19 +32,22 @@
 import com.android.settingslib.core.lifecycle.events.OnStart;
 import com.android.settingslib.core.lifecycle.events.OnStop;
 
-// TODO(b/151133650): Replace AbstractPreferenceController with BasePreferenceController.
-public class WifiMasterSwitchPreferenceController extends AbstractPreferenceController
+/**
+ * PreferenceController to update the wifi state.
+ */
+public class WifiPrimarySwitchPreferenceController extends AbstractPreferenceController
         implements PreferenceControllerMixin, SummaryUpdater.OnSummaryChangeListener,
         LifecycleObserver, OnResume, OnPause, OnStart, OnStop {
+    //TODO(b/151133650): Replace AbstractPreferenceController with BasePreferenceController.
 
     public static final String KEY_TOGGLE_WIFI = "main_toggle_wifi";
 
-    private MasterSwitchPreference mWifiPreference;
+    private PrimarySwitchPreference mWifiPreference;
     private WifiEnabler mWifiEnabler;
     private final WifiSummaryUpdater mSummaryHelper;
     private final MetricsFeatureProvider mMetricsFeatureProvider;
 
-    public WifiMasterSwitchPreferenceController(Context context,
+    public WifiPrimarySwitchPreferenceController(Context context,
             MetricsFeatureProvider metricsFeatureProvider) {
         super(context);
         mMetricsFeatureProvider = metricsFeatureProvider;
@@ -85,8 +88,8 @@
 
     @Override
     public void onStart() {
-        mWifiEnabler = new WifiEnabler(mContext, new MasterSwitchController(mWifiPreference),
-            mMetricsFeatureProvider);
+        mWifiEnabler = new WifiEnabler(mContext, new PrimarySwitchController(mWifiPreference),
+                mMetricsFeatureProvider);
     }
 
     @Override
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 1ba99a2..7bc4063 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -16,31 +16,32 @@
 
 package com.android.settings.wifi;
 
-import static android.net.NetworkCapabilities.TRANSPORT_WIFI;
 import static android.net.wifi.WifiConfiguration.NetworkSelectionStatus.NETWORK_SELECTION_ENABLED;
 import static android.os.UserManager.DISALLOW_CONFIG_WIFI;
 
-import android.annotation.NonNull;
 import android.app.Activity;
 import android.app.Dialog;
 import android.app.settings.SettingsEnums;
+import android.content.ActivityNotFoundException;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.ConnectivityManager;
-import android.net.Network;
-import android.net.NetworkInfo;
-import android.net.NetworkInfo.State;
-import android.net.NetworkRequest;
+import android.net.NetworkScoreManager;
 import android.net.NetworkTemplate;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.HandlerThread;
 import android.os.Looper;
 import android.os.PowerManager;
+import android.os.Process;
+import android.os.SimpleClock;
+import android.os.SystemClock;
 import android.provider.Settings;
+import android.text.TextUtils;
 import android.util.FeatureFlagUtils;
 import android.util.Log;
 import android.view.ContextMenu;
@@ -50,7 +51,6 @@
 import android.view.View;
 import android.widget.Toast;
 
-import androidx.annotation.IntDef;
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
@@ -68,56 +68,54 @@
 import com.android.settings.location.ScanningSettings;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.widget.SwitchBarController;
-import com.android.settings.wifi.details.WifiNetworkDetailsFragment;
+import com.android.settings.wifi.details2.WifiNetworkDetailsFragment2;
 import com.android.settings.wifi.dpp.WifiDppUtils;
+import com.android.settingslib.HelpUtils;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedLockUtilsInternal;
 import com.android.settingslib.search.Indexable;
 import com.android.settingslib.search.SearchIndexable;
-import com.android.settingslib.wifi.AccessPoint;
-import com.android.settingslib.wifi.AccessPoint.AccessPointListener;
-import com.android.settingslib.wifi.AccessPointPreference;
+import com.android.settingslib.wifi.LongPressWifiEntryPreference;
 import com.android.settingslib.wifi.WifiSavedConfigUtils;
-import com.android.settingslib.wifi.WifiTracker;
-import com.android.settingslib.wifi.WifiTrackerFactory;
+import com.android.wifitrackerlib.WifiEntry;
+import com.android.wifitrackerlib.WifiEntry.ConnectCallback;
+import com.android.wifitrackerlib.WifiPickerTracker;
 
+import java.time.Clock;
+import java.time.ZoneOffset;
 import java.util.List;
+import java.util.Optional;
 
 /**
- * Two types of UI are provided here.
- *
- * The first is for "usual Settings", appearing as any other Setup fragment.
- *
- * The second is for Setup Wizard, with a simplified interface that hides the action bar
- * and menus.
- *
- * Migrating from Wi-Fi SettingsLib to to WifiTrackerLib, this object will be removed in the near
- * future, please develop in {@link WifiSettings2}.
+ * UI for Wi-Fi settings screen
  */
 @SearchIndexable
 public class WifiSettings extends RestrictedSettingsFragment
-        implements Indexable, WifiTracker.WifiListener, AccessPointListener,
-        WifiDialog.WifiDialogListener, DialogInterface.OnDismissListener {
+        implements Indexable, WifiPickerTracker.WifiPickerTrackerCallback,
+        WifiDialog2.WifiDialog2Listener, DialogInterface.OnDismissListener {
 
     private static final String TAG = "WifiSettings";
 
-    private static final int MENU_ID_CONNECT = Menu.FIRST + 6;
+    // IDs of context menu
+    static final int MENU_ID_CONNECT = Menu.FIRST + 1;
     @VisibleForTesting
-    static final int MENU_ID_FORGET = Menu.FIRST + 7;
-    private static final int MENU_ID_MODIFY = Menu.FIRST + 8;
+    static final int MENU_ID_DISCONNECT = Menu.FIRST + 2;
+    @VisibleForTesting
+    static final int MENU_ID_FORGET = Menu.FIRST + 3;
+    static final int MENU_ID_MODIFY = Menu.FIRST + 4;
 
-    public static final int WIFI_DIALOG_ID = 1;
+    // Max age of tracked WifiEntries
+    private static final long MAX_SCAN_AGE_MILLIS = 15_000;
+    // Interval between initiating WifiPickerTracker scans
+    private static final long SCAN_INTERVAL_MILLIS = 10_000;
 
     @VisibleForTesting
     static final int ADD_NETWORK_REQUEST = 2;
-
     static final int CONFIG_NETWORK_REQUEST = 3;
-
-    // Instance state keys
-    private static final String SAVE_DIALOG_MODE = "dialog_mode";
-    private static final String SAVE_DIALOG_ACCESS_POINT_STATE = "wifi_ap_state";
+    static final int MANAGE_SUBSCRIPTION = 4;
 
     private static final String PREF_KEY_EMPTY_WIFI_LIST = "wifi_empty_list";
+    // TODO(b/70983952): Rename these to use WifiEntry instead of AccessPoint.
     private static final String PREF_KEY_CONNECTED_ACCESS_POINTS = "connected_access_point";
     private static final String PREF_KEY_ACCESS_POINTS = "access_points";
     private static final String PREF_KEY_CONFIGURE_WIFI_SETTINGS = "configure_wifi_settings";
@@ -128,27 +126,48 @@
 
     private static final int REQUEST_CODE_WIFI_DPP_ENROLLEE_QR_CODE_SCANNER = 0;
 
+    public static final int WIFI_DIALOG_ID = 1;
+
+    // Instance state keys
+    private static final String SAVE_DIALOG_MODE = "dialog_mode";
+    private static final String SAVE_DIALOG_WIFIENTRY_KEY = "wifi_ap_key";
+
+    // Cache at onCreateContextMenu and use at onContextItemSelected. Don't use it in other methods.
+    private WifiEntry mSelectedWifiEntry;
+
+    // Save the dialog details
+    private int mDialogMode;
+    private String mDialogWifiEntryKey;
+    private WifiEntry mDialogWifiEntry;
+
+    // This boolean extra specifies whether to enable the Next button when connected. Used by
+    // account creation outside of setup wizard.
+    private static final String EXTRA_ENABLE_NEXT_ON_CONNECT = "wifi_enable_next_on_connect";
+
+    // Enable the Next button when a Wi-Fi network is connected.
+    private boolean mEnableNextOnConnection;
+
+    // This string extra specifies a network to open the connect dialog on, so the user can enter
+    // network credentials.  This is used by quick settings for secured networks, among other
+    // things.
+    private static final String EXTRA_START_CONNECT_SSID = "wifi_start_connect_ssid";
+    private String mOpenSsid;
+
     private static boolean isVerboseLoggingEnabled() {
-        return WifiTracker.sVerboseLogging || Log.isLoggable(TAG, Log.VERBOSE);
+        return WifiPickerTracker.isVerboseLoggingEnabled();
     }
 
-    private final Runnable mUpdateAccessPointsRunnable = () -> {
-        updateAccessPointPreferences();
+    private final Runnable mUpdateWifiEntryPreferencesRunnable = () -> {
+        updateWifiEntryPreferences();
     };
     private final Runnable mHideProgressBarRunnable = () -> {
         setProgressBarVisible(false);
     };
 
-    @VisibleForTesting
-    WifiManager mWifiManager;
-    @VisibleForTesting
-    ConnectivityManager mConnectivityManager;
+    protected WifiManager mWifiManager;
     private WifiManager.ActionListener mConnectListener;
     private WifiManager.ActionListener mSaveListener;
     private WifiManager.ActionListener mForgetListener;
-    @VisibleForTesting
-    CaptivePortalNetworkCallback mCaptivePortalNetworkCallback;
-    private Network mLastNetworkCaptivePortalAppStarted;
 
     /**
      * The state of {@link #isUiRestricted()} at {@link #onCreate(Bundle)}}. This is neccesary to
@@ -158,37 +177,19 @@
     private boolean mIsRestricted;
 
     private WifiEnabler mWifiEnabler;
-    // An access point being edited is stored here.
-    private AccessPoint mSelectedAccessPoint;
 
-    private WifiDialog mDialog;
+    // Worker thread used for WifiPickerTracker work
+    private HandlerThread mWorkerThread;
+
+    @VisibleForTesting
+    WifiPickerTracker mWifiPickerTracker;
+
+    private WifiDialog2 mDialog;
 
     private View mProgressHeader;
 
-    // this boolean extra specifies whether to disable the Next button when not connected. Used by
-    // account creation outside of setup wizard.
-    private static final String EXTRA_ENABLE_NEXT_ON_CONNECT = "wifi_enable_next_on_connect";
-    // This string extra specifies a network to open the connect dialog on, so the user can enter
-    // network credentials.  This is used by quick settings for secured networks, among other
-    // things.
-    public static final String EXTRA_START_CONNECT_SSID = "wifi_start_connect_ssid";
-
-    // should Next button only be enabled when we have a connection?
-    private boolean mEnableNextOnConnection;
-
-    // Save the dialog details
-    private int mDialogMode;
-    private AccessPoint mDlgAccessPoint;
-    private Bundle mAccessPointSavedState;
-
-    @VisibleForTesting
-    WifiTracker mWifiTracker;
-    private String mOpenSsid;
-
-    private AccessPointPreference.UserBadgeCache mUserBadgeCache;
-
-    private PreferenceCategory mConnectedAccessPointPreferenceCategory;
-    private PreferenceCategory mAccessPointsPreferenceCategory;
+    private PreferenceCategory mConnectedWifiEntryPreferenceCategory;
+    private PreferenceCategory mWifiEntryPreferenceCategory;
     @VisibleForTesting
     AddWifiNetworkPreference mAddWifiNetworkPreference;
     @VisibleForTesting
@@ -204,17 +205,6 @@
      * network once connected.
      */
     private boolean mClickedConnect;
-    @ConnectSource int mConnectSource = CONNECT_SOURCE_UNSPECIFIED;
-
-    private static final int CONNECT_SOURCE_UNSPECIFIED = 0;
-    private static final int CONNECT_SOURCE_NETWORK_MENU_ITEM_CLICK = 1;
-    private static final int CONNECT_SOURCE_NETWORK_LIST_ITEM_CLICK = 2;
-
-    @IntDef({CONNECT_SOURCE_UNSPECIFIED, CONNECT_SOURCE_NETWORK_MENU_ITEM_CLICK,
-        CONNECT_SOURCE_NETWORK_LIST_ITEM_CLICK})
-    private @interface ConnectSource {}
-
-    /* End of "used in Wifi Setup context" */
 
     public WifiSettings() {
         super(DISALLOW_CONFIG_WIFI);
@@ -230,25 +220,14 @@
             setProgressBarVisible(false);
         }
         ((SettingsActivity) activity).getSwitchBar().setSwitchBarText(
-                R.string.wifi_settings_master_switch_title,
-                R.string.wifi_settings_master_switch_title);
+                R.string.wifi_settings_primary_switch_title,
+                R.string.wifi_settings_primary_switch_title);
     }
 
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
-        if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlagUtils.SETTINGS_WIFITRACKER2)) {
-            final Intent intent = new Intent("android.settings.WIFI_SETTINGS2");
-            final Bundle extras = getActivity().getIntent().getExtras();
-            if (extras != null) {
-                intent.putExtras(extras);
-            }
-            getContext().startActivity(intent);
-            finish();
-            return;
-        }
-
         // TODO(b/37429702): Add animations and preference comparator back after initial screen is
         // loaded (ODR).
         setAnimationAllowed(false);
@@ -261,15 +240,12 @@
     private void addPreferences() {
         addPreferencesFromResource(R.xml.wifi_settings);
 
-        mConnectedAccessPointPreferenceCategory =
-                (PreferenceCategory) findPreference(PREF_KEY_CONNECTED_ACCESS_POINTS);
-        mAccessPointsPreferenceCategory =
-                (PreferenceCategory) findPreference(PREF_KEY_ACCESS_POINTS);
+        mConnectedWifiEntryPreferenceCategory = findPreference(PREF_KEY_CONNECTED_ACCESS_POINTS);
+        mWifiEntryPreferenceCategory = findPreference(PREF_KEY_ACCESS_POINTS);
         mConfigureWifiSettingsPreference = findPreference(PREF_KEY_CONFIGURE_WIFI_SETTINGS);
         mSavedNetworksPreference = findPreference(PREF_KEY_SAVED_NETWORKS);
         mAddWifiNetworkPreference = new AddWifiNetworkPreference(getPrefContext());
-        mStatusMessagePreference = (LinkablePreference) findPreference(PREF_KEY_STATUS_MESSAGE);
-        mUserBadgeCache = new AccessPointPreference.UserBadgeCache(getPackageManager());
+        mStatusMessagePreference = findPreference(PREF_KEY_STATUS_MESSAGE);
         mDataUsagePreference = findPreference(PREF_KEY_DATA_USAGE);
         mDataUsagePreference.setVisible(DataUsageUtils.hasWifiRadio(getContext()));
         mDataUsagePreference.setTemplate(NetworkTemplate.buildTemplateWifiWildcard(),
@@ -281,13 +257,32 @@
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
-        mWifiTracker = WifiTrackerFactory.create(
-                getActivity(), this, getSettingsLifecycle(), true, true);
-        mWifiManager = mWifiTracker.getManager();
+        final Context context = getContext();
+        mWorkerThread = new HandlerThread(TAG
+                + "{" + Integer.toHexString(System.identityHashCode(this)) + "}",
+                Process.THREAD_PRIORITY_BACKGROUND);
+        mWorkerThread.start();
+        final Clock elapsedRealtimeClock = new SimpleClock(ZoneOffset.UTC) {
+            @Override
+            public long millis() {
+                return SystemClock.elapsedRealtime();
+            }
+        };
+        mWifiPickerTracker = new WifiPickerTracker(getSettingsLifecycle(), context,
+                context.getSystemService(WifiManager.class),
+                context.getSystemService(ConnectivityManager.class),
+                context.getSystemService(NetworkScoreManager.class),
+                new Handler(Looper.getMainLooper()),
+                mWorkerThread.getThreadHandler(),
+                elapsedRealtimeClock,
+                MAX_SCAN_AGE_MILLIS,
+                SCAN_INTERVAL_MILLIS,
+                this);
 
         final Activity activity = getActivity();
+
         if (activity != null) {
-            mConnectivityManager = getActivity().getSystemService(ConnectivityManager.class);
+            mWifiManager = getActivity().getSystemService(WifiManager.class);
         }
 
         mConnectListener = new WifiConnectListener(getActivity());
@@ -323,35 +318,19 @@
                 }
             }
         };
+        registerForContextMenu(getListView());
+        setHasOptionsMenu(true);
 
         if (savedInstanceState != null) {
             mDialogMode = savedInstanceState.getInt(SAVE_DIALOG_MODE);
-            if (savedInstanceState.containsKey(SAVE_DIALOG_ACCESS_POINT_STATE)) {
-                mAccessPointSavedState =
-                        savedInstanceState.getBundle(SAVE_DIALOG_ACCESS_POINT_STATE);
-            }
+            mDialogWifiEntryKey = savedInstanceState.getString(SAVE_DIALOG_WIFIENTRY_KEY);
         }
 
-        // if we're supposed to enable/disable the Next button based on our current connection
-        // state, start it off in the right state
-        Intent intent = getActivity().getIntent();
+        // If we're supposed to enable/disable the Next button based on our current connection
+        // state, start it off in the right state.
+        final Intent intent = getActivity().getIntent();
         mEnableNextOnConnection = intent.getBooleanExtra(EXTRA_ENABLE_NEXT_ON_CONNECT, false);
 
-        if (mEnableNextOnConnection) {
-            if (hasNextButton()) {
-                final ConnectivityManager connectivity = (ConnectivityManager)
-                        getActivity().getSystemService(Context.CONNECTIVITY_SERVICE);
-                if (connectivity != null) {
-                    NetworkInfo info = connectivity.getNetworkInfo(
-                            ConnectivityManager.TYPE_WIFI);
-                    changeNextButtonState(info.isConnected());
-                }
-            }
-        }
-
-        registerForContextMenu(getListView());
-        setHasOptionsMenu(true);
-
         if (intent.hasExtra(EXTRA_START_CONNECT_SSID)) {
             mOpenSsid = intent.getStringExtra(EXTRA_START_CONNECT_SSID);
         }
@@ -359,26 +338,23 @@
 
     @Override
     public void onDestroyView() {
-        super.onDestroyView();
-
         if (mWifiEnabler != null) {
             mWifiEnabler.teardownSwitchController();
         }
+        mWorkerThread.quit();
+
+        super.onDestroyView();
     }
 
     @Override
     public void onStart() {
         super.onStart();
 
-        // On/off switch is hidden for Setup Wizard (returns null)
         mWifiEnabler = createWifiEnabler();
 
         if (mIsRestricted) {
             restrictUi();
-            return;
         }
-
-        onWifiStateChanged(mWifiManager.getWifiState());
     }
 
     private void restrictUi() {
@@ -389,7 +365,7 @@
     }
 
     /**
-     * @return new WifiEnabler or null (as overridden by WifiSettingsForSetupWizard)
+     * @return new WifiEnabler
      */
     private WifiEnabler createWifiEnabler() {
         final SettingsActivity activity = (SettingsActivity) getActivity();
@@ -413,6 +389,8 @@
         if (mWifiEnabler != null) {
             mWifiEnabler.resume(activity);
         }
+
+        changeNextButtonState(mWifiPickerTracker.getConnectedWifiEntry() != null);
     }
 
     @Override
@@ -425,9 +403,8 @@
 
     @Override
     public void onStop() {
-        getView().removeCallbacks(mUpdateAccessPointsRunnable);
+        getView().removeCallbacks(mUpdateWifiEntryPreferencesRunnable);
         getView().removeCallbacks(mHideProgressBarRunnable);
-        unregisterCaptivePortalNetworkCallback();
         super.onStop();
     }
 
@@ -443,14 +420,21 @@
                 if (mDialog != null) {
                     mDialog.dismiss();
                 }
-                mWifiTracker.resumeScanning();
             }
             return;
         } else if (requestCode == CONFIG_NETWORK_REQUEST) {
             if (resultCode == Activity.RESULT_OK) {
-                handleConfigNetworkSubmitEvent(data);
+                final WifiConfiguration wifiConfiguration = data.getParcelableExtra(
+                        ConfigureWifiEntryFragment.NETWORK_CONFIG_KEY);
+                if (wifiConfiguration != null) {
+                    mWifiManager.connect(wifiConfiguration,
+                            new WifiConnectActionListener());
+                }
             }
             return;
+        } else if (requestCode == MANAGE_SUBSCRIPTION) {
+            //Do nothing
+            return;
         }
 
         final boolean formerlyRestricted = mIsRestricted;
@@ -480,78 +464,72 @@
         // If dialog has been shown, save its state.
         if (mDialog != null) {
             outState.putInt(SAVE_DIALOG_MODE, mDialogMode);
-            if (mDlgAccessPoint != null) {
-                mAccessPointSavedState = new Bundle();
-                mDlgAccessPoint.saveWifiState(mAccessPointSavedState);
-                outState.putBundle(SAVE_DIALOG_ACCESS_POINT_STATE, mAccessPointSavedState);
-            }
+            outState.putString(SAVE_DIALOG_WIFIENTRY_KEY, mDialogWifiEntryKey);
         }
     }
 
     @Override
     public void onCreateContextMenu(ContextMenu menu, View view, ContextMenuInfo info) {
         Preference preference = (Preference) view.getTag();
-
-        if (preference instanceof LongPressAccessPointPreference) {
-            mSelectedAccessPoint =
-                    ((LongPressAccessPointPreference) preference).getAccessPoint();
-            menu.setHeaderTitle(mSelectedAccessPoint.getTitle());
-            if (mSelectedAccessPoint.isConnectable()) {
-                menu.add(Menu.NONE, MENU_ID_CONNECT, 0 /* order */, R.string.wifi_connect);
-            }
-
-            WifiConfiguration config = mSelectedAccessPoint.getConfig();
-            // Some configs are ineditable
-            if (WifiUtils.isNetworkLockedDown(getActivity(), config)) {
-                return;
-            }
-
-            // "forget" for normal saved network. And "disconnect" for ephemeral network because it
-            // could only be disconnected and be put in blacklists so it won't be used again.
-            if (mSelectedAccessPoint.isSaved() || mSelectedAccessPoint.isEphemeral()) {
-                final int stringId = mSelectedAccessPoint.isEphemeral() ?
-                        R.string.wifi_disconnect_button_text : R.string.forget;
-                menu.add(Menu.NONE, MENU_ID_FORGET, 0 /* order */, stringId);
-            }
-
-            if (mSelectedAccessPoint.isSaved() && !mSelectedAccessPoint.isActive()) {
-                menu.add(Menu.NONE, MENU_ID_MODIFY, 0 /* order */, R.string.wifi_modify);
-            }
+        if (!(preference instanceof LongPressWifiEntryPreference)) {
+            // Do nothing.
+            return;
         }
+
+        // Cache the WifiEntry for onContextItemSelected. Don't use it in other methods.
+        mSelectedWifiEntry = ((LongPressWifiEntryPreference) preference).getWifiEntry();
+
+        menu.setHeaderTitle(mSelectedWifiEntry.getTitle());
+        if (mSelectedWifiEntry.canConnect()) {
+            menu.add(Menu.NONE, MENU_ID_CONNECT, 0 /* order */, R.string.wifi_connect);
+        }
+
+        if (mSelectedWifiEntry.canDisconnect()) {
+            menu.add(Menu.NONE, MENU_ID_DISCONNECT, 0 /* order */,
+                    R.string.wifi_disconnect_button_text);
+        }
+
+        // "forget" for normal saved network. And "disconnect" for ephemeral network because it
+        // could only be disconnected and be put in blocklists so it won't be used again.
+        if (canForgetNetwork()) {
+            menu.add(Menu.NONE, MENU_ID_FORGET, 0 /* order */, R.string.forget);
+        }
+
+        WifiConfiguration config = mSelectedWifiEntry.getWifiConfiguration();
+        // Some configs are ineditable
+        if (WifiUtils.isNetworkLockedDown(getActivity(), config)) {
+            return;
+        }
+
+        if (mSelectedWifiEntry.isSaved() && mSelectedWifiEntry.getConnectedState()
+                != WifiEntry.CONNECTED_STATE_CONNECTED) {
+            menu.add(Menu.NONE, MENU_ID_MODIFY, 0 /* order */, R.string.wifi_modify);
+        }
+    }
+
+    private boolean canForgetNetwork() {
+        return mSelectedWifiEntry.canForget() && !WifiUtils.isNetworkLockedDown(getActivity(),
+                mSelectedWifiEntry.getWifiConfiguration());
     }
 
     @Override
     public boolean onContextItemSelected(MenuItem item) {
-        if (mSelectedAccessPoint == null) {
-            return super.onContextItemSelected(item);
-        }
         switch (item.getItemId()) {
-            case MENU_ID_CONNECT: {
-                boolean isSavedNetwork = mSelectedAccessPoint.isSaved();
-                if (isSavedNetwork) {
-                    connect(mSelectedAccessPoint.getConfig(), isSavedNetwork,
-                            CONNECT_SOURCE_NETWORK_MENU_ITEM_CLICK);
-                } else if ((mSelectedAccessPoint.getSecurity() == AccessPoint.SECURITY_NONE) ||
-                        (mSelectedAccessPoint.getSecurity() == AccessPoint.SECURITY_OWE)) {
-                    /** Bypass dialog for unsecured networks */
-                    mSelectedAccessPoint.generateOpenNetworkConfig();
-                    connect(mSelectedAccessPoint.getConfig(), isSavedNetwork,
-                            CONNECT_SOURCE_NETWORK_MENU_ITEM_CLICK);
-                } else {
-                    showDialog(mSelectedAccessPoint, WifiConfigUiBase.MODE_CONNECT);
-                }
+            case MENU_ID_CONNECT:
+                connect(mSelectedWifiEntry, true /* editIfNoConfig */, false /* fullScreenEdit */);
                 return true;
-            }
-            case MENU_ID_FORGET: {
-                forget();
+            case MENU_ID_DISCONNECT:
+                mSelectedWifiEntry.disconnect(null /* callback */);
                 return true;
-            }
-            case MENU_ID_MODIFY: {
-                showDialog(mSelectedAccessPoint, WifiConfigUiBase.MODE_MODIFY);
+            case MENU_ID_FORGET:
+                forget(mSelectedWifiEntry);
                 return true;
-            }
+            case MENU_ID_MODIFY:
+                showDialog(mSelectedWifiEntry, WifiConfigUiBase2.MODE_MODIFY);
+                return true;
+            default:
+                return super.onContextItemSelected(item);
         }
-        return super.onContextItemSelected(item);
     }
 
     @Override
@@ -562,44 +540,16 @@
             return super.onPreferenceTreeClick(preference);
         }
 
-        if (preference instanceof LongPressAccessPointPreference) {
-            mSelectedAccessPoint = ((LongPressAccessPointPreference) preference).getAccessPoint();
-            if (mSelectedAccessPoint == null) {
-                return false;
-            }
-            if (mSelectedAccessPoint.isActive()) {
-                return super.onPreferenceTreeClick(preference);
-            }
-            /**
-             * Bypass dialog and connect to unsecured networks, or previously connected saved
-             * networks, or Passpoint provided networks.
-             */
-            switch (WifiUtils.getConnectingType(mSelectedAccessPoint)) {
-                case WifiUtils.CONNECT_TYPE_OSU_PROVISION:
-                    mSelectedAccessPoint.startOsuProvisioning(mConnectListener);
-                    mClickedConnect = true;
-                    break;
+        if (preference instanceof LongPressWifiEntryPreference) {
+            final WifiEntry selectedEntry =
+                    ((LongPressWifiEntryPreference) preference).getWifiEntry();
 
-                case WifiUtils.CONNECT_TYPE_OPEN_NETWORK:
-                    mSelectedAccessPoint.generateOpenNetworkConfig();
-                    connect(mSelectedAccessPoint.getConfig(),
-                            mSelectedAccessPoint.isSaved(),
-                            CONNECT_SOURCE_NETWORK_LIST_ITEM_CLICK);
-                    break;
-
-                case WifiUtils.CONNECT_TYPE_SAVED_NETWORK:
-                    connect(mSelectedAccessPoint.getConfig(),
-                            true /* isSavedNetwork */,
-                            CONNECT_SOURCE_NETWORK_LIST_ITEM_CLICK);
-                    break;
-
-                default:
-                    final Bundle bundle = ((LongPressAccessPointPreference) preference).getExtras();
-                    mSelectedAccessPoint.saveWifiState(bundle);
-                    launchConfigNewNetworkFragment(mSelectedAccessPoint,
-                            WifiConfigUiBase.MODE_CONNECT, bundle);
-                    break;
+            if (selectedEntry.shouldEditBeforeConnect()) {
+                launchConfigNewNetworkFragment(selectedEntry);
+                return true;
             }
+
+            connect(selectedEntry, true /* editIfNoConfig */, true /* fullScreenEdit */);
         } else if (preference == mAddWifiNetworkPreference) {
             onAddNetworkPressed();
         } else {
@@ -608,14 +558,12 @@
         return true;
     }
 
-    private void showDialog(AccessPoint accessPoint, int dialogMode) {
-        if (accessPoint != null) {
-            WifiConfiguration config = accessPoint.getConfig();
-            if (WifiUtils.isNetworkLockedDown(getActivity(), config) && accessPoint.isActive()) {
-                RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getActivity(),
-                        RestrictedLockUtilsInternal.getDeviceOwner(getActivity()));
-                return;
-            }
+    private void showDialog(WifiEntry wifiEntry, int dialogMode) {
+        if (WifiUtils.isNetworkLockedDown(getActivity(), wifiEntry.getWifiConfiguration())
+                && wifiEntry.getConnectedState() == WifiEntry.CONNECTED_STATE_CONNECTED) {
+            RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getActivity(),
+                    RestrictedLockUtilsInternal.getDeviceOwner(getActivity()));
+            return;
         }
 
         if (mDialog != null) {
@@ -624,7 +572,8 @@
         }
 
         // Save the access point and edit mode
-        mDlgAccessPoint = accessPoint;
+        mDialogWifiEntry = wifiEntry;
+        mDialogWifiEntryKey = wifiEntry.getKey();
         mDialogMode = dialogMode;
 
         showDialog(WIFI_DIALOG_ID);
@@ -635,18 +584,12 @@
         switch (dialogId) {
             case WIFI_DIALOG_ID:
                 // modify network
-                if (mDlgAccessPoint == null && mAccessPointSavedState != null) {
-                    // restore AP from save state
-                    mDlgAccessPoint = new AccessPoint(getActivity(), mAccessPointSavedState);
-                    // Reset the saved access point data
-                    mAccessPointSavedState = null;
-                }
-                mDialog = WifiDialog
-                        .createModal(getActivity(), this, mDlgAccessPoint, mDialogMode);
-                mSelectedAccessPoint = mDlgAccessPoint;
+                mDialog = WifiDialog2
+                        .createModal(getActivity(), this, mDialogWifiEntry, mDialogMode);
                 return mDialog;
+            default:
+                return super.onCreateDialog(dialogId);
         }
-        return super.onCreateDialog(dialogId);
     }
 
     @Override
@@ -659,6 +602,8 @@
     public void onDismiss(DialogInterface dialog) {
         // We don't keep any dialog object when dialog was dismissed.
         mDialog = null;
+        mDialogWifiEntry = null;
+        mDialogWifiEntryKey = null;
     }
 
     @Override
@@ -671,56 +616,33 @@
         }
     }
 
-    /**
-     * Called to indicate the list of AccessPoints has been updated and
-     * getAccessPoints should be called to get the latest information.
-     */
-    @Override
-    public void onAccessPointsChanged() {
-        Log.d(TAG, "onAccessPointsChanged (WifiTracker) callback initiated");
-        updateAccessPointsDelayed();
-    }
-
-    /**
-     * Updates access points from {@link WifiManager#getScanResults()}. Adds a delay to have
-     * progress bar displayed before starting to modify APs.
-     */
-    private void updateAccessPointsDelayed() {
-        // Safeguard from some delayed event handling
-        if (getActivity() != null && !mIsRestricted && mWifiManager.isWifiEnabled()) {
-            final View view = getView();
-            final Handler handler = view.getHandler();
-            if (handler != null && handler.hasCallbacks(mUpdateAccessPointsRunnable)) {
-                return;
-            }
-            setProgressBarVisible(true);
-            view.postDelayed(mUpdateAccessPointsRunnable, 300 /* delay milliseconds */);
-        }
-    }
-
     /** Called when the state of Wifi has changed. */
     @Override
-    public void onWifiStateChanged(int state) {
+    public void onWifiStateChanged() {
         if (mIsRestricted) {
             return;
         }
+        final int wifiState = mWifiPickerTracker.getWifiState();
 
-        final int wifiState = mWifiManager.getWifiState();
+        if (isVerboseLoggingEnabled()) {
+            Log.i(TAG, "onWifiStateChanged called with wifi state: " + wifiState);
+        }
+
         switch (wifiState) {
             case WifiManager.WIFI_STATE_ENABLED:
-                updateAccessPointPreferences();
+                updateWifiEntryPreferences();
                 break;
 
             case WifiManager.WIFI_STATE_ENABLING:
-                removeConnectedAccessPointPreference();
-                removeAccessPointPreference();
+                removeConnectedWifiEntryPreference();
+                removeWifiEntryPreference();
                 addMessagePreference(R.string.wifi_starting);
                 setProgressBarVisible(true);
                 break;
 
             case WifiManager.WIFI_STATE_DISABLING:
-                removeConnectedAccessPointPreference();
-                removeAccessPointPreference();
+                removeConnectedWifiEntryPreference();
+                removeWifiEntryPreference();
                 addMessagePreference(R.string.wifi_stopping);
                 break;
 
@@ -728,241 +650,182 @@
                 setOffMessage();
                 setAdditionalSettingsSummaries();
                 setProgressBarVisible(false);
-                mConnectSource = CONNECT_SOURCE_UNSPECIFIED;
                 mClickedConnect = false;
                 break;
         }
     }
 
-    /**
-     * Called when the connection state of wifi has changed.
-     */
     @Override
-    public void onConnectedChanged() {
-        changeNextButtonState(mWifiTracker.isConnected());
-    }
+    public void onWifiEntriesChanged() {
+        updateWifiEntryPreferencesDelayed();
+        changeNextButtonState(mWifiPickerTracker.getConnectedWifiEntry() != null);
 
-    /** Helper method to return whether an AccessPoint is disabled due to a wrong password */
-    private static boolean isDisabledByWrongPassword(AccessPoint accessPoint) {
-        WifiConfiguration config = accessPoint.getConfig();
-        if (config == null) {
-            return false;
-        }
-        WifiConfiguration.NetworkSelectionStatus networkStatus =
-                config.getNetworkSelectionStatus();
-        if (networkStatus == null
-                || networkStatus.getNetworkSelectionStatus() == NETWORK_SELECTION_ENABLED) {
-            return false;
-        }
-        int reason = networkStatus.getNetworkSelectionDisableReason();
-        return WifiConfiguration.NetworkSelectionStatus.DISABLED_BY_WRONG_PASSWORD == reason;
-    }
-
-    private void updateAccessPointPreferences() {
-        // in case state has changed
-        if (!mWifiManager.isWifiEnabled()) {
-            return;
-        }
-        // AccessPoints are sorted by the WifiTracker
-        final List<AccessPoint> accessPoints = mWifiTracker.getAccessPoints();
-        if (isVerboseLoggingEnabled()) {
-            Log.i(TAG, "updateAccessPoints called for: " + accessPoints);
-        }
-
-        boolean hasAvailableAccessPoints = false;
-        mStatusMessagePreference.setVisible(false);
-        mConnectedAccessPointPreferenceCategory.setVisible(true);
-        mAccessPointsPreferenceCategory.setVisible(true);
-
-        cacheRemoveAllPrefs(mAccessPointsPreferenceCategory);
-
-        int index =
-                configureConnectedAccessPointPreferenceCategory(accessPoints) ? 1 : 0;
-        int numAccessPoints = accessPoints.size();
-        for (; index < numAccessPoints; index++) {
-            AccessPoint accessPoint = accessPoints.get(index);
-            // Ignore access points that are out of range.
-            if (accessPoint.isReachable()) {
-                String key = accessPoint.getKey();
-                hasAvailableAccessPoints = true;
-                LongPressAccessPointPreference pref =
-                        (LongPressAccessPointPreference) getCachedPreference(key);
-                if (pref != null) {
-                    pref.setOrder(index);
-                    continue;
-                }
-                LongPressAccessPointPreference preference =
-                        createLongPressAccessPointPreference(accessPoint);
-                preference.setKey(key);
-                preference.setOrder(index);
-                if (mOpenSsid != null && mOpenSsid.equals(accessPoint.getSsidStr())
-                        && (accessPoint.getSecurity() != AccessPoint.SECURITY_NONE &&
-                        accessPoint.getSecurity() != AccessPoint.SECURITY_OWE)) {
-                    if (!accessPoint.isSaved() || isDisabledByWrongPassword(accessPoint)) {
-                        onPreferenceTreeClick(preference);
-                        mOpenSsid = null;
-                    }
-                }
-                mAccessPointsPreferenceCategory.addPreference(preference);
-                accessPoint.setListener(WifiSettings.this);
-                preference.refresh();
+        // Edit the Wi-Fi network of specified SSID.
+        if (mOpenSsid != null) {
+            Optional<WifiEntry> matchedWifiEntry = mWifiPickerTracker.getWifiEntries().stream()
+                    .filter(wifiEntry -> TextUtils.equals(mOpenSsid, wifiEntry.getSsid()))
+                    .filter(wifiEntry -> wifiEntry.getSecurity() != WifiEntry.SECURITY_NONE
+                            && wifiEntry.getSecurity() != WifiEntry.SECURITY_OWE)
+                    .filter(wifiEntry -> !wifiEntry.isSaved()
+                            || isDisabledByWrongPassword(wifiEntry))
+                    .findFirst();
+            if (matchedWifiEntry.isPresent()) {
+                mOpenSsid = null;
+                launchConfigNewNetworkFragment(matchedWifiEntry.get());
             }
         }
-        removeCachedPrefs(mAccessPointsPreferenceCategory);
-        mAddWifiNetworkPreference.setOrder(index);
-        mAccessPointsPreferenceCategory.addPreference(mAddWifiNetworkPreference);
-        setAdditionalSettingsSummaries();
+    }
 
-        if (!hasAvailableAccessPoints) {
+    @Override
+    public void onNumSavedNetworksChanged() {
+        if (isFinishingOrDestroyed()) {
+            return;
+        }
+        setAdditionalSettingsSummaries();
+    }
+
+    @Override
+    public void onNumSavedSubscriptionsChanged() {
+        if (isFinishingOrDestroyed()) {
+            return;
+        }
+        setAdditionalSettingsSummaries();
+    }
+
+    /**
+     * Updates WifiEntries from {@link WifiPickerTracker#getWifiEntries()}. Adds a delay to have
+     * progress bar displayed before starting to modify entries.
+     */
+    private void updateWifiEntryPreferencesDelayed() {
+        // Safeguard from some delayed event handling
+        if (getActivity() != null && !mIsRestricted
+                && mWifiPickerTracker.getWifiState() == WifiManager.WIFI_STATE_ENABLED) {
+            final View view = getView();
+            final Handler handler = view.getHandler();
+            if (handler != null && handler.hasCallbacks(mUpdateWifiEntryPreferencesRunnable)) {
+                return;
+            }
+            setProgressBarVisible(true);
+            view.postDelayed(mUpdateWifiEntryPreferencesRunnable, 300);
+        }
+    }
+
+    private void updateWifiEntryPreferences() {
+        // in case state has changed
+        if (mWifiPickerTracker.getWifiState() != WifiManager.WIFI_STATE_ENABLED) {
+            return;
+        }
+
+        boolean hasAvailableWifiEntries = false;
+        mStatusMessagePreference.setVisible(false);
+        mWifiEntryPreferenceCategory.setVisible(true);
+
+        final WifiEntry connectedEntry = mWifiPickerTracker.getConnectedWifiEntry();
+        mConnectedWifiEntryPreferenceCategory.setVisible(connectedEntry != null);
+        if (connectedEntry != null) {
+            final LongPressWifiEntryPreference connectedPref =
+                    mConnectedWifiEntryPreferenceCategory.findPreference(connectedEntry.getKey());
+            if (connectedPref == null || connectedPref.getWifiEntry() != connectedEntry) {
+                mConnectedWifiEntryPreferenceCategory.removeAll();
+                final ConnectedWifiEntryPreference pref =
+                        new ConnectedWifiEntryPreference(getPrefContext(), connectedEntry, this);
+                pref.setKey(connectedEntry.getKey());
+                pref.refresh();
+                mConnectedWifiEntryPreferenceCategory.addPreference(pref);
+                pref.setOnPreferenceClickListener(preference -> {
+                    if (connectedEntry.canSignIn()) {
+                        connectedEntry.signIn(null /* callback */);
+                    } else {
+                        launchNetworkDetailsFragment(pref);
+                    }
+                    return true;
+                });
+                pref.setOnGearClickListener(preference -> {
+                    launchNetworkDetailsFragment(pref);
+                });
+
+                if (mClickedConnect) {
+                    mClickedConnect = false;
+                    scrollToPreference(mConnectedWifiEntryPreferenceCategory);
+                }
+            }
+        } else {
+            mConnectedWifiEntryPreferenceCategory.removeAll();
+        }
+
+        int index = 0;
+        cacheRemoveAllPrefs(mWifiEntryPreferenceCategory);
+        List<WifiEntry> wifiEntries = mWifiPickerTracker.getWifiEntries();
+        for (WifiEntry wifiEntry : wifiEntries) {
+            hasAvailableWifiEntries = true;
+
+            String key = wifiEntry.getKey();
+            LongPressWifiEntryPreference pref =
+                    (LongPressWifiEntryPreference) getCachedPreference(key);
+            if (pref != null) {
+                if (pref.getWifiEntry() == wifiEntry) {
+                    pref.setOrder(index++);
+                    continue;
+                } else {
+                    // Create a new preference if the underlying WifiEntry object has changed
+                    removePreference(key);
+                }
+            }
+
+            pref = createLongPressWifiEntryPreference(wifiEntry);
+            pref.setKey(wifiEntry.getKey());
+            pref.setOrder(index++);
+            pref.refresh();
+
+            if (wifiEntry.getHelpUriString() != null) {
+                pref.setOnButtonClickListener(preference -> {
+                    openSubscriptionHelpPage(wifiEntry);
+                });
+            }
+            mWifiEntryPreferenceCategory.addPreference(pref);
+        }
+        removeCachedPrefs(mWifiEntryPreferenceCategory);
+
+        if (!hasAvailableWifiEntries) {
             setProgressBarVisible(true);
             Preference pref = new Preference(getPrefContext());
             pref.setSelectable(false);
             pref.setSummary(R.string.wifi_empty_list_wifi_on);
             pref.setOrder(index++);
             pref.setKey(PREF_KEY_EMPTY_WIFI_LIST);
-            mAccessPointsPreferenceCategory.addPreference(pref);
+            mWifiEntryPreferenceCategory.addPreference(pref);
         } else {
             // Continuing showing progress bar for an additional delay to overlap with animation
             getView().postDelayed(mHideProgressBarRunnable, 1700 /* delay millis */);
         }
+
+        mAddWifiNetworkPreference.setOrder(index++);
+        mWifiEntryPreferenceCategory.addPreference(mAddWifiNetworkPreference);
+        setAdditionalSettingsSummaries();
     }
 
-    @NonNull
-    private LongPressAccessPointPreference createLongPressAccessPointPreference(
-            AccessPoint accessPoint) {
-        return new LongPressAccessPointPreference(accessPoint, getPrefContext(), mUserBadgeCache,
-                false /* forSavedNetworks */, R.drawable.ic_wifi_signal_0, this);
+    private void launchNetworkDetailsFragment(LongPressWifiEntryPreference pref) {
+        final WifiEntry wifiEntry = pref.getWifiEntry();
+        final Context context = getContext();
+        final CharSequence title =
+                FeatureFlagUtils.isEnabled(context, FeatureFlags.WIFI_DETAILS_DATAUSAGE_HEADER)
+                        ? wifiEntry.getTitle()
+                        : context.getText(R.string.pref_title_network_details);
+
+        final Bundle bundle = new Bundle();
+        bundle.putString(WifiNetworkDetailsFragment2.KEY_CHOSEN_WIFIENTRY_KEY, wifiEntry.getKey());
+
+        new SubSettingLauncher(context)
+                .setTitleText(title)
+                .setDestination(WifiNetworkDetailsFragment2.class.getName())
+                .setArguments(bundle)
+                .setSourceMetricsCategory(getMetricsCategory())
+                .launch();
     }
 
-    @NonNull
     @VisibleForTesting
-    ConnectedAccessPointPreference createConnectedAccessPointPreference(
-            AccessPoint accessPoint, Context context) {
-        return new ConnectedAccessPointPreference(accessPoint, context, mUserBadgeCache,
-                R.drawable.ic_wifi_signal_0, false /* forSavedNetworks */, this);
-    }
-
-    /**
-     * Configure the ConnectedAccessPointPreferenceCategory and return true if the Category was
-     * shown.
-     */
-    private boolean configureConnectedAccessPointPreferenceCategory(
-            List<AccessPoint> accessPoints) {
-        if (accessPoints.size() == 0) {
-            removeConnectedAccessPointPreference();
-            return false;
-        }
-
-        AccessPoint connectedAp = accessPoints.get(0);
-        if (!connectedAp.isActive()) {
-            removeConnectedAccessPointPreference();
-            return false;
-        }
-
-        // Is the preference category empty?
-        if (mConnectedAccessPointPreferenceCategory.getPreferenceCount() == 0) {
-            addConnectedAccessPointPreference(connectedAp);
-            return true;
-        }
-
-        // Is the previous currently connected SSID different from the new one?
-        ConnectedAccessPointPreference preference =
-                (ConnectedAccessPointPreference)
-                        (mConnectedAccessPointPreferenceCategory.getPreference(0));
-        // The AccessPoints need to be the same reference to ensure that updates are reflected
-        // in the UI.
-        if (preference.getAccessPoint() != connectedAp) {
-            removeConnectedAccessPointPreference();
-            addConnectedAccessPointPreference(connectedAp);
-            return true;
-        }
-
-        // Else same AP is connected, simply refresh the connected access point preference
-        // (first and only access point in this category).
-        preference.refresh();
-        // Update any potential changes to the connected network and ensure that the callback is
-        // registered after an onStop lifecycle event.
-        registerCaptivePortalNetworkCallback(getCurrentWifiNetwork(), preference);
-        return true;
-    }
-
-    /**
-     * Creates a Preference for the given {@link AccessPoint} and adds it to the
-     * {@link #mConnectedAccessPointPreferenceCategory}.
-     */
-    private void addConnectedAccessPointPreference(AccessPoint connectedAp) {
-        final ConnectedAccessPointPreference pref =
-                createConnectedAccessPointPreference(connectedAp, getPrefContext());
-        registerCaptivePortalNetworkCallback(getCurrentWifiNetwork(), pref);
-
-        // Launch details page or captive portal on click.
-        pref.setOnPreferenceClickListener(
-                preference -> {
-                    pref.getAccessPoint().saveWifiState(pref.getExtras());
-                    if (mCaptivePortalNetworkCallback != null
-                            && mCaptivePortalNetworkCallback.isCaptivePortal()) {
-                        startCaptivePortalApp(
-                                mCaptivePortalNetworkCallback.getNetwork());
-                    } else {
-                        launchNetworkDetailsFragment(pref);
-                    }
-                    return true;
-                });
-
-        pref.setOnGearClickListener(
-                preference -> {
-                    pref.getAccessPoint().saveWifiState(pref.getExtras());
-                    launchNetworkDetailsFragment(pref);
-                });
-
-        pref.refresh();
-
-        mConnectedAccessPointPreferenceCategory.addPreference(pref);
-        mConnectedAccessPointPreferenceCategory.setVisible(true);
-        if (mClickedConnect) {
-            mClickedConnect = false;
-            scrollToPreference(mConnectedAccessPointPreferenceCategory);
-        }
-    }
-
-    private void registerCaptivePortalNetworkCallback(
-            Network wifiNetwork, ConnectedAccessPointPreference pref) {
-        if (wifiNetwork == null || pref == null) {
-            Log.w(TAG, "Network or Preference were null when registering callback.");
-            return;
-        }
-
-        if (mCaptivePortalNetworkCallback != null
-                && mCaptivePortalNetworkCallback.isSameNetworkAndPreference(wifiNetwork, pref)) {
-            return;
-        }
-
-        unregisterCaptivePortalNetworkCallback();
-
-        mCaptivePortalNetworkCallback = new CaptivePortalNetworkCallback(wifiNetwork, pref) {
-            @Override
-            public void onCaptivePortalCapabilityChanged() {
-                checkStartCaptivePortalApp();
-            }
-        };
-        mConnectivityManager.registerNetworkCallback(
-                new NetworkRequest.Builder()
-                        .clearCapabilities()
-                        .addTransportType(TRANSPORT_WIFI)
-                        .build(),
-                mCaptivePortalNetworkCallback,
-                new Handler(Looper.getMainLooper()));
-    }
-
-    private void unregisterCaptivePortalNetworkCallback() {
-        if (mCaptivePortalNetworkCallback != null) {
-            try {
-                mConnectivityManager.unregisterNetworkCallback(mCaptivePortalNetworkCallback);
-            } catch (RuntimeException e) {
-                Log.e(TAG, "Unregistering CaptivePortalNetworkCallback failed.", e);
-            }
-            mCaptivePortalNetworkCallback = null;
-        }
+    LongPressWifiEntryPreference createLongPressWifiEntryPreference(WifiEntry wifiEntry) {
+        return new LongPressWifiEntryPreference(getPrefContext(), wifiEntry, this);
     }
 
     private void launchAddNetworkFragment() {
@@ -974,36 +837,15 @@
                 .launch();
     }
 
-    private void launchNetworkDetailsFragment(ConnectedAccessPointPreference pref) {
-        final AccessPoint accessPoint = pref.getAccessPoint();
-        final Context context = getContext();
-        final CharSequence title =
-                FeatureFlagUtils.isEnabled(context, FeatureFlags.WIFI_DETAILS_DATAUSAGE_HEADER)
-                        ? accessPoint.getTitle()
-                        : context.getText(R.string.pref_title_network_details);
-
-        new SubSettingLauncher(getContext())
-                .setTitleText(title)
-                .setDestination(WifiNetworkDetailsFragment.class.getName())
-                .setArguments(pref.getExtras())
-                .setSourceMetricsCategory(getMetricsCategory())
-                .launch();
+    /** Removes all preferences and hide the {@link #mConnectedWifiEntryPreferenceCategory}. */
+    private void removeConnectedWifiEntryPreference() {
+        mConnectedWifiEntryPreferenceCategory.removeAll();
+        mConnectedWifiEntryPreferenceCategory.setVisible(false);
     }
 
-    private Network getCurrentWifiNetwork() {
-        return mWifiManager != null ? mWifiManager.getCurrentNetwork() : null;
-    }
-
-    /** Removes all preferences and hide the {@link #mConnectedAccessPointPreferenceCategory}. */
-    private void removeConnectedAccessPointPreference() {
-        mConnectedAccessPointPreferenceCategory.removeAll();
-        mConnectedAccessPointPreferenceCategory.setVisible(false);
-        unregisterCaptivePortalNetworkCallback();
-    }
-
-    private void removeAccessPointPreference() {
-        mAccessPointsPreferenceCategory.removeAll();
-        mAccessPointsPreferenceCategory.setVisible(false);
+    private void removeWifiEntryPreference() {
+        mWifiEntryPreferenceCategory.removeAll();
+        mWifiEntryPreferenceCategory.setVisible(false);
     }
 
     @VisibleForTesting
@@ -1013,36 +855,30 @@
                         ? R.string.wifi_configure_settings_preference_summary_wakeup_on
                         : R.string.wifi_configure_settings_preference_summary_wakeup_off));
 
-        final List<AccessPoint> savedNetworks =
-                WifiSavedConfigUtils.getAllConfigs(getContext(), mWifiManager);
-        final int numSavedNetworks = (savedNetworks != null) ? savedNetworks.size() : 0;
-        mSavedNetworksPreference.setVisible(numSavedNetworks > 0);
-        if (numSavedNetworks > 0) {
+        final int numSavedNetworks = mWifiPickerTracker.getNumSavedNetworks();
+        final int numSavedSubscriptions = mWifiPickerTracker.getNumSavedSubscriptions();
+        if (numSavedNetworks + numSavedSubscriptions > 0) {
+            mSavedNetworksPreference.setVisible(true);
             mSavedNetworksPreference.setSummary(
-                    getSavedNetworkSettingsSummaryText(savedNetworks, numSavedNetworks));
+                    getSavedNetworkSettingsSummaryText(numSavedNetworks, numSavedSubscriptions));
+        } else {
+            mSavedNetworksPreference.setVisible(false);
         }
     }
 
     private String getSavedNetworkSettingsSummaryText(
-            List<AccessPoint> savedNetworks, int numSavedNetworks) {
-        int numSavedPasspointNetworks = 0;
-        for (AccessPoint savedNetwork : savedNetworks) {
-            if (savedNetwork.isPasspointConfig() || savedNetwork.isPasspoint()) {
-                numSavedPasspointNetworks++;
-            }
-        }
-        final int numSavedNormalNetworks = numSavedNetworks - numSavedPasspointNetworks;
-
-        if (numSavedNetworks == numSavedNormalNetworks) {
+            int numSavedNetworks, int numSavedSubscriptions) {
+        if (numSavedSubscriptions == 0) {
             return getResources().getQuantityString(R.plurals.wifi_saved_access_points_summary,
-                    numSavedNormalNetworks, numSavedNormalNetworks);
-        } else if (numSavedNetworks == numSavedPasspointNetworks) {
+                    numSavedNetworks, numSavedNetworks);
+        } else if (numSavedNetworks == 0) {
             return getResources().getQuantityString(
                     R.plurals.wifi_saved_passpoint_access_points_summary,
-                    numSavedPasspointNetworks, numSavedPasspointNetworks);
+                    numSavedSubscriptions, numSavedSubscriptions);
         } else {
+            final int numTotalEntries = numSavedNetworks + numSavedSubscriptions;
             return getResources().getQuantityString(R.plurals.wifi_saved_all_access_points_summary,
-                    numSavedNetworks, numSavedNetworks);
+                    numTotalEntries, numTotalEntries);
         }
     }
 
@@ -1073,8 +909,8 @@
                         .setSourceMetricsCategory(getMetricsCategory())
                         .launch();
         mStatusMessagePreference.setText(title, description, clickListener);
-        removeConnectedAccessPointPreference();
-        removeAccessPointPreference();
+        removeConnectedWifiEntryPreference();
+        removeWifiEntryPreference();
         mStatusMessagePreference.setVisible(true);
     }
 
@@ -1090,107 +926,11 @@
         }
     }
 
-    /**
-     * Renames/replaces "Next" button when appropriate. "Next" button usually exists in
-     * Wifi setup screens, not in usual wifi settings screen.
-     *
-     * @param enabled true when the device is connected to a wifi network.
-     */
-    private void changeNextButtonState(boolean enabled) {
-        if (mEnableNextOnConnection && hasNextButton()) {
-            getNextButton().setEnabled(enabled);
-        }
-    }
-
-    @Override
-    public void onForget(WifiDialog dialog) {
-        forget();
-    }
-
-    @Override
-    public void onSubmit(WifiDialog dialog) {
-        if (mDialog != null) {
-            submit(mDialog.getController());
-        }
-    }
-
-    @Override
-    public void onScan(WifiDialog dialog, String ssid) {
-        // Launch QR code scanner to join a network.
-        startActivityForResult(WifiDppUtils.getEnrolleeQrCodeScannerIntent(ssid),
-                REQUEST_CODE_WIFI_DPP_ENROLLEE_QR_CODE_SCANNER);
-    }
-
-    /* package */ void submit(WifiConfigController configController) {
-
-        final WifiConfiguration config = configController.getConfig();
-
-        if (config == null) {
-            if (mSelectedAccessPoint != null
-                    && mSelectedAccessPoint.isSaved()) {
-                connect(mSelectedAccessPoint.getConfig(),
-                        true /* isSavedNetwork */,
-                        CONNECT_SOURCE_UNSPECIFIED);
-            }
-        } else if (configController.getMode() == WifiConfigUiBase.MODE_MODIFY) {
-            mWifiManager.save(config, mSaveListener);
-        } else {
-            mWifiManager.save(config, mSaveListener);
-            if (mSelectedAccessPoint != null) { // Not an "Add network"
-                connect(config, false /* isSavedNetwork */,
-                        CONNECT_SOURCE_UNSPECIFIED);
-            }
-        }
-
-        mWifiTracker.resumeScanning();
-    }
-
-    /* package */ void forget() {
-        mMetricsFeatureProvider.action(getActivity(), SettingsEnums.ACTION_WIFI_FORGET);
-        if (!mSelectedAccessPoint.isSaved()) {
-            if (mSelectedAccessPoint.getNetworkInfo() != null &&
-                    mSelectedAccessPoint.getNetworkInfo().getState() != State.DISCONNECTED) {
-                // Network is active but has no network ID - must be ephemeral.
-                mWifiManager.disableEphemeralNetwork(
-                        AccessPoint.convertToQuotedString(mSelectedAccessPoint.getSsidStr()));
-            } else {
-                // Should not happen, but a monkey seems to trigger it
-                Log.e(TAG, "Failed to forget invalid network " + mSelectedAccessPoint.getConfig());
-                return;
-            }
-        } else if (mSelectedAccessPoint.getConfig().isPasspoint()) {
-            try {
-                mWifiManager.removePasspointConfiguration(mSelectedAccessPoint.getConfig().FQDN);
-            } catch (IllegalArgumentException e) {
-                Log.e(TAG, "Failed to remove Passpoint configuration with error: " + e);
-                return;
-            }
-        } else {
-            mWifiManager.forget(mSelectedAccessPoint.getConfig().networkId, mForgetListener);
-        }
-
-        mWifiTracker.resumeScanning();
-
-        // We need to rename/replace "Next" button in wifi setup context.
-        changeNextButtonState(false);
-    }
-
-    protected void connect(final WifiConfiguration config,
-            boolean isSavedNetwork, @ConnectSource int connectSource) {
-        // Log subtype if configuration is a saved network.
-        mMetricsFeatureProvider.action(getContext(), SettingsEnums.ACTION_WIFI_CONNECT,
-                isSavedNetwork);
-        mConnectSource = connectSource;
-        mWifiManager.connect(config, mConnectListener);
-        mClickedConnect = true;
-    }
-
     @VisibleForTesting
     void handleAddNetworkRequest(int result, Intent data) {
         if (result == Activity.RESULT_OK) {
             handleAddNetworkSubmitEvent(data);
         }
-        mWifiTracker.resumeScanning();
     }
 
     private void handleAddNetworkSubmitEvent(Intent data) {
@@ -1205,8 +945,6 @@
      * Called when "add network" button is pressed.
      */
     private void onAddNetworkPressed() {
-        // No exact access point is selected.
-        mSelectedAccessPoint = null;
         launchAddNetworkFragment();
     }
 
@@ -1215,91 +953,87 @@
         return R.string.help_url_wifi;
     }
 
-    @Override
-    public void onAccessPointChanged(final AccessPoint accessPoint) {
-        Log.d(TAG, "onAccessPointChanged (singular) callback initiated");
-        View view = getView();
-        if (view != null) {
-            view.post(new Runnable() {
-                @Override
-                public void run() {
-                    Object tag = accessPoint.getTag();
-                    if (tag != null) {
-                        ((AccessPointPreference) tag).refresh();
-                    }
-                }
-            });
-        }
-    }
-
-    @Override
-    public void onLevelChanged(AccessPoint accessPoint) {
-        ((AccessPointPreference) accessPoint.getTag()).onLevelChanged();
-    }
-
-    private void handleConfigNetworkSubmitEvent(Intent data) {
-        final WifiConfiguration wifiConfiguration = data.getParcelableExtra(
-                ConfigureAccessPointFragment.NETWORK_CONFIG_KEY);
-        if (wifiConfiguration != null) {
-            mWifiManager.save(wifiConfiguration, mSaveListener);
-
-            if (mSelectedAccessPoint != null) {
-                connect(wifiConfiguration, false /*isSavedNetwork*/,
-                        CONNECT_SOURCE_UNSPECIFIED);
-            }
-            mWifiTracker.resumeScanning();
-        }
-    }
-
-    private void launchConfigNewNetworkFragment(AccessPoint accessPoint, int dialogMode,
-            Bundle bundleForArguments) {
-        mDialogMode = dialogMode;
-        final CharSequence title = accessPoint.getTitle();
-        new SubSettingLauncher(getContext())
-                .setTitleText(title)
-                .setDestination(ConfigureAccessPointFragment.class.getName())
-                .setArguments(bundleForArguments)
-                .setSourceMetricsCategory(getMetricsCategory())
-                .setResultListener(this, CONFIG_NETWORK_REQUEST)
-                .launch();
-    }
-
     /**
-     * Starts the captive portal for current network if it's been clicked from the available
-     * networks (or contextual menu). We only do it *once* for a picked network, to avoid connecting
-     * again on bg/fg or if user dismisses Captive Portal before connecting (otherwise, coming back
-     * to this screen while connected to the same network but not signed in would open CP again).
+     * Renames/replaces "Next" button when appropriate. "Next" button usually exists in
+     * Wi-Fi setup screens, not in usual wifi settings screen.
+     *
+     * @param enabled true when the device is connected to a wifi network.
      */
-    private void checkStartCaptivePortalApp() {
-        Network currentNetwork = getCurrentWifiNetwork();
-        if (mCaptivePortalNetworkCallback == null || currentNetwork == null
-                || !currentNetwork.equals(mCaptivePortalNetworkCallback.getNetwork())
-                || !mCaptivePortalNetworkCallback.isCaptivePortal()) {
-            return;
+    @VisibleForTesting
+    void changeNextButtonState(boolean enabled) {
+        if (mEnableNextOnConnection && hasNextButton()) {
+            getNextButton().setEnabled(enabled);
         }
-
-        if (mConnectSource != CONNECT_SOURCE_NETWORK_LIST_ITEM_CLICK
-                && mConnectSource != CONNECT_SOURCE_NETWORK_MENU_ITEM_CLICK) {
-            return;
-        }
-
-        if (mLastNetworkCaptivePortalAppStarted != null
-                && mLastNetworkCaptivePortalAppStarted.equals(currentNetwork)) {
-            // We already auto-opened CP for same network
-            return;
-        }
-
-        startCaptivePortalApp(currentNetwork);
     }
 
-    private void startCaptivePortalApp(Network network) {
-        if (mConnectivityManager == null || network == null) {
-            return;
-        }
-        mLastNetworkCaptivePortalAppStarted = network;
-        mConnectivityManager.startCaptivePortalApp(network);
+    @Override
+    public void onForget(WifiDialog2 dialog) {
+        forget(dialog.getWifiEntry());
     }
 
+    @Override
+    public void onSubmit(WifiDialog2 dialog) {
+        final int dialogMode = dialog.getMode();
+        final WifiConfiguration config = dialog.getController().getConfig();
+        final WifiEntry wifiEntry = dialog.getWifiEntry();
+
+        if (dialogMode == WifiConfigUiBase2.MODE_MODIFY) {
+            if (config == null) {
+                Toast.makeText(getContext(), R.string.wifi_failed_save_message,
+                        Toast.LENGTH_SHORT).show();
+            } else {
+                mWifiManager.save(config, mSaveListener);
+            }
+        } else if (dialogMode == WifiConfigUiBase2.MODE_CONNECT
+                || (dialogMode == WifiConfigUiBase2.MODE_VIEW && wifiEntry.canConnect())) {
+            if (config == null) {
+                connect(wifiEntry, false /* editIfNoConfig */,
+                        false /* fullScreenEdit*/);
+            } else {
+                mWifiManager.connect(config, new WifiConnectActionListener());
+            }
+        }
+    }
+
+    @Override
+    public void onScan(WifiDialog2 dialog, String ssid) {
+        // Launch QR code scanner to join a network.
+        startActivityForResult(WifiDppUtils.getEnrolleeQrCodeScannerIntent(ssid),
+                REQUEST_CODE_WIFI_DPP_ENROLLEE_QR_CODE_SCANNER);
+    }
+
+    private void forget(WifiEntry wifiEntry) {
+        mMetricsFeatureProvider.action(getActivity(), SettingsEnums.ACTION_WIFI_FORGET);
+        wifiEntry.forget(null /* callback */);
+    }
+
+    @VisibleForTesting
+    void connect(WifiEntry wifiEntry, boolean editIfNoConfig, boolean fullScreenEdit) {
+        mMetricsFeatureProvider.action(getActivity(), SettingsEnums.ACTION_WIFI_CONNECT,
+                wifiEntry.isSaved());
+
+        // If it's an unsaved secure WifiEntry, it will callback
+        // ConnectCallback#onConnectResult with ConnectCallback#CONNECT_STATUS_FAILURE_NO_CONFIG
+        wifiEntry.connect(new WifiEntryConnectCallback(wifiEntry, editIfNoConfig,
+                fullScreenEdit));
+    }
+
+    private class WifiConnectActionListener implements WifiManager.ActionListener {
+        @Override
+        public void onSuccess() {
+            mClickedConnect = true;
+        }
+
+        @Override
+        public void onFailure(int reason) {
+            if (isFinishingOrDestroyed()) {
+                return;
+            }
+            Toast.makeText(getContext(), R.string.wifi_failed_connect_message, Toast.LENGTH_SHORT)
+                    .show();
+        }
+    };
+
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider(R.xml.wifi_settings) {
                 @Override
@@ -1317,4 +1051,86 @@
                     return keys;
                 }
             };
+
+    private class WifiEntryConnectCallback implements ConnectCallback {
+        final WifiEntry mConnectWifiEntry;
+        final boolean mEditIfNoConfig;
+        final boolean mFullScreenEdit;
+
+        WifiEntryConnectCallback(WifiEntry connectWifiEntry, boolean editIfNoConfig,
+                boolean fullScreenEdit) {
+            mConnectWifiEntry = connectWifiEntry;
+            mEditIfNoConfig = editIfNoConfig;
+            mFullScreenEdit = fullScreenEdit;
+        }
+
+        @Override
+        public void onConnectResult(@ConnectStatus int status) {
+            if (isFinishingOrDestroyed()) {
+                return;
+            }
+
+            if (status == ConnectCallback.CONNECT_STATUS_SUCCESS) {
+                mClickedConnect = true;
+            } else if (status == ConnectCallback.CONNECT_STATUS_FAILURE_NO_CONFIG) {
+                if (mEditIfNoConfig) {
+                    // Edit an unsaved secure Wi-Fi network.
+                    if (mFullScreenEdit) {
+                        launchConfigNewNetworkFragment(mConnectWifiEntry);
+                    } else {
+                        showDialog(mConnectWifiEntry, WifiConfigUiBase2.MODE_CONNECT);
+                    }
+                }
+            } else if (status == CONNECT_STATUS_FAILURE_UNKNOWN) {
+                Toast.makeText(getContext(), R.string.wifi_failed_connect_message,
+                        Toast.LENGTH_SHORT).show();
+            }
+        }
+    }
+
+    private void launchConfigNewNetworkFragment(WifiEntry wifiEntry) {
+        final Bundle bundle = new Bundle();
+        bundle.putString(WifiNetworkDetailsFragment2.KEY_CHOSEN_WIFIENTRY_KEY,
+                wifiEntry.getKey());
+        new SubSettingLauncher(getContext())
+                .setTitleText(wifiEntry.getTitle())
+                .setDestination(ConfigureWifiEntryFragment.class.getName())
+                .setArguments(bundle)
+                .setSourceMetricsCategory(getMetricsCategory())
+                .setResultListener(WifiSettings.this, CONFIG_NETWORK_REQUEST)
+                .launch();
+    }
+
+    /** Helper method to return whether a WifiEntry is disabled due to a wrong password */
+    private static boolean isDisabledByWrongPassword(WifiEntry wifiEntry) {
+        WifiConfiguration config = wifiEntry.getWifiConfiguration();
+        if (config == null) {
+            return false;
+        }
+        WifiConfiguration.NetworkSelectionStatus networkStatus =
+                config.getNetworkSelectionStatus();
+        if (networkStatus == null
+                || networkStatus.getNetworkSelectionStatus() == NETWORK_SELECTION_ENABLED) {
+            return false;
+        }
+        int reason = networkStatus.getNetworkSelectionDisableReason();
+        return WifiConfiguration.NetworkSelectionStatus.DISABLED_BY_WRONG_PASSWORD == reason;
+    }
+
+    @VisibleForTesting
+    void openSubscriptionHelpPage(WifiEntry wifiEntry) {
+        final Intent intent = getHelpIntent(getContext(), wifiEntry.getHelpUriString());
+        if (intent != null) {
+            try {
+                startActivityForResult(intent, MANAGE_SUBSCRIPTION);
+            } catch (ActivityNotFoundException e) {
+                Log.e(TAG, "Activity was not found for intent, " + intent.toString());
+            }
+        }
+    }
+
+    @VisibleForTesting
+    Intent getHelpIntent(Context context, String helpUrlString) {
+        return HelpUtils.getHelpIntent(context, helpUrlString, context.getClass().getName());
+    }
 }
diff --git a/src/com/android/settings/wifi/WifiSettings2.java b/src/com/android/settings/wifi/WifiSettings2.java
deleted file mode 100644
index 79f48fb..0000000
--- a/src/com/android/settings/wifi/WifiSettings2.java
+++ /dev/null
@@ -1,1136 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi;
-
-import static android.net.wifi.WifiConfiguration.NetworkSelectionStatus.NETWORK_SELECTION_ENABLED;
-import static android.os.UserManager.DISALLOW_CONFIG_WIFI;
-
-import android.app.Activity;
-import android.app.Dialog;
-import android.app.settings.SettingsEnums;
-import android.content.ActivityNotFoundException;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.net.ConnectivityManager;
-import android.net.NetworkScoreManager;
-import android.net.NetworkTemplate;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiManager;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.HandlerThread;
-import android.os.Looper;
-import android.os.PowerManager;
-import android.os.Process;
-import android.os.SimpleClock;
-import android.os.SystemClock;
-import android.provider.Settings;
-import android.text.TextUtils;
-import android.util.FeatureFlagUtils;
-import android.util.Log;
-import android.view.ContextMenu;
-import android.view.ContextMenu.ContextMenuInfo;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.Toast;
-
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.android.settings.LinkifyUtils;
-import com.android.settings.R;
-import com.android.settings.RestrictedSettingsFragment;
-import com.android.settings.SettingsActivity;
-import com.android.settings.core.FeatureFlags;
-import com.android.settings.core.SubSettingLauncher;
-import com.android.settings.datausage.DataUsagePreference;
-import com.android.settings.datausage.DataUsageUtils;
-import com.android.settings.location.ScanningSettings;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.widget.SwitchBarController;
-import com.android.settings.wifi.details2.WifiNetworkDetailsFragment2;
-import com.android.settings.wifi.dpp.WifiDppUtils;
-import com.android.settingslib.HelpUtils;
-import com.android.settingslib.RestrictedLockUtils;
-import com.android.settingslib.RestrictedLockUtilsInternal;
-import com.android.settingslib.search.Indexable;
-import com.android.settingslib.search.SearchIndexable;
-import com.android.settingslib.wifi.LongPressWifiEntryPreference;
-import com.android.settingslib.wifi.WifiSavedConfigUtils;
-import com.android.wifitrackerlib.WifiEntry;
-import com.android.wifitrackerlib.WifiEntry.ConnectCallback;
-import com.android.wifitrackerlib.WifiPickerTracker;
-
-import java.time.Clock;
-import java.time.ZoneOffset;
-import java.util.List;
-import java.util.Optional;
-
-/**
- * UI for Wi-Fi settings screen
- */
-@SearchIndexable
-public class WifiSettings2 extends RestrictedSettingsFragment
-        implements Indexable, WifiPickerTracker.WifiPickerTrackerCallback,
-        WifiDialog2.WifiDialog2Listener, DialogInterface.OnDismissListener {
-
-    private static final String TAG = "WifiSettings2";
-
-    // IDs of context menu
-    static final int MENU_ID_CONNECT = Menu.FIRST + 1;
-    @VisibleForTesting
-    static final int MENU_ID_DISCONNECT = Menu.FIRST + 2;
-    @VisibleForTesting
-    static final int MENU_ID_FORGET = Menu.FIRST + 3;
-    static final int MENU_ID_MODIFY = Menu.FIRST + 4;
-
-    // Max age of tracked WifiEntries
-    private static final long MAX_SCAN_AGE_MILLIS = 15_000;
-    // Interval between initiating WifiPickerTracker scans
-    private static final long SCAN_INTERVAL_MILLIS = 10_000;
-
-    @VisibleForTesting
-    static final int ADD_NETWORK_REQUEST = 2;
-    static final int CONFIG_NETWORK_REQUEST = 3;
-    static final int MANAGE_SUBSCRIPTION = 4;
-
-    private static final String PREF_KEY_EMPTY_WIFI_LIST = "wifi_empty_list";
-    // TODO(b/70983952): Rename these to use WifiEntry instead of AccessPoint.
-    private static final String PREF_KEY_CONNECTED_ACCESS_POINTS = "connected_access_point";
-    private static final String PREF_KEY_ACCESS_POINTS = "access_points";
-    private static final String PREF_KEY_CONFIGURE_WIFI_SETTINGS = "configure_wifi_settings";
-    private static final String PREF_KEY_SAVED_NETWORKS = "saved_networks";
-    private static final String PREF_KEY_STATUS_MESSAGE = "wifi_status_message";
-    @VisibleForTesting
-    static final String PREF_KEY_DATA_USAGE = "wifi_data_usage";
-
-    private static final int REQUEST_CODE_WIFI_DPP_ENROLLEE_QR_CODE_SCANNER = 0;
-
-    public static final int WIFI_DIALOG_ID = 1;
-
-    // Instance state keys
-    private static final String SAVE_DIALOG_MODE = "dialog_mode";
-    private static final String SAVE_DIALOG_WIFIENTRY_KEY = "wifi_ap_key";
-
-    // Cache at onCreateContextMenu and use at onContextItemSelected. Don't use it in other methods.
-    private WifiEntry mSelectedWifiEntry;
-
-    // Save the dialog details
-    private int mDialogMode;
-    private String mDialogWifiEntryKey;
-    private WifiEntry mDialogWifiEntry;
-
-    // This boolean extra specifies whether to enable the Next button when connected. Used by
-    // account creation outside of setup wizard.
-    private static final String EXTRA_ENABLE_NEXT_ON_CONNECT = "wifi_enable_next_on_connect";
-
-    // Enable the Next button when a Wi-Fi network is connected.
-    private boolean mEnableNextOnConnection;
-
-    // This string extra specifies a network to open the connect dialog on, so the user can enter
-    // network credentials.  This is used by quick settings for secured networks, among other
-    // things.
-    private static final String EXTRA_START_CONNECT_SSID = "wifi_start_connect_ssid";
-    private String mOpenSsid;
-
-    private static boolean isVerboseLoggingEnabled() {
-        return WifiPickerTracker.isVerboseLoggingEnabled();
-    }
-
-    private final Runnable mUpdateWifiEntryPreferencesRunnable = () -> {
-        updateWifiEntryPreferences();
-    };
-    private final Runnable mHideProgressBarRunnable = () -> {
-        setProgressBarVisible(false);
-    };
-
-    protected WifiManager mWifiManager;
-    private WifiManager.ActionListener mConnectListener;
-    private WifiManager.ActionListener mSaveListener;
-    private WifiManager.ActionListener mForgetListener;
-
-    /**
-     * The state of {@link #isUiRestricted()} at {@link #onCreate(Bundle)}}. This is neccesary to
-     * ensure that behavior is consistent if {@link #isUiRestricted()} changes. It could be changed
-     * by the Test DPC tool in AFW mode.
-     */
-    private boolean mIsRestricted;
-
-    private WifiEnabler mWifiEnabler;
-
-    // Worker thread used for WifiPickerTracker work
-    private HandlerThread mWorkerThread;
-
-    @VisibleForTesting
-    WifiPickerTracker mWifiPickerTracker;
-
-    private WifiDialog2 mDialog;
-
-    private View mProgressHeader;
-
-    private PreferenceCategory mConnectedWifiEntryPreferenceCategory;
-    private PreferenceCategory mWifiEntryPreferenceCategory;
-    @VisibleForTesting
-    AddWifiNetworkPreference mAddWifiNetworkPreference;
-    @VisibleForTesting
-    Preference mConfigureWifiSettingsPreference;
-    @VisibleForTesting
-    Preference mSavedNetworksPreference;
-    @VisibleForTesting
-    DataUsagePreference mDataUsagePreference;
-    private LinkablePreference mStatusMessagePreference;
-
-    /**
-     * Tracks whether the user initiated a connection via clicking in order to autoscroll to the
-     * network once connected.
-     */
-    private boolean mClickedConnect;
-
-    public WifiSettings2() {
-        super(DISALLOW_CONFIG_WIFI);
-    }
-
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        final Activity activity = getActivity();
-        if (activity != null) {
-            mProgressHeader = setPinnedHeaderView(R.layout.progress_header)
-                    .findViewById(R.id.progress_bar_animation);
-            setProgressBarVisible(false);
-        }
-        ((SettingsActivity) activity).getSwitchBar().setSwitchBarText(
-                R.string.wifi_settings_master_switch_title,
-                R.string.wifi_settings_master_switch_title);
-    }
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        // TODO(b/37429702): Add animations and preference comparator back after initial screen is
-        // loaded (ODR).
-        setAnimationAllowed(false);
-
-        addPreferences();
-
-        mIsRestricted = isUiRestricted();
-    }
-
-    private void addPreferences() {
-        addPreferencesFromResource(R.xml.wifi_settings2);
-
-        mConnectedWifiEntryPreferenceCategory = findPreference(PREF_KEY_CONNECTED_ACCESS_POINTS);
-        mWifiEntryPreferenceCategory = findPreference(PREF_KEY_ACCESS_POINTS);
-        mConfigureWifiSettingsPreference = findPreference(PREF_KEY_CONFIGURE_WIFI_SETTINGS);
-        mSavedNetworksPreference = findPreference(PREF_KEY_SAVED_NETWORKS);
-        mAddWifiNetworkPreference = new AddWifiNetworkPreference(getPrefContext());
-        mStatusMessagePreference = findPreference(PREF_KEY_STATUS_MESSAGE);
-        mDataUsagePreference = findPreference(PREF_KEY_DATA_USAGE);
-        mDataUsagePreference.setVisible(DataUsageUtils.hasWifiRadio(getContext()));
-        mDataUsagePreference.setTemplate(NetworkTemplate.buildTemplateWifiWildcard(),
-                0 /*subId*/,
-                null /*service*/);
-    }
-
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-
-        final Context context = getContext();
-        mWorkerThread = new HandlerThread(TAG +
-                "{" + Integer.toHexString(System.identityHashCode(this)) + "}",
-                Process.THREAD_PRIORITY_BACKGROUND);
-        mWorkerThread.start();
-        final Clock elapsedRealtimeClock = new SimpleClock(ZoneOffset.UTC) {
-            @Override
-            public long millis() {
-                return SystemClock.elapsedRealtime();
-            }
-        };
-        mWifiPickerTracker = new WifiPickerTracker(getSettingsLifecycle(), context,
-                context.getSystemService(WifiManager.class),
-                context.getSystemService(ConnectivityManager.class),
-                context.getSystemService(NetworkScoreManager.class),
-                new Handler(Looper.getMainLooper()),
-                mWorkerThread.getThreadHandler(),
-                elapsedRealtimeClock,
-                MAX_SCAN_AGE_MILLIS,
-                SCAN_INTERVAL_MILLIS,
-                this);
-
-        final Activity activity = getActivity();
-
-        if (activity != null) {
-            mWifiManager = getActivity().getSystemService(WifiManager.class);
-        }
-
-        mConnectListener = new WifiConnectListener(getActivity());
-
-        mSaveListener = new WifiManager.ActionListener() {
-            @Override
-            public void onSuccess() {
-            }
-
-            @Override
-            public void onFailure(int reason) {
-                Activity activity = getActivity();
-                if (activity != null) {
-                    Toast.makeText(activity,
-                            R.string.wifi_failed_save_message,
-                            Toast.LENGTH_SHORT).show();
-                }
-            }
-        };
-
-        mForgetListener = new WifiManager.ActionListener() {
-            @Override
-            public void onSuccess() {
-            }
-
-            @Override
-            public void onFailure(int reason) {
-                Activity activity = getActivity();
-                if (activity != null) {
-                    Toast.makeText(activity,
-                            R.string.wifi_failed_forget_message,
-                            Toast.LENGTH_SHORT).show();
-                }
-            }
-        };
-        registerForContextMenu(getListView());
-        setHasOptionsMenu(true);
-
-        if (savedInstanceState != null) {
-            mDialogMode = savedInstanceState.getInt(SAVE_DIALOG_MODE);
-            mDialogWifiEntryKey = savedInstanceState.getString(SAVE_DIALOG_WIFIENTRY_KEY);
-        }
-
-        // If we're supposed to enable/disable the Next button based on our current connection
-        // state, start it off in the right state.
-        final Intent intent = getActivity().getIntent();
-        mEnableNextOnConnection = intent.getBooleanExtra(EXTRA_ENABLE_NEXT_ON_CONNECT, false);
-
-        if (intent.hasExtra(EXTRA_START_CONNECT_SSID)) {
-            mOpenSsid = intent.getStringExtra(EXTRA_START_CONNECT_SSID);
-        }
-    }
-
-    @Override
-    public void onDestroyView() {
-        if (mWifiEnabler != null) {
-            mWifiEnabler.teardownSwitchController();
-        }
-        mWorkerThread.quit();
-
-        super.onDestroyView();
-    }
-
-    @Override
-    public void onStart() {
-        super.onStart();
-
-        mWifiEnabler = createWifiEnabler();
-
-        if (mIsRestricted) {
-            restrictUi();
-        }
-    }
-
-    private void restrictUi() {
-        if (!isUiRestrictedByOnlyAdmin()) {
-            getEmptyTextView().setText(R.string.wifi_empty_list_user_restricted);
-        }
-        getPreferenceScreen().removeAll();
-    }
-
-    /**
-     * @return new WifiEnabler
-     */
-    private WifiEnabler createWifiEnabler() {
-        final SettingsActivity activity = (SettingsActivity) getActivity();
-        return new WifiEnabler(activity, new SwitchBarController(activity.getSwitchBar()),
-                mMetricsFeatureProvider);
-    }
-
-    @Override
-    public void onResume() {
-        final Activity activity = getActivity();
-        super.onResume();
-
-        // Because RestrictedSettingsFragment's onResume potentially requests authorization,
-        // which changes the restriction state, recalculate it.
-        final boolean alreadyImmutablyRestricted = mIsRestricted;
-        mIsRestricted = isUiRestricted();
-        if (!alreadyImmutablyRestricted && mIsRestricted) {
-            restrictUi();
-        }
-
-        if (mWifiEnabler != null) {
-            mWifiEnabler.resume(activity);
-        }
-
-        changeNextButtonState(mWifiPickerTracker.getConnectedWifiEntry() != null);
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        if (mWifiEnabler != null) {
-            mWifiEnabler.pause();
-        }
-    }
-
-    @Override
-    public void onStop() {
-        getView().removeCallbacks(mUpdateWifiEntryPreferencesRunnable);
-        getView().removeCallbacks(mHideProgressBarRunnable);
-        super.onStop();
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-
-        if (requestCode == ADD_NETWORK_REQUEST) {
-            handleAddNetworkRequest(resultCode, data);
-            return;
-        } else if (requestCode == REQUEST_CODE_WIFI_DPP_ENROLLEE_QR_CODE_SCANNER) {
-            if (resultCode == Activity.RESULT_OK) {
-                if (mDialog != null) {
-                    mDialog.dismiss();
-                }
-            }
-            return;
-        } else if (requestCode == CONFIG_NETWORK_REQUEST) {
-            if (resultCode == Activity.RESULT_OK) {
-                final WifiConfiguration wifiConfiguration = data.getParcelableExtra(
-                        ConfigureWifiEntryFragment.NETWORK_CONFIG_KEY);
-                if (wifiConfiguration != null) {
-                    mWifiManager.connect(wifiConfiguration,
-                            new WifiConnectActionListener());
-                }
-            }
-            return;
-        } else if (requestCode == MANAGE_SUBSCRIPTION) {
-            //Do nothing
-            return;
-        }
-
-        final boolean formerlyRestricted = mIsRestricted;
-        mIsRestricted = isUiRestricted();
-        if (formerlyRestricted && !mIsRestricted
-                && getPreferenceScreen().getPreferenceCount() == 0) {
-            // De-restrict the ui
-            addPreferences();
-        }
-    }
-
-    @Override
-    protected RecyclerView.Adapter onCreateAdapter(PreferenceScreen preferenceScreen) {
-        final RecyclerView.Adapter adapter = super.onCreateAdapter(preferenceScreen);
-        adapter.setHasStableIds(true);
-        return adapter;
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return SettingsEnums.WIFI;
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        // If dialog has been shown, save its state.
-        if (mDialog != null) {
-            outState.putInt(SAVE_DIALOG_MODE, mDialogMode);
-            outState.putString(SAVE_DIALOG_WIFIENTRY_KEY, mDialogWifiEntryKey);
-        }
-    }
-
-    @Override
-    public void onCreateContextMenu(ContextMenu menu, View view, ContextMenuInfo info) {
-        Preference preference = (Preference) view.getTag();
-        if (!(preference instanceof LongPressWifiEntryPreference)) {
-            // Do nothing.
-            return;
-        }
-
-        // Cache the WifiEntry for onContextItemSelected. Don't use it in other methods.
-        mSelectedWifiEntry = ((LongPressWifiEntryPreference) preference).getWifiEntry();
-
-        menu.setHeaderTitle(mSelectedWifiEntry.getTitle());
-        if (mSelectedWifiEntry.canConnect()) {
-            menu.add(Menu.NONE, MENU_ID_CONNECT, 0 /* order */, R.string.wifi_connect);
-        }
-
-        if (mSelectedWifiEntry.canDisconnect()) {
-            menu.add(Menu.NONE, MENU_ID_DISCONNECT, 0 /* order */,
-                    R.string.wifi_disconnect_button_text);
-        }
-
-        // "forget" for normal saved network. And "disconnect" for ephemeral network because it
-        // could only be disconnected and be put in blacklists so it won't be used again.
-        if (canForgetNetwork()) {
-            menu.add(Menu.NONE, MENU_ID_FORGET, 0 /* order */, R.string.forget);
-        }
-
-        WifiConfiguration config = mSelectedWifiEntry.getWifiConfiguration();
-        // Some configs are ineditable
-        if (WifiUtils.isNetworkLockedDown(getActivity(), config)) {
-            return;
-        }
-
-        if (mSelectedWifiEntry.isSaved() && mSelectedWifiEntry.getConnectedState()
-                != WifiEntry.CONNECTED_STATE_CONNECTED) {
-            menu.add(Menu.NONE, MENU_ID_MODIFY, 0 /* order */, R.string.wifi_modify);
-        }
-    }
-
-    private boolean canForgetNetwork() {
-        return mSelectedWifiEntry.canForget() && !WifiUtils.isNetworkLockedDown(getActivity(),
-                mSelectedWifiEntry.getWifiConfiguration());
-    }
-
-    @Override
-    public boolean onContextItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case MENU_ID_CONNECT:
-                connect(mSelectedWifiEntry, true /* editIfNoConfig */, false /* fullScreenEdit */);
-                return true;
-            case MENU_ID_DISCONNECT:
-                mSelectedWifiEntry.disconnect(null /* callback */);
-                return true;
-            case MENU_ID_FORGET:
-                forget(mSelectedWifiEntry);
-                return true;
-            case MENU_ID_MODIFY:
-                showDialog(mSelectedWifiEntry, WifiConfigUiBase2.MODE_MODIFY);
-                return true;
-            default:
-                return super.onContextItemSelected(item);
-        }
-    }
-
-    @Override
-    public boolean onPreferenceTreeClick(Preference preference) {
-        // If the preference has a fragment set, open that
-        if (preference.getFragment() != null) {
-            preference.setOnPreferenceClickListener(null);
-            return super.onPreferenceTreeClick(preference);
-        }
-
-        if (preference instanceof LongPressWifiEntryPreference) {
-            final WifiEntry selectedEntry =
-                    ((LongPressWifiEntryPreference) preference).getWifiEntry();
-
-            if (selectedEntry.shouldEditBeforeConnect()) {
-                launchConfigNewNetworkFragment(selectedEntry);
-                return true;
-            }
-
-            connect(selectedEntry, true /* editIfNoConfig */, true /* fullScreenEdit */);
-        } else if (preference == mAddWifiNetworkPreference) {
-            onAddNetworkPressed();
-        } else {
-            return super.onPreferenceTreeClick(preference);
-        }
-        return true;
-    }
-
-    private void showDialog(WifiEntry wifiEntry, int dialogMode) {
-        if (WifiUtils.isNetworkLockedDown(getActivity(), wifiEntry.getWifiConfiguration())
-                && wifiEntry.getConnectedState() == WifiEntry.CONNECTED_STATE_CONNECTED) {
-            RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getActivity(),
-                    RestrictedLockUtilsInternal.getDeviceOwner(getActivity()));
-            return;
-        }
-
-        if (mDialog != null) {
-            removeDialog(WIFI_DIALOG_ID);
-            mDialog = null;
-        }
-
-        // Save the access point and edit mode
-        mDialogWifiEntry = wifiEntry;
-        mDialogWifiEntryKey = wifiEntry.getKey();
-        mDialogMode = dialogMode;
-
-        showDialog(WIFI_DIALOG_ID);
-    }
-
-    @Override
-    public Dialog onCreateDialog(int dialogId) {
-        switch (dialogId) {
-            case WIFI_DIALOG_ID:
-                // modify network
-                mDialog = WifiDialog2
-                        .createModal(getActivity(), this, mDialogWifiEntry, mDialogMode);
-                return mDialog;
-            default:
-                return super.onCreateDialog(dialogId);
-        }
-    }
-
-    @Override
-    public void onDialogShowing() {
-        super.onDialogShowing();
-        setOnDismissListener(this);
-    }
-
-    @Override
-    public void onDismiss(DialogInterface dialog) {
-        // We don't keep any dialog object when dialog was dismissed.
-        mDialog = null;
-        mDialogWifiEntry = null;
-        mDialogWifiEntryKey = null;
-    }
-
-    @Override
-    public int getDialogMetricsCategory(int dialogId) {
-        switch (dialogId) {
-            case WIFI_DIALOG_ID:
-                return SettingsEnums.DIALOG_WIFI_AP_EDIT;
-            default:
-                return 0;
-        }
-    }
-
-    /** Called when the state of Wifi has changed. */
-    @Override
-    public void onWifiStateChanged() {
-        if (mIsRestricted) {
-            return;
-        }
-        final int wifiState = mWifiPickerTracker.getWifiState();
-
-        if (isVerboseLoggingEnabled()) {
-            Log.i(TAG, "onWifiStateChanged called with wifi state: " + wifiState);
-        }
-
-        switch (wifiState) {
-            case WifiManager.WIFI_STATE_ENABLED:
-                updateWifiEntryPreferences();
-                break;
-
-            case WifiManager.WIFI_STATE_ENABLING:
-                removeConnectedWifiEntryPreference();
-                removeWifiEntryPreference();
-                addMessagePreference(R.string.wifi_starting);
-                setProgressBarVisible(true);
-                break;
-
-            case WifiManager.WIFI_STATE_DISABLING:
-                removeConnectedWifiEntryPreference();
-                removeWifiEntryPreference();
-                addMessagePreference(R.string.wifi_stopping);
-                break;
-
-            case WifiManager.WIFI_STATE_DISABLED:
-                setOffMessage();
-                setAdditionalSettingsSummaries();
-                setProgressBarVisible(false);
-                mClickedConnect = false;
-                break;
-        }
-    }
-
-    @Override
-    public void onWifiEntriesChanged() {
-        updateWifiEntryPreferencesDelayed();
-        changeNextButtonState(mWifiPickerTracker.getConnectedWifiEntry() != null);
-
-        // Edit the Wi-Fi network of specified SSID.
-        if (mOpenSsid != null) {
-            Optional<WifiEntry> matchedWifiEntry = mWifiPickerTracker.getWifiEntries().stream()
-                    .filter(wifiEntry -> TextUtils.equals(mOpenSsid, wifiEntry.getSsid()))
-                    .filter(wifiEntry -> wifiEntry.getSecurity() != WifiEntry.SECURITY_NONE
-                            && wifiEntry.getSecurity() != WifiEntry.SECURITY_OWE)
-                    .filter(wifiEntry -> !wifiEntry.isSaved()
-                            || isDisabledByWrongPassword(wifiEntry))
-                    .findFirst();
-            if (matchedWifiEntry.isPresent()) {
-                mOpenSsid = null;
-                launchConfigNewNetworkFragment(matchedWifiEntry.get());
-            }
-        }
-    }
-
-    @Override
-    public void onNumSavedNetworksChanged() {
-        if (isFinishingOrDestroyed()) {
-            return;
-        }
-        setAdditionalSettingsSummaries();
-    }
-
-    @Override
-    public void onNumSavedSubscriptionsChanged() {
-        if (isFinishingOrDestroyed()) {
-            return;
-        }
-        setAdditionalSettingsSummaries();
-    }
-
-    /**
-     * Updates WifiEntries from {@link WifiPickerTracker#getWifiEntries()}. Adds a delay to have
-     * progress bar displayed before starting to modify entries.
-     */
-    private void updateWifiEntryPreferencesDelayed() {
-        // Safeguard from some delayed event handling
-        if (getActivity() != null && !mIsRestricted &&
-                mWifiPickerTracker.getWifiState() == WifiManager.WIFI_STATE_ENABLED) {
-            final View view = getView();
-            final Handler handler = view.getHandler();
-            if (handler != null && handler.hasCallbacks(mUpdateWifiEntryPreferencesRunnable)) {
-                return;
-            }
-            setProgressBarVisible(true);
-            view.postDelayed(mUpdateWifiEntryPreferencesRunnable, 300);
-        }
-    }
-
-    private void updateWifiEntryPreferences() {
-        // in case state has changed
-        if (mWifiPickerTracker.getWifiState() != WifiManager.WIFI_STATE_ENABLED) {
-            return;
-        }
-
-        boolean hasAvailableWifiEntries = false;
-        mStatusMessagePreference.setVisible(false);
-        mWifiEntryPreferenceCategory.setVisible(true);
-
-        final WifiEntry connectedEntry = mWifiPickerTracker.getConnectedWifiEntry();
-        mConnectedWifiEntryPreferenceCategory.setVisible(connectedEntry != null);
-        if (connectedEntry != null) {
-            final LongPressWifiEntryPreference connectedPref =
-                    mConnectedWifiEntryPreferenceCategory.findPreference(connectedEntry.getKey());
-            if (connectedPref == null || connectedPref.getWifiEntry() != connectedEntry) {
-                mConnectedWifiEntryPreferenceCategory.removeAll();
-                final ConnectedWifiEntryPreference pref =
-                        new ConnectedWifiEntryPreference(getPrefContext(), connectedEntry, this);
-                pref.setKey(connectedEntry.getKey());
-                pref.refresh();
-                mConnectedWifiEntryPreferenceCategory.addPreference(pref);
-                pref.setOnPreferenceClickListener(preference -> {
-                    if (connectedEntry.canSignIn()) {
-                        connectedEntry.signIn(null /* callback */);
-                    } else {
-                        launchNetworkDetailsFragment(pref);
-                    }
-                    return true;
-                });
-                pref.setOnGearClickListener(preference -> {
-                    launchNetworkDetailsFragment(pref);
-                });
-
-                if (mClickedConnect) {
-                    mClickedConnect = false;
-                    scrollToPreference(mConnectedWifiEntryPreferenceCategory);
-                }
-            }
-        } else {
-            mConnectedWifiEntryPreferenceCategory.removeAll();
-        }
-
-        int index = 0;
-        cacheRemoveAllPrefs(mWifiEntryPreferenceCategory);
-        List<WifiEntry> wifiEntries = mWifiPickerTracker.getWifiEntries();
-        for (WifiEntry wifiEntry : wifiEntries) {
-            hasAvailableWifiEntries = true;
-
-            String key = wifiEntry.getKey();
-            LongPressWifiEntryPreference pref =
-                    (LongPressWifiEntryPreference) getCachedPreference(key);
-            if (pref != null) {
-                if (pref.getWifiEntry() == wifiEntry) {
-                    pref.setOrder(index++);
-                    continue;
-                } else {
-                    // Create a new preference if the underlying WifiEntry object has changed
-                    removePreference(key);
-                }
-            }
-
-            pref = createLongPressWifiEntryPreference(wifiEntry);
-            pref.setKey(wifiEntry.getKey());
-            pref.setOrder(index++);
-            pref.refresh();
-
-            if (wifiEntry.getHelpUriString() != null) {
-                pref.setOnButtonClickListener(preference -> {
-                    openSubscriptionHelpPage(wifiEntry);
-                });
-            }
-            mWifiEntryPreferenceCategory.addPreference(pref);
-        }
-        removeCachedPrefs(mWifiEntryPreferenceCategory);
-
-        if (!hasAvailableWifiEntries) {
-            setProgressBarVisible(true);
-            Preference pref = new Preference(getPrefContext());
-            pref.setSelectable(false);
-            pref.setSummary(R.string.wifi_empty_list_wifi_on);
-            pref.setOrder(index++);
-            pref.setKey(PREF_KEY_EMPTY_WIFI_LIST);
-            mWifiEntryPreferenceCategory.addPreference(pref);
-        } else {
-            // Continuing showing progress bar for an additional delay to overlap with animation
-            getView().postDelayed(mHideProgressBarRunnable, 1700 /* delay millis */);
-        }
-
-        mAddWifiNetworkPreference.setOrder(index++);
-        mWifiEntryPreferenceCategory.addPreference(mAddWifiNetworkPreference);
-        setAdditionalSettingsSummaries();
-    }
-
-    private void launchNetworkDetailsFragment(LongPressWifiEntryPreference pref) {
-        final WifiEntry wifiEntry = pref.getWifiEntry();
-        final Context context = getContext();
-        final CharSequence title =
-                FeatureFlagUtils.isEnabled(context, FeatureFlags.WIFI_DETAILS_DATAUSAGE_HEADER)
-                        ? wifiEntry.getTitle()
-                        : context.getText(R.string.pref_title_network_details);
-
-        final Bundle bundle = new Bundle();
-        bundle.putString(WifiNetworkDetailsFragment2.KEY_CHOSEN_WIFIENTRY_KEY, wifiEntry.getKey());
-
-        new SubSettingLauncher(context)
-                .setTitleText(title)
-                .setDestination(WifiNetworkDetailsFragment2.class.getName())
-                .setArguments(bundle)
-                .setSourceMetricsCategory(getMetricsCategory())
-                .launch();
-    }
-
-    @VisibleForTesting
-    LongPressWifiEntryPreference createLongPressWifiEntryPreference(WifiEntry wifiEntry) {
-        return new LongPressWifiEntryPreference(getPrefContext(), wifiEntry, this);
-    }
-
-    private void launchAddNetworkFragment() {
-        new SubSettingLauncher(getContext())
-                .setTitleRes(R.string.wifi_add_network)
-                .setDestination(AddNetworkFragment.class.getName())
-                .setSourceMetricsCategory(getMetricsCategory())
-                .setResultListener(this, ADD_NETWORK_REQUEST)
-                .launch();
-    }
-
-    /** Removes all preferences and hide the {@link #mConnectedWifiEntryPreferenceCategory}. */
-    private void removeConnectedWifiEntryPreference() {
-        mConnectedWifiEntryPreferenceCategory.removeAll();
-        mConnectedWifiEntryPreferenceCategory.setVisible(false);
-    }
-
-    private void removeWifiEntryPreference() {
-        mWifiEntryPreferenceCategory.removeAll();
-        mWifiEntryPreferenceCategory.setVisible(false);
-    }
-
-    @VisibleForTesting
-    void setAdditionalSettingsSummaries() {
-        mConfigureWifiSettingsPreference.setSummary(getString(
-                isWifiWakeupEnabled()
-                        ? R.string.wifi_configure_settings_preference_summary_wakeup_on
-                        : R.string.wifi_configure_settings_preference_summary_wakeup_off));
-
-        final int numSavedNetworks = mWifiPickerTracker.getNumSavedNetworks();
-        final int numSavedSubscriptions = mWifiPickerTracker.getNumSavedSubscriptions();
-        if (numSavedNetworks + numSavedSubscriptions > 0) {
-            mSavedNetworksPreference.setVisible(true);
-            mSavedNetworksPreference.setSummary(
-                    getSavedNetworkSettingsSummaryText(numSavedNetworks, numSavedSubscriptions));
-        } else {
-            mSavedNetworksPreference.setVisible(false);
-        }
-    }
-
-    private String getSavedNetworkSettingsSummaryText(
-            int numSavedNetworks, int numSavedSubscriptions) {
-        if (numSavedSubscriptions == 0) {
-            return getResources().getQuantityString(R.plurals.wifi_saved_access_points_summary,
-                    numSavedNetworks, numSavedNetworks);
-        } else if (numSavedNetworks == 0) {
-            return getResources().getQuantityString(
-                    R.plurals.wifi_saved_passpoint_access_points_summary,
-                    numSavedSubscriptions, numSavedSubscriptions);
-        } else {
-            final int numTotalEntries = numSavedNetworks + numSavedSubscriptions;
-            return getResources().getQuantityString(R.plurals.wifi_saved_all_access_points_summary,
-                    numTotalEntries, numTotalEntries);
-        }
-    }
-
-    private boolean isWifiWakeupEnabled() {
-        final Context context = getContext();
-        final PowerManager powerManager = context.getSystemService(PowerManager.class);
-        final ContentResolver contentResolver = context.getContentResolver();
-        return mWifiManager.isAutoWakeupEnabled()
-                && mWifiManager.isScanAlwaysAvailable()
-                && Settings.Global.getInt(contentResolver,
-                Settings.Global.AIRPLANE_MODE_ON, 0) == 0
-                && !powerManager.isPowerSaveMode();
-    }
-
-    private void setOffMessage() {
-        final CharSequence title = getText(R.string.wifi_empty_list_wifi_off);
-        // Don't use WifiManager.isScanAlwaysAvailable() to check the Wi-Fi scanning mode. Instead,
-        // read the system settings directly. Because when the device is in Airplane mode, even if
-        // Wi-Fi scanning mode is on, WifiManager.isScanAlwaysAvailable() still returns "off".
-        // TODO(b/149421497): Fix this?
-        final boolean wifiScanningMode = mWifiManager.isScanAlwaysAvailable();
-        final CharSequence description = wifiScanningMode ? getText(R.string.wifi_scan_notify_text)
-                : getText(R.string.wifi_scan_notify_text_scanning_off);
-        final LinkifyUtils.OnClickListener clickListener =
-                () -> new SubSettingLauncher(getContext())
-                        .setDestination(ScanningSettings.class.getName())
-                        .setTitleRes(R.string.location_scanning_screen_title)
-                        .setSourceMetricsCategory(getMetricsCategory())
-                        .launch();
-        mStatusMessagePreference.setText(title, description, clickListener);
-        removeConnectedWifiEntryPreference();
-        removeWifiEntryPreference();
-        mStatusMessagePreference.setVisible(true);
-    }
-
-    private void addMessagePreference(int messageId) {
-        mStatusMessagePreference.setTitle(messageId);
-        mStatusMessagePreference.setVisible(true);
-
-    }
-
-    protected void setProgressBarVisible(boolean visible) {
-        if (mProgressHeader != null) {
-            mProgressHeader.setVisibility(visible ? View.VISIBLE : View.GONE);
-        }
-    }
-
-    @VisibleForTesting
-    void handleAddNetworkRequest(int result, Intent data) {
-        if (result == Activity.RESULT_OK) {
-            handleAddNetworkSubmitEvent(data);
-        }
-    }
-
-    private void handleAddNetworkSubmitEvent(Intent data) {
-        final WifiConfiguration wifiConfiguration = data.getParcelableExtra(
-                AddNetworkFragment.WIFI_CONFIG_KEY);
-        if (wifiConfiguration != null) {
-            mWifiManager.save(wifiConfiguration, mSaveListener);
-        }
-    }
-
-    /**
-     * Called when "add network" button is pressed.
-     */
-    private void onAddNetworkPressed() {
-        launchAddNetworkFragment();
-    }
-
-    @Override
-    public int getHelpResource() {
-        return R.string.help_url_wifi;
-    }
-
-    /**
-     * Renames/replaces "Next" button when appropriate. "Next" button usually exists in
-     * Wi-Fi setup screens, not in usual wifi settings screen.
-     *
-     * @param enabled true when the device is connected to a wifi network.
-     */
-    @VisibleForTesting
-    void changeNextButtonState(boolean enabled) {
-        if (mEnableNextOnConnection && hasNextButton()) {
-            getNextButton().setEnabled(enabled);
-        }
-    }
-
-    @Override
-    public void onForget(WifiDialog2 dialog) {
-        forget(dialog.getWifiEntry());
-    }
-
-    @Override
-    public void onSubmit(WifiDialog2 dialog) {
-        final int dialogMode = dialog.getMode();
-        final WifiConfiguration config = dialog.getController().getConfig();
-        final WifiEntry wifiEntry = dialog.getWifiEntry();
-
-        if (dialogMode == WifiConfigUiBase2.MODE_MODIFY) {
-            if (config == null) {
-                Toast.makeText(getContext(), R.string.wifi_failed_save_message,
-                        Toast.LENGTH_SHORT).show();
-            } else {
-                mWifiManager.save(config, mSaveListener);
-            }
-        } else if (dialogMode == WifiConfigUiBase2.MODE_CONNECT
-                || (dialogMode == WifiConfigUiBase2.MODE_VIEW && wifiEntry.canConnect())) {
-            if (config == null) {
-                connect(wifiEntry, false /* editIfNoConfig */,
-                        false /* fullScreenEdit*/);
-            } else {
-                mWifiManager.connect(config, new WifiConnectActionListener());
-            }
-        }
-    }
-
-    @Override
-    public void onScan(WifiDialog2 dialog, String ssid) {
-        // Launch QR code scanner to join a network.
-        startActivityForResult(WifiDppUtils.getEnrolleeQrCodeScannerIntent(ssid),
-                REQUEST_CODE_WIFI_DPP_ENROLLEE_QR_CODE_SCANNER);
-    }
-
-    private void forget(WifiEntry wifiEntry) {
-        mMetricsFeatureProvider.action(getActivity(), SettingsEnums.ACTION_WIFI_FORGET);
-        wifiEntry.forget(null /* callback */);
-    }
-
-    @VisibleForTesting
-    void connect(WifiEntry wifiEntry, boolean editIfNoConfig, boolean fullScreenEdit) {
-        mMetricsFeatureProvider.action(getActivity(), SettingsEnums.ACTION_WIFI_CONNECT,
-                wifiEntry.isSaved());
-
-        // If it's an unsaved secure WifiEntry, it will callback
-        // ConnectCallback#onConnectResult with ConnectCallback#CONNECT_STATUS_FAILURE_NO_CONFIG
-        wifiEntry.connect(new WifiEntryConnectCallback(wifiEntry, editIfNoConfig,
-                fullScreenEdit));
-    }
-
-    private class WifiConnectActionListener implements WifiManager.ActionListener {
-        @Override
-        public void onSuccess() {
-            mClickedConnect = true;
-        }
-
-        @Override
-        public void onFailure(int reason) {
-            if (isFinishingOrDestroyed()) {
-                return;
-            }
-            Toast.makeText(getContext(), R.string.wifi_failed_connect_message, Toast.LENGTH_SHORT)
-                    .show();
-        }
-    };
-
-    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.wifi_settings2) {
-                @Override
-                public List<String> getNonIndexableKeys(Context context) {
-                    final List<String> keys = super.getNonIndexableKeys(context);
-
-                    final WifiManager wifiManager = context.getSystemService(WifiManager.class);
-                    if (WifiSavedConfigUtils.getAllConfigsCount(context, wifiManager) == 0) {
-                        keys.add(PREF_KEY_SAVED_NETWORKS);
-                    }
-
-                    if (!DataUsageUtils.hasWifiRadio(context)) {
-                        keys.add(PREF_KEY_DATA_USAGE);
-                    }
-                    return keys;
-                }
-            };
-
-    private class WifiEntryConnectCallback implements ConnectCallback {
-        final WifiEntry mConnectWifiEntry;
-        final boolean mEditIfNoConfig;
-        final boolean mFullScreenEdit;
-
-        WifiEntryConnectCallback(WifiEntry connectWifiEntry, boolean editIfNoConfig,
-                boolean fullScreenEdit) {
-            mConnectWifiEntry = connectWifiEntry;
-            mEditIfNoConfig = editIfNoConfig;
-            mFullScreenEdit = fullScreenEdit;
-        }
-
-        @Override
-        public void onConnectResult(@ConnectStatus int status) {
-            if (isFinishingOrDestroyed()) {
-                return;
-            }
-
-            if (status == ConnectCallback.CONNECT_STATUS_SUCCESS) {
-                mClickedConnect = true;
-            } else if (status == ConnectCallback.CONNECT_STATUS_FAILURE_NO_CONFIG) {
-                if (mEditIfNoConfig) {
-                    // Edit an unsaved secure Wi-Fi network.
-                    if (mFullScreenEdit) {
-                        launchConfigNewNetworkFragment(mConnectWifiEntry);
-                    } else {
-                        showDialog(mConnectWifiEntry, WifiConfigUiBase2.MODE_CONNECT);
-                    }
-                }
-            } else if (status == CONNECT_STATUS_FAILURE_UNKNOWN) {
-                Toast.makeText(getContext(), R.string.wifi_failed_connect_message,
-                        Toast.LENGTH_SHORT).show();
-            }
-        }
-    }
-
-    private void launchConfigNewNetworkFragment(WifiEntry wifiEntry) {
-        final Bundle bundle = new Bundle();
-        bundle.putString(WifiNetworkDetailsFragment2.KEY_CHOSEN_WIFIENTRY_KEY,
-                wifiEntry.getKey());
-        new SubSettingLauncher(getContext())
-                .setTitleText(wifiEntry.getTitle())
-                .setDestination(ConfigureWifiEntryFragment.class.getName())
-                .setArguments(bundle)
-                .setSourceMetricsCategory(getMetricsCategory())
-                .setResultListener(WifiSettings2.this, CONFIG_NETWORK_REQUEST)
-                .launch();
-    }
-
-    /** Helper method to return whether a WifiEntry is disabled due to a wrong password */
-    private static boolean isDisabledByWrongPassword(WifiEntry wifiEntry) {
-        WifiConfiguration config = wifiEntry.getWifiConfiguration();
-        if (config == null) {
-            return false;
-        }
-        WifiConfiguration.NetworkSelectionStatus networkStatus =
-                config.getNetworkSelectionStatus();
-        if (networkStatus == null
-                || networkStatus.getNetworkSelectionStatus() == NETWORK_SELECTION_ENABLED) {
-            return false;
-        }
-        int reason = networkStatus.getNetworkSelectionDisableReason();
-        return WifiConfiguration.NetworkSelectionStatus.DISABLED_BY_WRONG_PASSWORD == reason;
-    }
-
-    @VisibleForTesting
-    void openSubscriptionHelpPage(WifiEntry wifiEntry) {
-        final Intent intent = getHelpIntent(getContext(), wifiEntry.getHelpUriString());
-        if (intent != null) {
-            try {
-                startActivityForResult(intent, MANAGE_SUBSCRIPTION);
-            } catch (ActivityNotFoundException e) {
-                Log.e(TAG, "Activity was not found for intent, " + intent.toString());
-            }
-        }
-    }
-
-    @VisibleForTesting
-    Intent getHelpIntent(Context context, String helpUrlString) {
-        return HelpUtils.getHelpIntent(context, helpUrlString, context.getClass().getName());
-    }
-}
diff --git a/src/com/android/settings/wifi/WifiUtils.java b/src/com/android/settings/wifi/WifiUtils.java
index 1333ab4..06f74d5 100644
--- a/src/com/android/settings/wifi/WifiUtils.java
+++ b/src/com/android/settings/wifi/WifiUtils.java
@@ -23,6 +23,7 @@
 import android.content.pm.PackageManager;
 import android.net.NetworkCapabilities;
 import android.net.wifi.ScanResult;
+import android.net.wifi.SoftApConfiguration;
 import android.net.wifi.WifiConfiguration;
 import android.os.UserHandle;
 import android.os.UserManager;
@@ -30,7 +31,7 @@
 import android.text.TextUtils;
 
 import com.android.settings.Utils;
-import com.android.settingslib.wifi.AccessPoint;
+import com.android.wifitrackerlib.WifiEntry;
 
 import java.nio.charset.StandardCharsets;
 
@@ -38,8 +39,6 @@
 
     private static final int SSID_ASCII_MIN_LENGTH = 1;
     private static final int SSID_ASCII_MAX_LENGTH = 32;
-    private static final int PASSWORD_MIN_LENGTH = 8;
-    private static final int PASSWORD_MAX_LENGTH = 63;
 
 
     public static boolean isSSIDTooLong(String ssid) {
@@ -56,13 +55,17 @@
         return ssid.length() < SSID_ASCII_MIN_LENGTH;
     }
 
-    public static boolean isHotspotPasswordValid(String password) {
-        if (TextUtils.isEmpty(password)) {
+    /**
+     * Check if the WPA2-PSK hotspot password is valid.
+     */
+    public static boolean isHotspotWpa2PasswordValid(String password) {
+        final SoftApConfiguration.Builder configBuilder = new SoftApConfiguration.Builder();
+        try {
+            configBuilder.setPassphrase(password, SoftApConfiguration.SECURITY_TYPE_WPA2_PSK);
+        } catch (IllegalArgumentException e) {
             return false;
         }
-
-        final int length = password.length();
-        return length >= PASSWORD_MIN_LENGTH && length <= PASSWORD_MAX_LENGTH;
+        return true;
     }
 
     /**
@@ -132,161 +135,99 @@
 
     /**
      * Provides a simple way to generate a new {@link WifiConfiguration} obj from
-     * {@link ScanResult} or {@link AccessPoint}. Either {@code accessPoint} or {@code scanResult
+     * {@link ScanResult} or {@link WifiEntry}. Either {@code wifiEntry} or {@code scanResult
      * } input should be not null for retrieving information, otherwise will throw
      * IllegalArgumentException.
-     * This method prefers to take {@link AccessPoint} input in priority. Therefore this method
-     * will take {@link AccessPoint} input as preferred data extraction source when you input
-     * both {@link AccessPoint} and {@link ScanResult}, and ignore {@link ScanResult} input.
+     * This method prefers to take {@link WifiEntry} input in priority. Therefore this method
+     * will take {@link WifiEntry} input as preferred data extraction source when you input
+     * both {@link WifiEntry} and {@link ScanResult}, and ignore {@link ScanResult} input.
      *
      * Duplicated and simplified method from {@link WifiConfigController#getConfig()}.
      * TODO(b/120827021): Should be removed if the there is have a common one in shared place (e.g.
      * SettingsLib).
      *
-     * @param accessPoint Input data for retrieving WifiConfiguration.
+     * @param wifiEntry Input data for retrieving WifiConfiguration.
      * @param scanResult  Input data for retrieving WifiConfiguration.
      * @return WifiConfiguration obj based on input.
      */
-    public static WifiConfiguration getWifiConfig(AccessPoint accessPoint, ScanResult scanResult,
-            String password) {
-        if (accessPoint == null && scanResult == null) {
+    public static WifiConfiguration getWifiConfig(WifiEntry wifiEntry, ScanResult scanResult) {
+        if (wifiEntry == null && scanResult == null) {
             throw new IllegalArgumentException(
-                    "At least one of AccessPoint and ScanResult input is required.");
+                    "At least one of WifiEntry and ScanResult input is required.");
         }
 
         final WifiConfiguration config = new WifiConfiguration();
         final int security;
 
-        if (accessPoint == null) {
-            config.SSID = AccessPoint.convertToQuotedString(scanResult.SSID);
-            security = getAccessPointSecurity(scanResult);
+        if (wifiEntry == null) {
+            config.SSID = "\"" + scanResult.SSID + "\"";
+            security = getWifiEntrySecurity(scanResult);
         } else {
-            if (!accessPoint.isSaved()) {
-                config.SSID = AccessPoint.convertToQuotedString(
-                        accessPoint.getSsidStr());
+            if (wifiEntry.getWifiConfiguration() == null) {
+                config.SSID = "\"" + wifiEntry.getSsid() + "\"";
             } else {
-                config.networkId = accessPoint.getConfig().networkId;
-                config.hiddenSSID = accessPoint.getConfig().hiddenSSID;
+                config.networkId = wifiEntry.getWifiConfiguration().networkId;
+                config.hiddenSSID = wifiEntry.getWifiConfiguration().hiddenSSID;
             }
-            security = accessPoint.getSecurity();
+            security = wifiEntry.getSecurity();
         }
 
         switch (security) {
-            case AccessPoint.SECURITY_NONE:
+            case WifiEntry.SECURITY_NONE:
                 config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_OPEN);
                 break;
 
-            case AccessPoint.SECURITY_WEP:
+            case WifiEntry.SECURITY_WEP:
                 config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_WEP);
-                if (!TextUtils.isEmpty(password)) {
-                    int length = password.length();
-                    // WEP-40, WEP-104, and 256-bit WEP (WEP-232?)
-                    if ((length == 10 || length == 26 || length == 58)
-                            && password.matches("[0-9A-Fa-f]*")) {
-                        config.wepKeys[0] = password;
-                    } else {
-                        config.wepKeys[0] = '"' + password + '"';
-                    }
-                }
                 break;
 
-            case AccessPoint.SECURITY_PSK:
+            case WifiEntry.SECURITY_PSK:
                 config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_PSK);
-                if (!TextUtils.isEmpty(password)) {
-                    if (password.matches("[0-9A-Fa-f]{64}")) {
-                        config.preSharedKey = password;
-                    } else {
-                        config.preSharedKey = '"' + password + '"';
-                    }
-                }
                 break;
 
-            case AccessPoint.SECURITY_EAP:
-            case AccessPoint.SECURITY_EAP_SUITE_B:
-                if (security == AccessPoint.SECURITY_EAP_SUITE_B) {
-                    // allowedSuiteBCiphers will be set according to certificate type
-                    config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP_SUITE_B);
-                } else {
-                    config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP);
-                }
-
-                if (!TextUtils.isEmpty(password)) {
-                    config.enterpriseConfig.setPassword(password);
-                }
+            case WifiEntry.SECURITY_EAP_SUITE_B:
+                config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP_SUITE_B);
                 break;
-            case AccessPoint.SECURITY_SAE:
+
+            case WifiEntry.SECURITY_EAP:
+                config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP);
+                break;
+
+            case WifiEntry.SECURITY_SAE:
                 config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_SAE);
-                if (!TextUtils.isEmpty(password)) {
-                    config.preSharedKey = '"' + password + '"';
-                }
                 break;
 
-            case AccessPoint.SECURITY_OWE:
+            case WifiEntry.SECURITY_OWE:
                 config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_OWE);
                 break;
 
             default:
                 break;
         }
-
         return config;
     }
 
-
     /**
      * Gets security value from ScanResult.
      *
-     * Duplicated method from {@link AccessPoint#getSecurity(ScanResult)}.
-     * TODO(b/120827021): Should be removed if the there is have a common one in shared place (e.g.
-     * SettingsLib).
-     *
      * @param result ScanResult
-     * @return Related security value based on {@link AccessPoint}.
+     * @return Related security value based on {@link WifiEntry}.
      */
-    public static int getAccessPointSecurity(ScanResult result) {
+    public static int getWifiEntrySecurity(ScanResult result) {
         if (result.capabilities.contains("WEP")) {
-            return AccessPoint.SECURITY_WEP;
+            return WifiEntry.SECURITY_WEP;
         } else if (result.capabilities.contains("SAE")) {
-            return AccessPoint.SECURITY_SAE;
+            return WifiEntry.SECURITY_SAE;
         } else if (result.capabilities.contains("PSK")) {
-            return AccessPoint.SECURITY_PSK;
+            return WifiEntry.SECURITY_PSK;
         } else if (result.capabilities.contains("EAP_SUITE_B_192")) {
-            return AccessPoint.SECURITY_EAP_SUITE_B;
+            return WifiEntry.SECURITY_EAP_SUITE_B;
         } else if (result.capabilities.contains("EAP")) {
-            return AccessPoint.SECURITY_EAP;
+            return WifiEntry.SECURITY_EAP;
         } else if (result.capabilities.contains("OWE")) {
-            return AccessPoint.SECURITY_OWE;
+            return WifiEntry.SECURITY_OWE;
         }
 
-        return AccessPoint.SECURITY_NONE;
-    }
-
-
-    public static final int CONNECT_TYPE_OTHERS = 0;
-    public static final int CONNECT_TYPE_OPEN_NETWORK = 1;
-    public static final int CONNECT_TYPE_SAVED_NETWORK = 2;
-    public static final int CONNECT_TYPE_OSU_PROVISION = 3;
-
-    /**
-     * Gets the connecting type of {@link AccessPoint}.
-     */
-    public static int getConnectingType(AccessPoint accessPoint) {
-        final WifiConfiguration config = accessPoint.getConfig();
-        if (accessPoint.isOsuProvider()) {
-            return CONNECT_TYPE_OSU_PROVISION;
-        } else if ((accessPoint.getSecurity() == AccessPoint.SECURITY_NONE) ||
-                (accessPoint.getSecurity() == AccessPoint.SECURITY_OWE)) {
-            return CONNECT_TYPE_OPEN_NETWORK;
-        } else if (accessPoint.isSaved() && config != null
-                && config.getNetworkSelectionStatus() != null
-                && config.getNetworkSelectionStatus().hasEverConnected()) {
-            return CONNECT_TYPE_SAVED_NETWORK;
-        } else if (accessPoint.isPasspoint()) {
-            // Access point provided by an installed Passpoint provider, connect using
-            // the associated config.
-            return CONNECT_TYPE_SAVED_NETWORK;
-        } else {
-            return CONNECT_TYPE_OTHERS;
-        }
+        return WifiEntry.SECURITY_NONE;
     }
 }
diff --git a/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragment.java b/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragment.java
index a48358f..3921488 100644
--- a/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragment.java
+++ b/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragment.java
@@ -86,9 +86,9 @@
     static final int RESULT_NETWORK_ALREADY_EXISTS = 2;
 
     // Handler messages for controlling different state and delay showing the status message.
-    private static final int MESSAGE_START_SAVING_NETWORK = 1;
-    private static final int MESSAGE_SHOW_SAVED_AND_CONNECT_NETWORK = 2;
-    private static final int MESSAGE_SHOW_SAVE_FAILED = 3;
+    @VisibleForTesting static final int MESSAGE_START_SAVING_NETWORK = 1;
+    @VisibleForTesting static final int MESSAGE_SHOW_SAVED_AND_CONNECT_NETWORK = 2;
+    @VisibleForTesting static final int MESSAGE_SHOW_SAVE_FAILED = 3;
     private static final int MESSAGE_FINISH = 4;
 
     // Signal level for the initial signal icon.
@@ -137,7 +137,8 @@
     private WifiManager.ActionListener mSaveListener;
     private WifiManager mWifiManager;
 
-    private final Handler mHandler = new Handler() {
+    @VisibleForTesting
+    final Handler mHandler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
             showSaveStatusByState(msg.what);
@@ -638,7 +639,8 @@
     /**
      * Call framework API to save single network.
      */
-    private void saveNetwork(int index) {
+    @VisibleForTesting
+    void saveNetwork(int index) {
         final PasspointConfiguration passpointConfig =
                 mUiToRequestedList.get(index).mWifiNetworkSuggestion.getPasspointConfig();
         if (passpointConfig != null) {
@@ -689,7 +691,8 @@
         return SettingsEnums.PANEL_ADD_WIFI_NETWORKS;
     }
 
-    private void showSaveStatusByState(int status) {
+    @VisibleForTesting
+    void showSaveStatusByState(int status) {
         switch (status) {
             case MESSAGE_START_SAVING_NETWORK:
                 if (mIsSingleNetwork) {
@@ -747,21 +750,29 @@
 
 
     @VisibleForTesting
-    void updateScanResultsToUi(List<WifiEntry> allEntries) {
+    void updateScanResultsToUi() {
         if (mUiToRequestedList == null) {
             // Nothing need to be updated.
             return;
         }
 
+        List<WifiEntry> reachableWifiEntries = null;
+        if (mWifiPickerTracker.getWifiState() == WifiManager.WIFI_STATE_ENABLED) {
+            reachableWifiEntries = mWifiPickerTracker.getWifiEntries();
+            final WifiEntry connectedWifiEntry = mWifiPickerTracker.getConnectedWifiEntry();
+            if (connectedWifiEntry != null) {
+                reachableWifiEntries.add(connectedWifiEntry);
+            }
+        }
+
         // Update the signal level of the UI networks.
         for (UiConfigurationItem uiConfigurationItem : mUiToRequestedList) {
             uiConfigurationItem.mLevel = 0;
-            if (allEntries != null) {
-                final Optional<WifiEntry> matchedWifiEntry = allEntries.stream()
+            if (reachableWifiEntries != null) {
+                final Optional<WifiEntry> matchedWifiEntry = reachableWifiEntries.stream()
                         .filter(wifiEntry -> TextUtils.equals(
                                 uiConfigurationItem.mWifiNetworkSuggestion.getSsid(),
                                 wifiEntry.getSsid()))
-                        .filter(wifiEntry -> !wifiEntry.isSaved())
                         .findFirst();
                 uiConfigurationItem.mLevel =
                         matchedWifiEntry.isPresent() ? matchedWifiEntry.get().getLevel() : 0;
@@ -794,9 +805,7 @@
      */
     @Override
     public void onWifiEntriesChanged() {
-        updateScanResultsToUi(
-                (mWifiPickerTracker.getWifiState() == WifiManager.WIFI_STATE_ENABLED)
-                        ? mWifiPickerTracker.getWifiEntries() : null);
+        updateScanResultsToUi();
     }
 
     @Override
diff --git a/src/com/android/settings/wifi/details/AddDevicePreferenceController.java b/src/com/android/settings/wifi/details/AddDevicePreferenceController.java
deleted file mode 100644
index 2f4434a..0000000
--- a/src/com/android/settings/wifi/details/AddDevicePreferenceController.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi.details;
-
-import android.content.Context;
-import android.content.Intent;
-import android.net.wifi.WifiManager;
-import android.util.Log;
-
-import androidx.preference.Preference;
-
-import com.android.settings.core.BasePreferenceController;
-import com.android.settings.wifi.dpp.WifiDppUtils;
-import com.android.settingslib.wifi.AccessPoint;
-
-/**
- * {@link BasePreferenceController} that launches Wi-Fi Easy Connect configurator flow.
- *
- * Migrating from Wi-Fi SettingsLib to to WifiTrackerLib, this object will be removed in the near
- * future, please develop in
- * {@link com.android.settings.wifi.details2.AddDevicePreferenceController2}.
- */
-public class AddDevicePreferenceController extends BasePreferenceController {
-
-    private static final String TAG = "AddDevicePreferenceController";
-
-    private static final String KEY_ADD_DEVICE = "add_device_to_network";
-
-    private AccessPoint mAccessPoint;
-    private WifiManager mWifiManager;
-
-    public AddDevicePreferenceController(Context context) {
-        super(context, KEY_ADD_DEVICE);
-
-        mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
-    }
-
-    public AddDevicePreferenceController init(AccessPoint accessPoint) {
-        mAccessPoint = accessPoint;
-
-        return this;
-    }
-
-    @Override
-    public int getAvailabilityStatus() {
-        if (WifiDppUtils.isSupportConfiguratorQrCodeScanner(mContext, mAccessPoint)) {
-            return AVAILABLE;
-        } else {
-            return CONDITIONALLY_UNAVAILABLE;
-        }
-    }
-
-    @Override
-    public boolean handlePreferenceTreeClick(Preference preference) {
-        if (KEY_ADD_DEVICE.equals(preference.getKey())) {
-            WifiDppUtils.showLockScreen(mContext, () -> launchWifiDppConfiguratorQrCodeScanner());
-            return true; /* click is handled */
-        }
-
-        return false; /* click is not handled */
-    }
-
-    private void launchWifiDppConfiguratorQrCodeScanner() {
-        final Intent intent = WifiDppUtils.getConfiguratorQrCodeScannerIntentOrNull(mContext,
-                mWifiManager, mAccessPoint);
-
-        if (intent == null) {
-            Log.e(TAG, "Launch Wi-Fi QR code scanner with a wrong Wi-Fi network!");
-        } else {
-            mContext.startActivity(intent);
-        }
-    }
-}
diff --git a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
deleted file mode 100644
index 8dd8d7a..0000000
--- a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
+++ /dev/null
@@ -1,1296 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.wifi.details;
-
-import static android.net.NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL;
-import static android.net.NetworkCapabilities.NET_CAPABILITY_PARTIAL_CONNECTIVITY;
-import static android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED;
-import static android.net.NetworkCapabilities.TRANSPORT_WIFI;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.settings.SettingsEnums;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.graphics.Bitmap;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.VectorDrawable;
-import android.net.CaptivePortalData;
-import android.net.ConnectivityManager;
-import android.net.ConnectivityManager.NetworkCallback;
-import android.net.LinkAddress;
-import android.net.LinkProperties;
-import android.net.Network;
-import android.net.NetworkCapabilities;
-import android.net.NetworkInfo;
-import android.net.NetworkRequest;
-import android.net.NetworkUtils;
-import android.net.RouteInfo;
-import android.net.Uri;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
-import android.os.CountDownTimer;
-import android.os.Handler;
-import android.text.TextUtils;
-import android.util.FeatureFlagUtils;
-import android.util.Log;
-import android.widget.ImageView;
-import android.widget.Toast;
-
-import androidx.annotation.VisibleForTesting;
-import androidx.core.text.BidiFormatter;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceFragmentCompat;
-import androidx.preference.PreferenceScreen;
-
-import com.android.settings.R;
-import com.android.settings.Utils;
-import com.android.settings.core.FeatureFlags;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.datausage.WifiDataUsageSummaryPreferenceController;
-import com.android.settings.widget.EntityHeaderController;
-import com.android.settings.wifi.WifiDialog;
-import com.android.settings.wifi.WifiDialog.WifiDialogListener;
-import com.android.settings.wifi.WifiUtils;
-import com.android.settings.wifi.dpp.WifiDppUtils;
-import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-import com.android.settingslib.core.lifecycle.LifecycleObserver;
-import com.android.settingslib.core.lifecycle.events.OnPause;
-import com.android.settingslib.core.lifecycle.events.OnResume;
-import com.android.settingslib.utils.StringUtil;
-import com.android.settingslib.widget.ActionButtonsPreference;
-import com.android.settingslib.widget.LayoutPreference;
-import com.android.settingslib.wifi.AccessPoint;
-import com.android.settingslib.wifi.WifiTracker;
-import com.android.settingslib.wifi.WifiTrackerFactory;
-
-import java.net.Inet4Address;
-import java.net.Inet6Address;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.time.Duration;
-import java.time.Instant;
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
-import java.time.format.FormatStyle;
-import java.util.StringJoiner;
-import java.util.stream.Collectors;
-
-/**
- * Controller for logic pertaining to displaying Wifi information for the
- * {@link WifiNetworkDetailsFragment}.
- *
- * Migrating from Wi-Fi SettingsLib to to WifiTrackerLib, this object will be removed in the near
- * future, please develop in
- * {@link com.android.settings.wifi.details2.WifiDetailPreferenceController2}.
- */
-public class WifiDetailPreferenceController extends AbstractPreferenceController
-        implements PreferenceControllerMixin, WifiDialogListener, LifecycleObserver, OnPause,
-        OnResume {
-
-    private static final String TAG = "WifiDetailsPrefCtrl";
-    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
-
-    @VisibleForTesting
-    static final String KEY_HEADER = "connection_header";
-    @VisibleForTesting
-    static final String KEY_DATA_USAGE_HEADER = "status_header";
-    @VisibleForTesting
-    static final String KEY_BUTTONS_PREF = "buttons";
-    @VisibleForTesting
-    static final String KEY_SIGNAL_STRENGTH_PREF = "signal_strength";
-    @VisibleForTesting
-    static final String KEY_TX_LINK_SPEED = "tx_link_speed";
-    @VisibleForTesting
-    static final String KEY_RX_LINK_SPEED = "rx_link_speed";
-    @VisibleForTesting
-    static final String KEY_FREQUENCY_PREF = "frequency";
-    @VisibleForTesting
-    static final String KEY_SECURITY_PREF = "security";
-    @VisibleForTesting
-    static final String KEY_SSID_PREF = "ssid";
-    @VisibleForTesting
-    static final String KEY_MAC_ADDRESS_PREF = "mac_address";
-    @VisibleForTesting
-    static final String KEY_IP_ADDRESS_PREF = "ip_address";
-    @VisibleForTesting
-    static final String KEY_GATEWAY_PREF = "gateway";
-    @VisibleForTesting
-    static final String KEY_SUBNET_MASK_PREF = "subnet_mask";
-    @VisibleForTesting
-    static final String KEY_DNS_PREF = "dns";
-    @VisibleForTesting
-    static final String KEY_IPV6_CATEGORY = "ipv6_category";
-    @VisibleForTesting
-    static final String KEY_IPV6_ADDRESSES_PREF = "ipv6_addresses";
-
-    private static final int STATE_NONE = 1;
-    private static final int STATE_ENABLE_WIFI = 2;
-    private static final int STATE_ENABLE_WIFI_FAILED = 3;
-    private static final int STATE_CONNECTING = 4;
-    private static final int STATE_CONNECTED = 5;
-    private static final int STATE_FAILED = 6;
-    private static final int STATE_NOT_IN_RANGE = 7;
-    private static final int STATE_DISCONNECTED = 8;
-    private static final long TIMEOUT = Duration.ofSeconds(10).toMillis();
-
-    // Be static to avoid too much object not be reset.
-    @VisibleForTesting
-    static CountDownTimer mTimer;
-
-    private AccessPoint mAccessPoint;
-    private final ConnectivityManager mConnectivityManager;
-    private final PreferenceFragmentCompat mFragment;
-    private final Handler mHandler;
-    private LinkProperties mLinkProperties;
-    private Network mNetwork;
-    private NetworkInfo mNetworkInfo;
-    private NetworkCapabilities mNetworkCapabilities;
-    private int mRssiSignalLevel = -1;
-    private String[] mSignalStr;
-    private WifiConfiguration mWifiConfig;
-    private WifiInfo mWifiInfo;
-    private final WifiManager mWifiManager;
-    private final WifiTracker mWifiTracker;
-    private final MetricsFeatureProvider mMetricsFeatureProvider;
-    private boolean mIsOutOfRange;
-    private boolean mIsEphemeral;
-    private boolean mConnected;
-    private int mConnectingState;
-    private WifiManager.ActionListener mConnectListener;
-
-    // UI elements - in order of appearance
-    private ActionButtonsPreference mButtonsPref;
-    private EntityHeaderController mEntityHeaderController;
-    private Preference mSignalStrengthPref;
-    private Preference mTxLinkSpeedPref;
-    private Preference mRxLinkSpeedPref;
-    private Preference mFrequencyPref;
-    private Preference mSecurityPref;
-    private Preference mSsidPref;
-    private Preference mMacAddressPref;
-    private Preference mIpAddressPref;
-    private Preference mGatewayPref;
-    private Preference mSubnetPref;
-    private Preference mDnsPref;
-    private PreferenceCategory mIpv6Category;
-    private Preference mIpv6AddressPref;
-    private Lifecycle mLifecycle;
-    Preference mDataUsageSummaryPref;
-    WifiDataUsageSummaryPreferenceController mSummaryHeaderController;
-
-    private final IconInjector mIconInjector;
-    private final Clock mClock;
-    private final IntentFilter mFilter;
-
-    // Passpoint information - cache it in case of losing these information after
-    // updateAccessPointFromScannedList(). For R2, we should update these data from
-    // WifiManager#getPasspointConfigurations() after users manage the passpoint profile.
-    private boolean mIsExpired;
-    private boolean mIsPasspointConfigurationR1;
-
-    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            switch (intent.getAction()) {
-                case WifiManager.CONFIGURED_NETWORKS_CHANGED_ACTION:
-                    updateMatchingWifiConfig();
-                    // fall through
-                case WifiManager.NETWORK_STATE_CHANGED_ACTION:
-                case WifiManager.RSSI_CHANGED_ACTION:
-                    refreshPage();
-                    break;
-            }
-        }
-
-        private void updateMatchingWifiConfig() {
-            // use getPrivilegedConfiguredNetworks() to get Passpoint & other ephemeral networks
-            for (WifiConfiguration wifiConfiguration :
-                    mWifiManager.getPrivilegedConfiguredNetworks()) {
-                if (mAccessPoint.matches(wifiConfiguration)) {
-                    mWifiConfig = wifiConfiguration;
-                    break;
-                }
-            }
-        }
-    };
-
-    private final NetworkRequest mNetworkRequest = new NetworkRequest.Builder()
-            .clearCapabilities().addTransportType(TRANSPORT_WIFI).build();
-
-    // Must be run on the UI thread since it directly manipulates UI state.
-    private final NetworkCallback mNetworkCallback = new NetworkCallback() {
-        @Override
-        public void onLinkPropertiesChanged(Network network, LinkProperties lp) {
-            if (network.equals(mNetwork) && !lp.equals(mLinkProperties)) {
-                mLinkProperties = lp;
-                refreshEntityHeader();
-                refreshButtons();
-                refreshIpLayerInfo();
-            }
-        }
-
-        private boolean hasCapabilityChanged(NetworkCapabilities nc, int cap) {
-            // If this is the first time we get NetworkCapabilities, report that something changed.
-            if (mNetworkCapabilities == null) return true;
-
-            // nc can never be null, see ConnectivityService#callCallbackForRequest.
-            return mNetworkCapabilities.hasCapability(cap) != nc.hasCapability(cap);
-        }
-
-        private boolean hasPrivateDnsStatusChanged(NetworkCapabilities nc) {
-            // If this is the first time that WifiDetailPreferenceController gets
-            // NetworkCapabilities, report that something has changed and assign nc to
-            // mNetworkCapabilities in onCapabilitiesChanged. Note that the NetworkCapabilities
-            // from onCapabilitiesChanged() will never be null, so calling
-            // mNetworkCapabilities.isPrivateDnsBroken() would be safe next time.
-            if (mNetworkCapabilities == null) {
-                return true;
-            }
-
-            return mNetworkCapabilities.isPrivateDnsBroken() != nc.isPrivateDnsBroken();
-        }
-
-        @Override
-        public void onCapabilitiesChanged(Network network, NetworkCapabilities nc) {
-            // If the network just validated or lost Internet access or detected partial internet
-            // connectivity or private dns was broken, refresh network state. Don't do this on
-            // every NetworkCapabilities change because refreshEntityHeader sends IPCs to the
-            // system server from the UI thread, which can cause jank.
-            if (network.equals(mNetwork) && !nc.equals(mNetworkCapabilities)) {
-                if (hasPrivateDnsStatusChanged(nc)
-                        || hasCapabilityChanged(nc, NET_CAPABILITY_VALIDATED)
-                        || hasCapabilityChanged(nc, NET_CAPABILITY_CAPTIVE_PORTAL)
-                        || hasCapabilityChanged(nc, NET_CAPABILITY_PARTIAL_CONNECTIVITY)) {
-                    mAccessPoint.update(mWifiConfig, mWifiInfo, mNetworkInfo);
-                    refreshEntityHeader();
-                }
-                mNetworkCapabilities = nc;
-                refreshButtons();
-                refreshIpLayerInfo();
-            }
-        }
-
-        @Override
-        public void onLost(Network network) {
-            // Ephemeral network not a saved network, leave detail page once disconnected
-            if (mIsEphemeral && network.equals(mNetwork)) {
-                exitActivity();
-            }
-        }
-    };
-
-    @VisibleForTesting
-    final WifiTracker.WifiListener mWifiListener = new WifiTracker.WifiListener() {
-        /** Called when the state of Wifi has changed. */
-        public void onWifiStateChanged(int state) {
-            Log.d(TAG, "onWifiStateChanged(" + state + ")");
-            if (mConnectingState == STATE_ENABLE_WIFI && state == WifiManager.WIFI_STATE_ENABLED) {
-                updateConnectingState(STATE_CONNECTING);
-            } else if (mConnectingState != STATE_NONE && state == WifiManager.WIFI_STATE_DISABLED) {
-                // update as disconnected once Wi-Fi disabled since may not received
-                // onConnectedChanged for this case.
-                updateConnectingState(STATE_DISCONNECTED);
-            }
-        }
-
-        /** Called when the connection state of wifi has changed. */
-        public void onConnectedChanged() {
-            refreshPage();
-        }
-
-        /**
-         * Called to indicate the list of AccessPoints has been updated and
-         * {@link WifiTracker#getAccessPoints()} should be called to get the updated list.
-         */
-        public void onAccessPointsChanged() {
-            refreshPage();
-        }
-    };
-
-    public static WifiDetailPreferenceController newInstance(
-            AccessPoint accessPoint,
-            ConnectivityManager connectivityManager,
-            Context context,
-            PreferenceFragmentCompat fragment,
-            Handler handler,
-            Lifecycle lifecycle,
-            WifiManager wifiManager,
-            MetricsFeatureProvider metricsFeatureProvider) {
-        return new WifiDetailPreferenceController(
-                accessPoint, connectivityManager, context, fragment, handler, lifecycle,
-                wifiManager, metricsFeatureProvider, new IconInjector(context), new Clock());
-    }
-
-    @VisibleForTesting
-        /* package */ WifiDetailPreferenceController(
-            AccessPoint accessPoint,
-            ConnectivityManager connectivityManager,
-            Context context,
-            PreferenceFragmentCompat fragment,
-            Handler handler,
-            Lifecycle lifecycle,
-            WifiManager wifiManager,
-            MetricsFeatureProvider metricsFeatureProvider,
-            IconInjector injector,
-            Clock clock) {
-        super(context);
-
-        mAccessPoint = accessPoint;
-        mConnectivityManager = connectivityManager;
-        mFragment = fragment;
-        mHandler = handler;
-        mSignalStr = context.getResources().getStringArray(R.array.wifi_signal);
-        mWifiConfig = accessPoint.getConfig();
-        mWifiManager = wifiManager;
-        mMetricsFeatureProvider = metricsFeatureProvider;
-        mIconInjector = injector;
-        mClock = clock;
-
-        mFilter = new IntentFilter();
-        mFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);
-        mFilter.addAction(WifiManager.RSSI_CHANGED_ACTION);
-        mFilter.addAction(WifiManager.CONFIGURED_NETWORKS_CHANGED_ACTION);
-
-        mLifecycle = lifecycle;
-        lifecycle.addObserver(this);
-
-        mWifiTracker = WifiTrackerFactory.create(
-                mFragment.getActivity(),
-                mWifiListener,
-                mLifecycle,
-                true /*includeSaved*/,
-                true /*includeScans*/);
-        mConnected = mAccessPoint.isActive();
-        // When lost the network connection, WifiInfo/NetworkInfo will be clear. So causes we
-        // could not check if the AccessPoint is ephemeral. Need to cache it in first.
-        mIsEphemeral = mAccessPoint.isEphemeral();
-        mConnectingState = STATE_NONE;
-        mConnectListener = new WifiManager.ActionListener() {
-            @Override
-            public void onSuccess() {
-                // Do nothing
-            }
-
-            @Override
-            public void onFailure(int reason) {
-                updateConnectingState(STATE_FAILED);
-            }
-        };
-
-        mIsExpired = mAccessPoint.isExpired();
-        mIsPasspointConfigurationR1 = mAccessPoint.isPasspointConfigurationR1();
-    }
-
-    @Override
-    public boolean isAvailable() {
-        return true;
-    }
-
-    @Override
-    public String getPreferenceKey() {
-        // Returns null since this controller contains more than one Preference
-        return null;
-    }
-
-    @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        setupEntityHeader(screen);
-
-        mButtonsPref = ((ActionButtonsPreference) screen.findPreference(KEY_BUTTONS_PREF))
-                .setButton1Text(R.string.forget)
-                .setButton1Icon(R.drawable.ic_settings_delete)
-                .setButton1OnClickListener(view -> forgetNetwork())
-                .setButton3Text(R.string.wifi_connect)
-                .setButton3Icon(R.drawable.ic_settings_wireless)
-                .setButton3OnClickListener(view -> connectNetwork())
-                .setButton3Enabled(true)
-                .setButton4Text(R.string.share)
-                .setButton4Icon(R.drawable.ic_qrcode_24dp)
-                .setButton4OnClickListener(view -> shareNetwork());
-        updateCaptivePortalButton();
-
-        if (isPasspointConfigurationR1Expired()) {
-            // Hide Connect button.
-            mButtonsPref.setButton3Visible(false);
-        }
-
-        mSignalStrengthPref = screen.findPreference(KEY_SIGNAL_STRENGTH_PREF);
-        mTxLinkSpeedPref = screen.findPreference(KEY_TX_LINK_SPEED);
-        mRxLinkSpeedPref = screen.findPreference(KEY_RX_LINK_SPEED);
-        mFrequencyPref = screen.findPreference(KEY_FREQUENCY_PREF);
-        mSecurityPref = screen.findPreference(KEY_SECURITY_PREF);
-
-        mSsidPref = screen.findPreference(KEY_SSID_PREF);
-        mMacAddressPref = screen.findPreference(KEY_MAC_ADDRESS_PREF);
-        mIpAddressPref = screen.findPreference(KEY_IP_ADDRESS_PREF);
-        mGatewayPref = screen.findPreference(KEY_GATEWAY_PREF);
-        mSubnetPref = screen.findPreference(KEY_SUBNET_MASK_PREF);
-        mDnsPref = screen.findPreference(KEY_DNS_PREF);
-
-        mIpv6Category = screen.findPreference(KEY_IPV6_CATEGORY);
-        mIpv6AddressPref = screen.findPreference(KEY_IPV6_ADDRESSES_PREF);
-
-        mSecurityPref.setSummary(mAccessPoint.getSecurityString(/* concise */ false));
-    }
-
-    /**
-     * Update text, icon and listener of the captive portal button.
-     * @return True if the button should be shown.
-     */
-    private boolean updateCaptivePortalButton() {
-        final Uri venueInfoUrl = getCaptivePortalVenueInfoUrl();
-        if (venueInfoUrl == null) {
-            mButtonsPref.setButton2Text(R.string.wifi_sign_in_button_text)
-                    .setButton2Icon(R.drawable.ic_settings_sign_in)
-                    .setButton2OnClickListener(view -> signIntoNetwork());
-            return canSignIntoNetwork();
-        }
-
-        mButtonsPref.setButton2Text(R.string.wifi_venue_website_button_text)
-                .setButton2Icon(R.drawable.ic_settings_sign_in)
-                .setButton2OnClickListener(view -> {
-                    final Intent infoIntent = new Intent(Intent.ACTION_VIEW);
-                    infoIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                    infoIntent.setData(venueInfoUrl);
-                    mContext.startActivity(infoIntent);
-                });
-        return mAccessPoint.isActive();
-    }
-
-    private Uri getCaptivePortalVenueInfoUrl() {
-        final LinkProperties lp = mLinkProperties;
-        if (lp == null) {
-            return null;
-        }
-        final CaptivePortalData data = lp.getCaptivePortalData();
-        if (data == null) {
-            return null;
-        }
-        return data.getVenueInfoUrl();
-    }
-
-    private void setupEntityHeader(PreferenceScreen screen) {
-        LayoutPreference headerPref = screen.findPreference(KEY_HEADER);
-
-        if (usingDataUsageHeader(mContext)) {
-            headerPref.setVisible(false);
-            mDataUsageSummaryPref = screen.findPreference(KEY_DATA_USAGE_HEADER);
-            mDataUsageSummaryPref.setVisible(true);
-            mSummaryHeaderController =
-                new WifiDataUsageSummaryPreferenceController(mFragment.getActivity(),
-                        mLifecycle, (PreferenceFragmentCompat) mFragment, mAccessPoint.getSsid());
-            return;
-        }
-
-        mEntityHeaderController =
-                EntityHeaderController.newInstance(
-                        mFragment.getActivity(), mFragment,
-                        headerPref.findViewById(R.id.entity_header));
-
-        ImageView iconView = headerPref.findViewById(R.id.entity_header_icon);
-
-        iconView.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
-
-        mEntityHeaderController.setLabel(mAccessPoint.getTitle());
-    }
-
-    private String getExpiryTimeSummary() {
-        if (mLinkProperties == null || mLinkProperties.getCaptivePortalData() == null) {
-            return null;
-        }
-
-        final long expiryTimeMillis = mLinkProperties.getCaptivePortalData().getExpiryTimeMillis();
-        if (expiryTimeMillis <= 0) {
-            return null;
-        }
-        final ZonedDateTime now = mClock.now();
-        final ZonedDateTime expiryTime = ZonedDateTime.ofInstant(
-                Instant.ofEpochMilli(expiryTimeMillis),
-                now.getZone());
-
-        if (now.isAfter(expiryTime)) {
-            return null;
-        }
-
-        if (now.plusDays(2).isAfter(expiryTime)) {
-            // Expiration within 2 days: show a duration
-            return mContext.getString(R.string.wifi_time_remaining, StringUtil.formatElapsedTime(
-                    mContext,
-                    Duration.between(now, expiryTime).getSeconds() * 1000,
-                    false /* withSeconds */));
-        }
-
-        // For more than 2 days, show the expiry date
-        return mContext.getString(R.string.wifi_expiry_time,
-                DateTimeFormatter.ofLocalizedDateTime(FormatStyle.SHORT).format(expiryTime));
-    }
-
-    private void refreshEntityHeader() {
-        if (usingDataUsageHeader(mContext)) {
-            mSummaryHeaderController.updateState(mDataUsageSummaryPref);
-        } else {
-            String summary;
-            if (isPasspointConfigurationR1Expired()) {
-                // Not able to get summary from AccessPoint because we may lost
-                // PasspointConfiguration information after updateAccessPointFromScannedList().
-                summary = mContext.getResources().getString(
-                        com.android.settingslib.R.string.wifi_passpoint_expired);
-            } else {
-                summary = mAccessPoint.getSettingsSummary(true /* convertSavedAsDisconnected */);
-            }
-
-            mEntityHeaderController
-                    .setSummary(summary)
-                    .setSecondSummary(getExpiryTimeSummary())
-                    .setRecyclerView(mFragment.getListView(), mLifecycle)
-                    .done(mFragment.getActivity(), true /* rebind */);
-        }
-    }
-
-    private void updateNetworkInfo() {
-        mNetwork = mWifiManager.getCurrentNetwork();
-        mLinkProperties = mConnectivityManager.getLinkProperties(mNetwork);
-        mNetworkCapabilities = mConnectivityManager.getNetworkCapabilities(mNetwork);
-    }
-
-    @Override
-    public void onResume() {
-        // Ensure mNetwork is set before any callbacks above are delivered, since our
-        // NetworkCallback only looks at changes to mNetwork.
-        updateNetworkInfo();
-        refreshPage();
-        mContext.registerReceiver(mReceiver, mFilter);
-        mConnectivityManager.registerNetworkCallback(mNetworkRequest, mNetworkCallback,
-                mHandler);
-    }
-
-    @Override
-    public void onPause() {
-        mNetwork = null;
-        mLinkProperties = null;
-        mNetworkCapabilities = null;
-        mNetworkInfo = null;
-        mWifiInfo = null;
-        mContext.unregisterReceiver(mReceiver);
-        mConnectivityManager.unregisterNetworkCallback(mNetworkCallback);
-    }
-
-    private void refreshPage() {
-        if(!updateAccessPoint()) {
-            return;
-        }
-
-        Log.d(TAG, "Update UI!");
-
-        // refresh header
-        refreshEntityHeader();
-
-        // refresh Buttons
-        refreshButtons();
-
-        // Update Connection Header icon and Signal Strength Preference
-        refreshRssiViews();
-        // Frequency Pref
-        refreshFrequency();
-        // Transmit Link Speed Pref
-        refreshTxSpeed();
-        // Receive Link Speed Pref
-        refreshRxSpeed();
-        // IP related information
-        refreshIpLayerInfo();
-        // SSID Pref
-        refreshSsid();
-        // MAC Address Pref
-        refreshMacAddress();
-    }
-
-    @VisibleForTesting
-    boolean updateAccessPoint() {
-        boolean changed = false;
-        // remember mIsOutOfRange as old before updated
-        boolean oldState = mIsOutOfRange;
-        updateAccessPointFromScannedList();
-
-        if (mAccessPoint.isActive()) {
-            updateNetworkInfo();
-            mNetworkInfo = mConnectivityManager.getNetworkInfo(mNetwork);
-            mWifiInfo = mWifiManager.getConnectionInfo();
-            if (mNetwork == null || mNetworkInfo == null || mWifiInfo == null) {
-                // Once connected, can't get mNetwork immediately, return false and wait for
-                // next time to update UI. also reset {@code mIsOutOfRange}
-                mIsOutOfRange = oldState;
-                return false;
-            }
-            changed |= mAccessPoint.update(mWifiConfig, mWifiInfo, mNetworkInfo);
-        }
-
-        // signal level changed
-        changed |= mRssiSignalLevel != mAccessPoint.getLevel();
-        // In/Out of range changed
-        changed |= oldState != mIsOutOfRange;
-        // connect state changed
-        if (mConnected != mAccessPoint.isActive()) {
-            mConnected = mAccessPoint.isActive();
-            changed = true;
-            updateConnectingState(mAccessPoint.isActive() ? STATE_CONNECTED : STATE_DISCONNECTED);
-        }
-
-        return changed;
-    }
-
-    private void updateAccessPointFromScannedList() {
-        mIsOutOfRange = true;
-
-        for (AccessPoint ap : mWifiTracker.getAccessPoints()) {
-            if (mAccessPoint.matches(ap)) {
-                mAccessPoint = ap;
-                mWifiConfig = ap.getConfig();
-                mIsOutOfRange = !mAccessPoint.isReachable();
-                return;
-            }
-        }
-    }
-
-    private void exitActivity() {
-        if (DEBUG) {
-            Log.d(TAG, "Exiting the WifiNetworkDetailsPage");
-        }
-        mFragment.getActivity().finish();
-    }
-
-    private void refreshRssiViews() {
-        int signalLevel = mAccessPoint.getLevel();
-
-        // Disappears signal view if not in range. e.g. for saved networks.
-        if (mIsOutOfRange) {
-            mSignalStrengthPref.setVisible(false);
-            mRssiSignalLevel = -1;
-            return;
-        }
-
-        if (mRssiSignalLevel == signalLevel) {
-            return;
-        }
-        mRssiSignalLevel = signalLevel;
-        Drawable wifiIcon = mIconInjector.getIcon(mRssiSignalLevel);
-
-        if (mEntityHeaderController != null) {
-            mEntityHeaderController
-                    .setIcon(redrawIconForHeader(wifiIcon)).done(mFragment.getActivity(),
-                            true /* rebind */);
-        }
-
-        Drawable wifiIconDark = wifiIcon.getConstantState().newDrawable().mutate();
-        wifiIconDark.setTintList(Utils.getColorAttr(mContext, android.R.attr.colorControlNormal));
-        mSignalStrengthPref.setIcon(wifiIconDark);
-
-        mSignalStrengthPref.setSummary(mSignalStr[mRssiSignalLevel]);
-        mSignalStrengthPref.setVisible(true);
-    }
-
-    private Drawable redrawIconForHeader(Drawable original) {
-        final int iconSize = mContext.getResources().getDimensionPixelSize(
-                R.dimen.wifi_detail_page_header_image_size);
-        final int actualWidth = original.getMinimumWidth();
-        final int actualHeight = original.getMinimumHeight();
-
-        if ((actualWidth == iconSize && actualHeight == iconSize)
-                || !VectorDrawable.class.isInstance(original)) {
-            return original;
-        }
-
-        // clear tint list to make sure can set 87% black after enlarge
-        original.setTintList(null);
-
-        // enlarge icon size
-        final Bitmap bitmap = Utils.createBitmap(original,
-                iconSize /*width*/,
-                iconSize /*height*/);
-        Drawable newIcon = new BitmapDrawable(null /*resource*/, bitmap);
-
-        // config color for 87% black after enlarge
-        newIcon.setTintList(Utils.getColorAttr(mContext, android.R.attr.textColorPrimary));
-
-        return newIcon;
-    }
-
-    private void refreshFrequency() {
-        if (mWifiInfo == null) {
-            mFrequencyPref.setVisible(false);
-            return;
-        }
-
-        final int frequency = mWifiInfo.getFrequency();
-        String band = null;
-        if (frequency >= AccessPoint.LOWER_FREQ_24GHZ
-                && frequency < AccessPoint.HIGHER_FREQ_24GHZ) {
-            band = mContext.getResources().getString(R.string.wifi_band_24ghz);
-        } else if (frequency >= AccessPoint.LOWER_FREQ_5GHZ
-                && frequency < AccessPoint.HIGHER_FREQ_5GHZ) {
-            band = mContext.getResources().getString(R.string.wifi_band_5ghz);
-        } else {
-            Log.e(TAG, "Unexpected frequency " + frequency);
-            // Connecting state is unstable, make it disappeared if unexpected
-            if (mConnectingState == STATE_CONNECTING) {
-                mFrequencyPref.setVisible(false);
-            }
-            return;
-        }
-        mFrequencyPref.setSummary(band);
-        mFrequencyPref.setVisible(true);
-    }
-
-    private void refreshTxSpeed() {
-        if (mWifiInfo == null) {
-            mTxLinkSpeedPref.setVisible(false);
-            return;
-        }
-
-        int txLinkSpeedMbps = mWifiInfo.getTxLinkSpeedMbps();
-        mTxLinkSpeedPref.setVisible(txLinkSpeedMbps >= 0);
-        mTxLinkSpeedPref.setSummary(mContext.getString(
-                R.string.tx_link_speed, mWifiInfo.getTxLinkSpeedMbps()));
-    }
-
-    private void refreshRxSpeed() {
-        if (mWifiInfo == null) {
-            mRxLinkSpeedPref.setVisible(false);
-            return;
-        }
-
-        int rxLinkSpeedMbps = mWifiInfo.getRxLinkSpeedMbps();
-        mRxLinkSpeedPref.setVisible(rxLinkSpeedMbps >= 0);
-        mRxLinkSpeedPref.setSummary(mContext.getString(
-                R.string.rx_link_speed, mWifiInfo.getRxLinkSpeedMbps()));
-    }
-
-    private void refreshSsid() {
-        if (mAccessPoint.isPasspoint() || mAccessPoint.isOsuProvider()) {
-            mSsidPref.setVisible(true);
-            mSsidPref.setSummary(mAccessPoint.getSsidStr());
-        } else {
-            mSsidPref.setVisible(false);
-        }
-    }
-
-    private void refreshMacAddress() {
-        String macAddress = getMacAddress();
-        if (macAddress == null) {
-            mMacAddressPref.setVisible(false);
-            return;
-        }
-
-        mMacAddressPref.setVisible(true);
-        if (macAddress.equals(WifiInfo.DEFAULT_MAC_ADDRESS)) {
-            mMacAddressPref.setSummary(R.string.device_info_not_available);
-        } else {
-            mMacAddressPref.setSummary(macAddress);
-        }
-
-        // MAC Address Pref Title
-        refreshMacTitle();
-    }
-
-    private String getMacAddress() {
-        if (mWifiInfo != null) {
-            // get MAC address from connected network information
-            return mWifiInfo.getMacAddress();
-        }
-
-        // return randomized MAC address
-        if (mWifiConfig != null &&
-                mWifiConfig.macRandomizationSetting == WifiConfiguration.RANDOMIZATION_PERSISTENT) {
-            return mWifiConfig.getRandomizedMacAddress().toString();
-        }
-
-        // return device MAC address
-        final String[] macAddresses = mWifiManager.getFactoryMacAddresses();
-        if (macAddresses != null && macAddresses.length > 0) {
-            return macAddresses[0];
-        }
-
-        Log.e(TAG, "Can't get device MAC address!");
-        return null;
-    }
-
-    private void updatePreference(Preference pref, String detailText) {
-        if (!TextUtils.isEmpty(detailText)) {
-            pref.setSummary(detailText);
-            pref.setVisible(true);
-        } else {
-            pref.setVisible(false);
-        }
-    }
-
-    private void refreshButtons() {
-        // Ephemeral network won't be removed permanently, but be putted in blacklist.
-        mButtonsPref.setButton1Text(
-                mIsEphemeral ? R.string.wifi_disconnect_button_text : R.string.forget);
-
-        boolean canForgetNetwork = canForgetNetwork();
-        boolean showCaptivePortalButton = updateCaptivePortalButton();
-        boolean canConnectNetwork = canConnectNetwork() && !isPasspointConfigurationR1Expired();
-        boolean canShareNetwork = canShareNetwork();
-
-        mButtonsPref.setButton1Visible(canForgetNetwork);
-        mButtonsPref.setButton2Visible(showCaptivePortalButton);
-        mButtonsPref.setButton3Visible(canConnectNetwork);
-        mButtonsPref.setButton4Visible(canShareNetwork);
-        mButtonsPref.setVisible(canForgetNetwork
-                || showCaptivePortalButton
-                || canConnectNetwork
-                || canShareNetwork);
-    }
-
-    private boolean canConnectNetwork() {
-        // Display connect button for disconnected AP even not in the range.
-        return !mAccessPoint.isActive();
-    }
-
-    private boolean isPasspointConfigurationR1Expired() {
-        return mIsPasspointConfigurationR1 && mIsExpired;
-    }
-
-    private void refreshIpLayerInfo() {
-        // Hide IP layer info if not a connected network.
-        if (!mAccessPoint.isActive() || mNetwork == null || mLinkProperties == null) {
-            mIpAddressPref.setVisible(false);
-            mSubnetPref.setVisible(false);
-            mGatewayPref.setVisible(false);
-            mDnsPref.setVisible(false);
-            mIpv6Category.setVisible(false);
-            return;
-        }
-
-        // Find IPv4 and IPv6 addresses.
-        String ipv4Address = null;
-        String subnet = null;
-        StringJoiner ipv6Addresses = new StringJoiner("\n");
-
-        for (LinkAddress addr : mLinkProperties.getLinkAddresses()) {
-            if (addr.getAddress() instanceof Inet4Address) {
-                ipv4Address = addr.getAddress().getHostAddress();
-                subnet = ipv4PrefixLengthToSubnetMask(addr.getPrefixLength());
-            } else if (addr.getAddress() instanceof Inet6Address) {
-                ipv6Addresses.add(addr.getAddress().getHostAddress());
-            }
-        }
-
-        // Find IPv4 default gateway.
-        String gateway = null;
-        for (RouteInfo routeInfo : mLinkProperties.getRoutes()) {
-            if (routeInfo.isIPv4Default() && routeInfo.hasGateway()) {
-                gateway = routeInfo.getGateway().getHostAddress();
-                break;
-            }
-        }
-
-        // Find all (IPv4 and IPv6) DNS addresses.
-        String dnsServers = mLinkProperties.getDnsServers().stream()
-                .map(InetAddress::getHostAddress)
-                .collect(Collectors.joining("\n"));
-
-        // Update UI.
-        updatePreference(mIpAddressPref, ipv4Address);
-        updatePreference(mSubnetPref, subnet);
-        updatePreference(mGatewayPref, gateway);
-        updatePreference(mDnsPref, dnsServers);
-
-        if (ipv6Addresses.length() > 0) {
-            mIpv6AddressPref.setSummary(
-                    BidiFormatter.getInstance().unicodeWrap(ipv6Addresses.toString()));
-            mIpv6Category.setVisible(true);
-        } else {
-            mIpv6Category.setVisible(false);
-        }
-    }
-
-    private static String ipv4PrefixLengthToSubnetMask(int prefixLength) {
-        try {
-            InetAddress all = InetAddress.getByAddress(
-                    new byte[]{(byte) 255, (byte) 255, (byte) 255, (byte) 255});
-            return NetworkUtils.getNetworkPart(all, prefixLength).getHostAddress();
-        } catch (UnknownHostException e) {
-            return null;
-        }
-    }
-
-    /**
-     * Returns whether the network represented by this preference can be forgotten.
-     */
-    private boolean canForgetNetwork() {
-        return (mWifiInfo != null && mWifiInfo.isEphemeral()) || canModifyNetwork()
-                || mAccessPoint.isPasspoint() || mAccessPoint.isPasspointConfig();
-    }
-
-    /**
-     * Returns whether the network represented by this preference can be modified.
-     */
-    public boolean canModifyNetwork() {
-        return mWifiConfig != null && !WifiUtils.isNetworkLockedDown(mContext, mWifiConfig);
-    }
-
-    /**
-     * Returns whether the user can sign into the network represented by this preference.
-     */
-    private boolean canSignIntoNetwork() {
-        return mAccessPoint.isActive() && WifiUtils.canSignIntoNetwork(mNetworkCapabilities);
-    }
-
-    /**
-     * Returns whether the user can share the network represented by this preference with QR code.
-     */
-    private boolean canShareNetwork() {
-        return mAccessPoint.getConfig() != null &&
-                WifiDppUtils.isSupportConfiguratorQrCodeGenerator(mContext, mAccessPoint);
-    }
-
-    /**
-     * Forgets the wifi network associated with this preference.
-     */
-    private void forgetNetwork() {
-        if (mWifiInfo != null && mWifiInfo.isEphemeral()) {
-            mWifiManager.disableEphemeralNetwork(mWifiInfo.getSSID());
-        } else if (mAccessPoint.isPasspoint() || mAccessPoint.isPasspointConfig()) {
-            // Post a dialog to confirm if user really want to forget the passpoint network.
-            showConfirmForgetDialog();
-            return;
-        } else if (mWifiConfig != null) {
-            mWifiManager.forget(mWifiConfig.networkId, null /* action listener */);
-        }
-
-        mMetricsFeatureProvider.action(
-                mFragment.getActivity(), SettingsEnums.ACTION_WIFI_FORGET);
-        mFragment.getActivity().finish();
-    }
-
-    @VisibleForTesting
-    protected void showConfirmForgetDialog() {
-        final AlertDialog dialog = new AlertDialog.Builder(mContext)
-                .setPositiveButton(R.string.forget, ((dialog1, which) -> {
-                    try {
-                        mWifiManager.removePasspointConfiguration(mAccessPoint.getPasspointFqdn());
-                    } catch (RuntimeException e) {
-                        Log.e(TAG, "Failed to remove Passpoint configuration for "
-                                + mAccessPoint.getPasspointFqdn());
-                    }
-                    mMetricsFeatureProvider.action(
-                            mFragment.getActivity(), SettingsEnums.ACTION_WIFI_FORGET);
-                    mFragment.getActivity().finish();
-                }))
-                .setNegativeButton(R.string.cancel, null /* listener */)
-                .setTitle(R.string.wifi_forget_dialog_title)
-                .setMessage(R.string.forget_passpoint_dialog_message)
-                .create();
-        dialog.show();
-    }
-
-    /**
-     * Show QR code to share the network represented by this preference.
-     */
-    private void launchWifiDppConfiguratorActivity() {
-        final Intent intent = WifiDppUtils.getConfiguratorQrCodeGeneratorIntentOrNull(mContext,
-                mWifiManager, mAccessPoint);
-
-        if (intent == null) {
-            Log.e(TAG, "Launch Wi-Fi DPP QR code generator with a wrong Wi-Fi network!");
-        } else {
-            mMetricsFeatureProvider.action(SettingsEnums.PAGE_UNKNOWN,
-                    SettingsEnums.ACTION_SETTINGS_SHARE_WIFI_QR_CODE,
-                    SettingsEnums.SETTINGS_WIFI_DPP_CONFIGURATOR,
-                    /* key */ null,
-                    /* value */ Integer.MIN_VALUE);
-
-            mContext.startActivity(intent);
-        }
-    }
-
-    /**
-     * Share the wifi network with QR code.
-     */
-    private void shareNetwork() {
-        WifiDppUtils.showLockScreen(mContext, () -> launchWifiDppConfiguratorActivity());
-    }
-
-    /**
-     * Sign in to the captive portal found on this wifi network associated with this preference.
-     */
-    private void signIntoNetwork() {
-        mMetricsFeatureProvider.action(
-                mFragment.getActivity(), SettingsEnums.ACTION_WIFI_SIGNIN);
-        mConnectivityManager.startCaptivePortalApp(mNetwork);
-    }
-
-    @Override
-    public void onSubmit(WifiDialog dialog) {
-        if (dialog.getController() != null) {
-            mWifiManager.save(dialog.getController().getConfig(), new WifiManager.ActionListener() {
-                @Override
-                public void onSuccess() {
-                }
-
-                @Override
-                public void onFailure(int reason) {
-                    Activity activity = mFragment.getActivity();
-                    if (activity != null) {
-                        Toast.makeText(mContext,
-                                R.string.wifi_failed_save_message,
-                                Toast.LENGTH_SHORT).show();
-                    }
-                }
-            });
-        }
-    }
-
-    /**
-     * Wrapper for testing compatibility.
-     */
-    @VisibleForTesting
-    static class IconInjector {
-        private final Context mContext;
-
-        public IconInjector(Context context) {
-            mContext = context;
-        }
-
-        public Drawable getIcon(int level) {
-            return mContext.getDrawable(Utils.getWifiIconResource(level)).mutate();
-        }
-    }
-
-    @VisibleForTesting
-    static class Clock {
-        public ZonedDateTime now() {
-            return ZonedDateTime.now();
-        }
-    }
-
-    private boolean usingDataUsageHeader(Context context) {
-        return FeatureFlagUtils.isEnabled(context, FeatureFlags.WIFI_DETAILS_DATAUSAGE_HEADER);
-    }
-
-    @VisibleForTesting
-    void connectNetwork() {
-        final Activity activity = mFragment.getActivity();
-        // error handling, connected/saved network should have mWifiConfig.
-        if (mWifiConfig == null) {
-            Toast.makeText(mContext,
-                    R.string.wifi_failed_connect_message,
-                    Toast.LENGTH_SHORT).show();
-            return;
-        }
-
-        // init state before connect
-        mConnectingState = STATE_NONE;
-
-        if (mWifiManager.isWifiEnabled()) {
-            updateConnectingState(STATE_CONNECTING);
-        } else {
-            // Enable Wi-Fi automatically to connect AP
-            updateConnectingState(STATE_ENABLE_WIFI);
-        }
-    }
-
-    private void updateConnectingState(int state) {
-        final Activity activity = mFragment.getActivity();
-        Log.d(TAG, "updateConnectingState from " + mConnectingState + " to " + state);
-        switch (mConnectingState) {
-            case STATE_NONE:
-            case STATE_ENABLE_WIFI:
-                if (state == STATE_ENABLE_WIFI) {
-                    Log.d(TAG, "Turn on Wi-Fi automatically!");
-                    updateConnectedButton(STATE_ENABLE_WIFI);
-                    Toast.makeText(mContext,
-                            R.string.wifi_turned_on_message,
-                            Toast.LENGTH_SHORT).show();
-                    mWifiManager.setWifiEnabled(true);
-                    // start timer for error handling
-                    startTimer();
-                } else if (state == STATE_CONNECTING) {
-                    Log.d(TAG, "connecting...");
-                    updateConnectedButton(STATE_CONNECTING);
-                    if (mAccessPoint.isPasspoint()) {
-                        mWifiManager.connect(mWifiConfig, mConnectListener);
-                    } else {
-                        mWifiManager.connect(mWifiConfig.networkId, mConnectListener);
-                    }
-                    // start timer for error handling since framework didn't call back if failed
-                    startTimer();
-                } else if (state == STATE_ENABLE_WIFI_FAILED) {
-                    Log.e(TAG, "Wi-Fi failed to enable network!");
-                    stopTimer();
-                    // reset state
-                    state = STATE_NONE;
-                    Toast.makeText(mContext,
-                            R.string.wifi_failed_connect_message,
-                            Toast.LENGTH_SHORT).show();
-                    updateConnectedButton(STATE_ENABLE_WIFI_FAILED);
-                }
-                // Do not break here for disconnected event.
-            case STATE_CONNECTED:
-                if (state == STATE_DISCONNECTED) {
-                    Log.d(TAG, "disconnected");
-                    // reset state
-                    state = STATE_NONE;
-                    updateConnectedButton(STATE_DISCONNECTED);
-                    refreshPage();
-                    // clear for getting MAC Address from saved configuration
-                    mWifiInfo = null;
-                }
-                break;
-            case STATE_CONNECTING:
-                if (state == STATE_CONNECTED) {
-                    Log.d(TAG, "connected");
-                    stopTimer();
-                    updateConnectedButton(STATE_CONNECTED);
-                    Toast.makeText(mContext,
-                            mContext.getString(R.string.wifi_connected_to_message,
-                                    mAccessPoint.getTitle()),
-                            Toast.LENGTH_SHORT).show();
-
-                    refreshPage();
-                } else if (state == STATE_NOT_IN_RANGE) {
-                    Log.d(TAG, "AP not in range");
-                    stopTimer();
-                    // reset state
-                    state = STATE_NONE;
-                    Toast.makeText(mContext,
-                            R.string.wifi_not_in_range_message,
-                            Toast.LENGTH_SHORT).show();
-                    updateConnectedButton(STATE_NOT_IN_RANGE);
-                } else if (state == STATE_FAILED) {
-                    Log.d(TAG, "failed");
-                    stopTimer();
-                    // reset state
-                    state = STATE_NONE;
-                    Toast.makeText(mContext,
-                            R.string.wifi_failed_connect_message,
-                            Toast.LENGTH_SHORT).show();
-                    updateConnectedButton(STATE_FAILED);
-                }
-                break;
-            default:
-                Log.e(TAG, "Invalid state : " + mConnectingState);
-                // don't update invalid state
-                return;
-        }
-
-        mConnectingState = state;
-    }
-
-    private void updateConnectedButton(int state) {
-        switch (state) {
-            case STATE_ENABLE_WIFI:
-            case STATE_CONNECTING:
-                mButtonsPref.setButton3Text(R.string.wifi_connecting)
-                        .setButton3Enabled(false);
-                break;
-            case STATE_CONNECTED:
-                // init button state and set as invisible
-                mButtonsPref.setButton3Text(R.string.wifi_connect)
-                        .setButton3Icon(R.drawable.ic_settings_wireless)
-                        .setButton3Enabled(true)
-                        .setButton3Visible(false);
-                break;
-            case STATE_DISCONNECTED:
-            case STATE_NOT_IN_RANGE:
-            case STATE_FAILED:
-            case STATE_ENABLE_WIFI_FAILED:
-                if (isPasspointConfigurationR1Expired()) {
-                    // Hide Connect button.
-                    mButtonsPref.setButton3Visible(false);
-                } else {
-                    mButtonsPref.setButton3Text(R.string.wifi_connect)
-                            .setButton3Icon(R.drawable.ic_settings_wireless)
-                            .setButton3Enabled(true)
-                            .setButton3Visible(true);
-                }
-                break;
-            default:
-                Log.e(TAG, "Invalid connect button state : " + state);
-                break;
-        }
-    }
-
-    private void startTimer() {
-        if (mTimer != null) {
-            stopTimer();
-        }
-
-        mTimer = new CountDownTimer(TIMEOUT, TIMEOUT + 1) {
-            @Override
-            public void onTick(long millisUntilFinished) {
-                // Do nothing
-            }
-            @Override
-            public void onFinish() {
-                if (mFragment == null || mFragment.getActivity() == null) {
-                    Log.d(TAG, "Ignore timeout since activity not exist!");
-                    return;
-                }
-                Log.e(TAG, "Timeout for state:" + mConnectingState);
-                if (mConnectingState == STATE_ENABLE_WIFI) {
-                    updateConnectingState(STATE_ENABLE_WIFI_FAILED);
-                } else if (mConnectingState == STATE_CONNECTING) {
-                    updateAccessPointFromScannedList();
-                    if (mIsOutOfRange) {
-                        updateConnectingState(STATE_NOT_IN_RANGE);
-                    } else {
-                        updateConnectingState(STATE_FAILED);
-                    }
-                }
-            }
-        };
-        mTimer.start();
-    }
-
-    private void stopTimer() {
-        if (mTimer == null) return;
-
-        mTimer.cancel();
-        mTimer = null;
-    }
-
-    private void refreshMacTitle() {
-        if (mWifiConfig == null) {
-            return;
-        }
-
-        // For saved Passpoint network, framework doesn't have the field to keep the MAC choice
-        // persistently, so Passpoint network will always use the default value so far, which is
-        // randomized MAC address, so don't need to modify title.
-        if (mAccessPoint.isPasspoint() || mAccessPoint.isPasspointConfig()) {
-            return;
-        }
-
-        mMacAddressPref.setTitle(
-                (mWifiConfig.macRandomizationSetting
-                        == WifiConfiguration.RANDOMIZATION_PERSISTENT)
-                        ? R.string.wifi_advanced_randomized_mac_address_title
-                        : R.string.wifi_advanced_device_mac_address_title);
-
-    }
-}
diff --git a/src/com/android/settings/wifi/details/WifiMeteredPreferenceController.java b/src/com/android/settings/wifi/details/WifiMeteredPreferenceController.java
deleted file mode 100644
index 0b2b47e..0000000
--- a/src/com/android/settings/wifi/details/WifiMeteredPreferenceController.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi.details;
-
-import android.app.backup.BackupManager;
-import android.content.Context;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiManager;
-
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.DropDownPreference;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
-import com.android.settings.core.BasePreferenceController;
-import com.android.settings.wifi.WifiDialog;
-import com.android.settingslib.core.AbstractPreferenceController;
-
-/**
- * {@link AbstractPreferenceController} that controls whether the wifi network is metered or not.
- *
- * Migrating from Wi-Fi SettingsLib to to WifiTrackerLib, this object will be removed in the near
- * future, please develop in
- * {@link com.android.settings.wifi.details2.WifiMeteredPreferenceControlle2}.
- */
-public class WifiMeteredPreferenceController extends BasePreferenceController implements
-        Preference.OnPreferenceChangeListener, WifiDialog.WifiDialogListener {
-
-    private static final String KEY_WIFI_METERED = "metered";
-    private WifiConfiguration mWifiConfiguration;
-    private WifiManager mWifiManager;
-    private Preference mPreference;
-
-    public WifiMeteredPreferenceController(Context context, WifiConfiguration wifiConfiguration) {
-        super(context, KEY_WIFI_METERED);
-        mWifiConfiguration = wifiConfiguration;
-        mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
-    }
-
-    @Override
-    public void updateState(Preference preference) {
-        final DropDownPreference dropDownPreference = (DropDownPreference) preference;
-        final int meteredOverride = getMeteredOverride();
-        dropDownPreference.setValue(Integer.toString(meteredOverride));
-        updateSummary(dropDownPreference, meteredOverride);
-    }
-
-    @Override
-    public int getAvailabilityStatus() {
-        return AVAILABLE;
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        if (mWifiConfiguration != null) {
-            mWifiConfiguration.meteredOverride = Integer.parseInt((String) newValue);
-        }
-        mWifiManager.updateNetwork(mWifiConfiguration);
-        // Stage the backup of the SettingsProvider package which backs this up
-        BackupManager.dataChanged("com.android.providers.settings");
-        updateSummary((DropDownPreference) preference, getMeteredOverride());
-        return true;
-    }
-
-    @VisibleForTesting
-    int getMeteredOverride() {
-        if (mWifiConfiguration != null) {
-            // Wrap the meteredOverride since robolectric cannot recognize it
-            return mWifiConfiguration.meteredOverride;
-        }
-        return WifiConfiguration.METERED_OVERRIDE_NONE;
-    }
-
-    private void updateSummary(DropDownPreference preference, int meteredOverride) {
-        preference.setSummary(preference.getEntries()[meteredOverride]);
-    }
-
-    @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-        mPreference = screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
-    public void onSubmit(WifiDialog dialog) {
-        if (dialog.getController() != null) {
-            final WifiConfiguration newConfig = dialog.getController().getConfig();
-            if (newConfig == null || mWifiConfiguration == null) {
-                return;
-            }
-
-            if (newConfig.meteredOverride != mWifiConfiguration.meteredOverride) {
-                mWifiConfiguration = newConfig;
-                onPreferenceChange(mPreference, String.valueOf(newConfig.meteredOverride));
-            }
-        }
-    }
-}
diff --git a/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java b/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java
deleted file mode 100644
index 8af9a7f..0000000
--- a/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.wifi.details;
-
-import static com.android.settings.wifi.WifiSettings.WIFI_DIALOG_ID;
-
-import android.app.Dialog;
-import android.app.settings.SettingsEnums;
-import android.content.Context;
-import android.net.ConnectivityManager;
-import android.net.wifi.WifiManager;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-
-import com.android.settings.R;
-import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.wifi.WifiConfigUiBase;
-import com.android.settings.wifi.WifiDialog;
-import com.android.settingslib.RestrictedLockUtils;
-import com.android.settingslib.RestrictedLockUtilsInternal;
-import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.wifi.AccessPoint;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Detail page for the currently connected wifi network.
- *
- * <p>The AccessPoint should be saved to the intent Extras when launching this class via
- * {@link AccessPoint#saveWifiState(Bundle)} in order to properly render this page.
- *
- * Migrating from Wi-Fi SettingsLib to to WifiTrackerLib, this object will be removed in the near
- * future, please develop in
- * {@link com.android.settings.wifi.details2.WifiNetworkDetailsFragment2}.
- */
-public class WifiNetworkDetailsFragment extends DashboardFragment implements
-        WifiDialog.WifiDialogListener {
-
-    private static final String TAG = "WifiNetworkDetailsFrg";
-
-    private AccessPoint mAccessPoint;
-    private WifiDetailPreferenceController mWifiDetailPreferenceController;
-    private List<WifiDialog.WifiDialogListener> mWifiDialogListeners = new ArrayList<>();
-
-    @Override
-    public void onAttach(Context context) {
-        mAccessPoint = new AccessPoint(context, getArguments());
-        super.onAttach(context);
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return SettingsEnums.WIFI_NETWORK_DETAILS;
-    }
-
-    @Override
-    protected String getLogTag() {
-        return TAG;
-    }
-
-    @Override
-    protected int getPreferenceScreenResId() {
-        return R.xml.wifi_network_details_fragment;
-    }
-
-    @Override
-    public int getDialogMetricsCategory(int dialogId) {
-        if (dialogId == WIFI_DIALOG_ID) {
-            return SettingsEnums.DIALOG_WIFI_AP_EDIT;
-        }
-        return 0;
-    }
-
-    @Override
-    public Dialog onCreateDialog(int dialogId) {
-        if (getActivity() == null || mWifiDetailPreferenceController == null
-                || mAccessPoint == null) {
-            return null;
-        }
-        return WifiDialog.createModal(getActivity(), this, mAccessPoint,
-                WifiConfigUiBase.MODE_MODIFY);
-    }
-
-
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        MenuItem item = menu.add(0, Menu.FIRST, 0, R.string.wifi_modify);
-        item.setIcon(com.android.internal.R.drawable.ic_mode_edit);
-        item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
-        super.onCreateOptionsMenu(menu, inflater);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem menuItem) {
-        switch (menuItem.getItemId()) {
-            case Menu.FIRST:
-                if (!mWifiDetailPreferenceController.canModifyNetwork()) {
-                    RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getContext(),
-                            RestrictedLockUtilsInternal.getDeviceOwner(getContext()));
-                } else {
-                    showDialog(WIFI_DIALOG_ID);
-                }
-                return true;
-            default:
-                return super.onOptionsItemSelected(menuItem);
-        }
-    }
-
-    @Override
-    protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
-        final List<AbstractPreferenceController> controllers = new ArrayList<>();
-        final ConnectivityManager cm = context.getSystemService(ConnectivityManager.class);
-
-        mWifiDetailPreferenceController = WifiDetailPreferenceController.newInstance(
-                mAccessPoint,
-                cm,
-                context,
-                this,
-                new Handler(Looper.getMainLooper()),  // UI thread.
-                getSettingsLifecycle(),
-                context.getSystemService(WifiManager.class),
-                mMetricsFeatureProvider);
-
-        controllers.add(mWifiDetailPreferenceController);
-        controllers.add(new AddDevicePreferenceController(context).init(mAccessPoint));
-
-        final WifiMeteredPreferenceController meteredPreferenceController =
-                new WifiMeteredPreferenceController(context, mAccessPoint.getConfig());
-        controllers.add(meteredPreferenceController);
-
-        final WifiPrivacyPreferenceController privacyController =
-                new WifiPrivacyPreferenceController(context);
-        privacyController.setWifiConfiguration(mAccessPoint.getConfig());
-        privacyController.setIsEphemeral(mAccessPoint.isEphemeral());
-        privacyController.setIsPasspoint(
-                mAccessPoint.isPasspoint() || mAccessPoint.isPasspointConfig());
-        controllers.add(privacyController);
-
-        // Sets callback listener for wifi dialog.
-        mWifiDialogListeners.add(mWifiDetailPreferenceController);
-        mWifiDialogListeners.add(privacyController);
-        mWifiDialogListeners.add(meteredPreferenceController);
-
-        return controllers;
-    }
-
-    @Override
-    public void onSubmit(WifiDialog dialog) {
-        for (WifiDialog.WifiDialogListener listener : mWifiDialogListeners) {
-            listener.onSubmit(dialog);
-        }
-    }
-}
diff --git a/src/com/android/settings/wifi/details/WifiPrivacyPreferenceController.java b/src/com/android/settings/wifi/details/WifiPrivacyPreferenceController.java
deleted file mode 100644
index 6658411..0000000
--- a/src/com/android/settings/wifi/details/WifiPrivacyPreferenceController.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi.details;
-
-import android.content.Context;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
-
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.DropDownPreference;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
-import com.android.settings.R;
-import com.android.settings.core.BasePreferenceController;
-import com.android.settings.wifi.WifiDialog;
-import com.android.settingslib.core.AbstractPreferenceController;
-
-/**
- * {@link AbstractPreferenceController} that controls whether the wifi network is mac randomized
- * or not.
- *
- * Migrating from Wi-Fi SettingsLib to to WifiTrackerLib, this object will be removed in the near
- * future, please develop in
- * {@link com.android.settings.wifi.details2.WifiPrivacyPreferenceController2}.
- */
-public class WifiPrivacyPreferenceController extends BasePreferenceController implements
-        Preference.OnPreferenceChangeListener, WifiDialog.WifiDialogListener {
-
-    private static final String KEY_WIFI_PRIVACY = "privacy";
-    private WifiConfiguration mWifiConfiguration;
-    private WifiManager mWifiManager;
-    private boolean mIsEphemeral = false;
-    private boolean mIsPasspoint = false;
-    private Preference mPreference;
-
-    public WifiPrivacyPreferenceController(Context context) {
-        super(context, KEY_WIFI_PRIVACY);
-        mWifiConfiguration = null;
-        mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
-    }
-
-    public void setWifiConfiguration(WifiConfiguration wifiConfiguration) {
-        mWifiConfiguration = wifiConfiguration;
-    }
-
-    public void setIsEphemeral(boolean isEphemeral) {
-        mIsEphemeral = isEphemeral;
-    }
-
-    public void setIsPasspoint(boolean isPasspoint) {
-        mIsPasspoint = isPasspoint;
-    }
-
-    @Override
-    public int getAvailabilityStatus() {
-        return mWifiManager.isConnectedMacRandomizationSupported()
-                ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
-    }
-
-    @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-        mPreference = screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
-    public void updateState(Preference preference) {
-        final DropDownPreference dropDownPreference = (DropDownPreference) preference;
-        final int randomizationLevel = getRandomizationValue();
-        dropDownPreference.setValue(Integer.toString(randomizationLevel));
-        updateSummary(dropDownPreference, randomizationLevel);
-
-        // Makes preference not selectable, when this is a ephemeral network.
-        if (mIsEphemeral || mIsPasspoint) {
-            preference.setSelectable(false);
-            dropDownPreference.setSummary(R.string.wifi_privacy_settings_ephemeral_summary);
-        }
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        if (mWifiConfiguration != null) {
-            mWifiConfiguration.macRandomizationSetting = Integer.parseInt((String) newValue);
-            mWifiManager.updateNetwork(mWifiConfiguration);
-
-            // To activate changing, we need to reconnect network. WiFi will auto connect to
-            // current network after disconnect(). Only needed when this is connected network.
-            final WifiInfo wifiInfo = mWifiManager.getConnectionInfo();
-            if (wifiInfo != null && wifiInfo.getNetworkId() == mWifiConfiguration.networkId) {
-                mWifiManager.disconnect();
-            }
-        }
-        updateSummary((DropDownPreference) preference, Integer.parseInt((String) newValue));
-        return true;
-    }
-
-    @VisibleForTesting
-    int getRandomizationValue() {
-        if (mWifiConfiguration != null) {
-            return mWifiConfiguration.macRandomizationSetting;
-        }
-        return WifiConfiguration.RANDOMIZATION_PERSISTENT;
-    }
-
-    private static final int PREF_RANDOMIZATION_PERSISTENT = 0;
-    private static final int PREF_RANDOMIZATION_NONE = 1;
-
-    /**
-     * Returns preference index value.
-     *
-     * @param macRandomized is mac randomized value
-     * @return index value of preference
-     */
-    public static int translateMacRandomizedValueToPrefValue(int macRandomized) {
-        return (macRandomized == WifiConfiguration.RANDOMIZATION_PERSISTENT)
-            ? PREF_RANDOMIZATION_PERSISTENT : PREF_RANDOMIZATION_NONE;
-    }
-
-    /**
-     * Returns mac randomized value.
-     *
-     * @param prefMacRandomized is preference index value
-     * @return mac randomized value
-     */
-    public static int translatePrefValueToMacRandomizedValue(int prefMacRandomized) {
-        return (prefMacRandomized == PREF_RANDOMIZATION_PERSISTENT)
-            ? WifiConfiguration.RANDOMIZATION_PERSISTENT : WifiConfiguration.RANDOMIZATION_NONE;
-    }
-
-    private void updateSummary(DropDownPreference preference, int macRandomized) {
-        // Translates value here to set RANDOMIZATION_PERSISTENT as first item in UI for better UX.
-        final int prefMacRandomized = translateMacRandomizedValueToPrefValue(macRandomized);
-        preference.setSummary(preference.getEntries()[prefMacRandomized]);
-    }
-
-    @Override
-    public void onSubmit(WifiDialog dialog) {
-        if (dialog.getController() != null) {
-            final WifiConfiguration newConfig = dialog.getController().getConfig();
-            if (newConfig == null || mWifiConfiguration == null) {
-                return;
-            }
-
-            if (newConfig.macRandomizationSetting != mWifiConfiguration.macRandomizationSetting) {
-                mWifiConfiguration = newConfig;
-                onPreferenceChange(mPreference, String.valueOf(newConfig.macRandomizationSetting));
-            }
-        }
-    }
-}
diff --git a/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java b/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
index 5c48dfd..b862540 100644
--- a/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
+++ b/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
@@ -23,8 +23,10 @@
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.settings.SettingsEnums;
+import android.content.AsyncQueryHandler;
 import android.content.Context;
 import android.content.Intent;
+import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
@@ -41,9 +43,14 @@
 import android.net.NetworkUtils;
 import android.net.RouteInfo;
 import android.net.Uri;
+import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.os.Handler;
+import android.provider.Telephony.CarrierId;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.util.FeatureFlagUtils;
 import android.util.Log;
@@ -65,7 +72,6 @@
 import com.android.settings.widget.EntityHeaderController;
 import com.android.settings.wifi.WifiDialog2;
 import com.android.settings.wifi.WifiDialog2.WifiDialog2Listener;
-import com.android.settings.wifi.WifiEntryShell;
 import com.android.settings.wifi.WifiUtils;
 import com.android.settings.wifi.dpp.WifiDppUtils;
 import com.android.settingslib.core.AbstractPreferenceController;
@@ -98,6 +104,7 @@
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.format.FormatStyle;
+import java.util.List;
 import java.util.StringJoiner;
 import java.util.stream.Collectors;
 
@@ -133,6 +140,8 @@
     @VisibleForTesting
     static final String KEY_SSID_PREF = "ssid";
     @VisibleForTesting
+    static final String KEY_EAP_SIM_SUBSCRIPTION_PREF = "eap_sim_subscription";
+    @VisibleForTesting
     static final String KEY_MAC_ADDRESS_PREF = "mac_address";
     @VisibleForTesting
     static final String KEY_IP_ADDRESS_PREF = "ip_address";
@@ -170,6 +179,7 @@
     private Preference mFrequencyPref;
     private Preference mSecurityPref;
     private Preference mSsidPref;
+    private Preference mEapSimSubscriptionPref;
     private Preference mMacAddressPref;
     private Preference mIpAddressPref;
     private Preference mGatewayPref;
@@ -187,6 +197,35 @@
     private final NetworkRequest mNetworkRequest = new NetworkRequest.Builder()
             .clearCapabilities().addTransportType(TRANSPORT_WIFI).build();
 
+    private CarrierIdAsyncQueryHandler mCarrierIdAsyncQueryHandler;
+    private static final int TOKEN_QUERY_CARRIER_ID_AND_UPDATE_SIM_SUMMARY = 1;
+    private static final int COLUMN_CARRIER_NAME = 0;
+
+    private class CarrierIdAsyncQueryHandler extends AsyncQueryHandler {
+
+        private CarrierIdAsyncQueryHandler(Context context) {
+            super(context.getContentResolver());
+        }
+
+        @Override
+        protected void onQueryComplete(int token, Object cookie, Cursor cursor) {
+            if (token == TOKEN_QUERY_CARRIER_ID_AND_UPDATE_SIM_SUMMARY) {
+                if (mContext == null || cursor == null || !cursor.moveToFirst()) {
+                    if (cursor != null) {
+                        cursor.close();
+                    }
+                    mEapSimSubscriptionPref.setSummary(R.string.wifi_require_sim_card_to_connect);
+                    return;
+                }
+                mEapSimSubscriptionPref.setSummary(mContext.getString(
+                        R.string.wifi_require_specific_sim_card_to_connect,
+                        cursor.getString(COLUMN_CARRIER_NAME)));
+                cursor.close();
+                return;
+            }
+        }
+    }
+
     // Must be run on the UI thread since it directly manipulates UI state.
     private final NetworkCallback mNetworkCallback = new NetworkCallback() {
         @Override
@@ -336,6 +375,7 @@
         mSecurityPref = screen.findPreference(KEY_SECURITY_PREF);
 
         mSsidPref = screen.findPreference(KEY_SSID_PREF);
+        mEapSimSubscriptionPref = screen.findPreference(KEY_EAP_SIM_SUBSCRIPTION_PREF);
         mMacAddressPref = screen.findPreference(KEY_MAC_ADDRESS_PREF);
         mIpAddressPref = screen.findPreference(KEY_IP_ADDRESS_PREF);
         mGatewayPref = screen.findPreference(KEY_GATEWAY_PREF);
@@ -507,6 +547,8 @@
         refreshIpLayerInfo();
         // SSID Pref
         refreshSsid();
+        // EAP SIM subscription
+        refreshEapSimSubscription();
         // MAC Address Pref
         refreshMacAddress();
     }
@@ -576,11 +618,9 @@
 
         final int frequency = connectedInfo.frequencyMhz;
         String band = null;
-        if (frequency >= WifiEntryShell.LOWER_FREQ_24GHZ
-                && frequency < WifiEntryShell.HIGHER_FREQ_24GHZ) {
+        if (frequency >= WifiEntry.MIN_FREQ_24GHZ && frequency < WifiEntry.MAX_FREQ_24GHZ) {
             band = mContext.getResources().getString(R.string.wifi_band_24ghz);
-        } else if (frequency >= WifiEntryShell.LOWER_FREQ_5GHZ
-                && frequency < WifiEntryShell.HIGHER_FREQ_5GHZ) {
+        } else if (frequency >= WifiEntry.MIN_FREQ_5GHZ && frequency < WifiEntry.MAX_FREQ_5GHZ) {
             band = mContext.getResources().getString(R.string.wifi_band_5ghz);
         } else {
             // Connecting state is unstable, make it disappeared if unexpected
@@ -630,6 +670,62 @@
         }
     }
 
+    private void refreshEapSimSubscription() {
+        mEapSimSubscriptionPref.setVisible(false);
+
+        if (mWifiEntry.getSecurity() != WifiEntry.SECURITY_EAP) {
+            return;
+        }
+        final WifiConfiguration config = mWifiEntry.getWifiConfiguration();
+        if (config == null || config.enterpriseConfig == null) {
+            return;
+        }
+        if (!config.enterpriseConfig.isAuthenticationSimBased()) {
+            return;
+        }
+
+        mEapSimSubscriptionPref.setVisible(true);
+
+        // Checks if the SIM subscription is active.
+        final List<SubscriptionInfo> activeSubscriptionInfos = mContext
+                .getSystemService(SubscriptionManager.class).getActiveSubscriptionInfoList();
+        final int defaultDataSubscriptionId = SubscriptionManager.getDefaultDataSubscriptionId();
+        if (activeSubscriptionInfos != null) {
+            for (SubscriptionInfo subscriptionInfo : activeSubscriptionInfos) {
+                if (config.carrierId == subscriptionInfo.getCarrierId()) {
+                    mEapSimSubscriptionPref.setSummary(subscriptionInfo.getDisplayName());
+                    return;
+                }
+
+                // When it's UNKNOWN_CARRIER_ID, devices connects it with the SIM subscription of
+                // defaultDataSubscriptionId.
+                if (config.carrierId == TelephonyManager.UNKNOWN_CARRIER_ID
+                        && defaultDataSubscriptionId == subscriptionInfo.getSubscriptionId()) {
+                    mEapSimSubscriptionPref.setSummary(subscriptionInfo.getDisplayName());
+                    return;
+                }
+            }
+        }
+
+        if (config.carrierId == TelephonyManager.UNKNOWN_CARRIER_ID) {
+            mEapSimSubscriptionPref.setSummary(R.string.wifi_no_related_sim_card);
+            return;
+        }
+
+        // The Wi-Fi network has specified carrier id, query carrier name from CarrierIdProvider.
+        if (mCarrierIdAsyncQueryHandler == null) {
+            mCarrierIdAsyncQueryHandler = new CarrierIdAsyncQueryHandler(mContext);
+        }
+        mCarrierIdAsyncQueryHandler.cancelOperation(TOKEN_QUERY_CARRIER_ID_AND_UPDATE_SIM_SUMMARY);
+        mCarrierIdAsyncQueryHandler.startQuery(TOKEN_QUERY_CARRIER_ID_AND_UPDATE_SIM_SUMMARY,
+                null /* cookie */,
+                CarrierId.All.CONTENT_URI,
+                new String[]{CarrierId.CARRIER_NAME},
+                CarrierId.CARRIER_ID + "=?",
+                new String[] {Integer.toString(config.carrierId)},
+                null /* orderBy */);
+    }
+
     private void refreshMacAddress() {
         final String macAddress = mWifiEntry.getMacAddress();
         if (TextUtils.isEmpty(macAddress)) {
diff --git a/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java b/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java
index b19e3b8..6659c7a 100644
--- a/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java
+++ b/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java
@@ -88,9 +88,6 @@
      */
     private int[] mWifiDppRemoteBandSupport;
 
-    /** Secret extra that allows fake networks to show in UI for testing purposes */
-    private boolean mIsTest;
-
     @Override
     public int getMetricsCategory() {
         return SettingsEnums.SETTINGS_WIFI_DPP_CONFIGURATOR;
@@ -149,7 +146,6 @@
             case Settings.ACTION_PROCESS_WIFI_EASY_CONNECT_URI:
                 final Uri uri = intent.getData();
                 final String uriString = (uri == null) ? null : uri.toString();
-                mIsTest = intent.getBooleanExtra(WifiDppUtils.EXTRA_TEST, false);
                 mWifiDppQrCode = WifiQrCode.getValidWifiDppQrCodeOrNull(uriString);
                 mWifiDppRemoteBandSupport = intent.getIntArrayExtra(
                         Settings.EXTRA_EASY_CONNECT_BAND_LIST); // returns null if none
@@ -239,11 +235,6 @@
 
         if (fragment == null) {
             fragment = new WifiDppChooseSavedWifiNetworkFragment();
-            if (mIsTest) {
-                Bundle bundle = new Bundle();
-                bundle.putBoolean(WifiDppUtils.EXTRA_TEST, true);
-                fragment.setArguments(bundle);
-            }
         } else {
             if (fragment.isVisible()) {
                 return;
diff --git a/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java b/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java
index b3bd9c6..cee3ccd 100644
--- a/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java
+++ b/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.wifi.dpp;
 
+import static android.net.wifi.WifiInfo.sanitizeSsid;
+
 import android.app.Activity;
 import android.app.settings.SettingsEnums;
 import android.content.Context;
@@ -23,12 +25,19 @@
 import android.graphics.Matrix;
 import android.graphics.Rect;
 import android.graphics.SurfaceTexture;
+import android.net.ConnectivityManager;
+import android.net.NetworkScoreManager;
 import android.net.wifi.EasyConnectStatusCallback;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.Looper;
 import android.os.Message;
+import android.os.Process;
+import android.os.SimpleClock;
+import android.os.SystemClock;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.Size;
@@ -48,21 +57,19 @@
 import androidx.lifecycle.ViewModelProviders;
 
 import com.android.settings.R;
-import com.android.settings.wifi.WifiDialogActivity;
 import com.android.settings.wifi.qrcode.QrCamera;
 import com.android.settings.wifi.qrcode.QrDecorateView;
+import com.android.wifitrackerlib.WifiEntry;
+import com.android.wifitrackerlib.WifiPickerTracker;
 
-import com.android.settingslib.wifi.AccessPoint;
-import com.android.settingslib.wifi.WifiTracker;
-import com.android.settingslib.wifi.WifiTrackerFactory;
-
+import java.time.Clock;
+import java.time.ZoneOffset;
 import java.util.List;
 
 public class WifiDppQrCodeScannerFragment extends WifiDppQrCodeBaseFragment implements
         SurfaceTextureListener,
         QrCamera.ScannerCallback,
-        WifiManager.ActionListener,
-        WifiTracker.WifiListener {
+        WifiManager.ActionListener {
     private static final String TAG = "WifiDppQrCodeScanner";
 
     /** Message sent to hide error message */
@@ -83,10 +90,15 @@
     // Key for Bundle usage
     private static final String KEY_IS_CONFIGURATOR_MODE = "key_is_configurator_mode";
     private static final String KEY_LATEST_ERROR_CODE = "key_latest_error_code";
-    private static final String KEY_WIFI_CONFIGURATION = "key_wifi_configuration";
+    public static final String KEY_WIFI_CONFIGURATION = "key_wifi_configuration";
 
     private static final int ARG_RESTART_CAMERA = 1;
 
+    // Max age of tracked WifiEntries.
+    private static final long MAX_SCAN_AGE_MILLIS = 15_000;
+    // Interval between initiating WifiPickerTracker scans.
+    private static final long SCAN_INTERVAL_MILLIS = 10_000;
+
     private QrCamera mCamera;
     private TextureView mTextureView;
     private QrDecorateView mDecorateView;
@@ -106,7 +118,8 @@
 
     private int mLatestStatusCode = WifiDppUtils.EASY_CONNECT_EVENT_FAILURE_NONE;
 
-    private WifiTracker mWifiTracker;
+    private WifiPickerTracker mWifiPickerTracker;
+    private HandlerThread mWorkerThread;
 
     private final Handler mHandler = new Handler() {
         @Override
@@ -219,11 +232,27 @@
     }
 
     private boolean isReachableWifiNetwork(WifiConfiguration wifiConfiguration) {
-        final List<AccessPoint> scannedAccessPoints = mWifiTracker.getAccessPoints();
+        final List<WifiEntry> wifiEntries = mWifiPickerTracker.getWifiEntries();
+        final WifiEntry connectedWifiEntry = mWifiPickerTracker.getConnectedWifiEntry();
+        if (connectedWifiEntry != null) {
+            // Add connected WifiEntry to prevent fail toast to users when it's connected.
+            wifiEntries.add(connectedWifiEntry);
+        }
 
-        for (AccessPoint scannedAccessPoint : scannedAccessPoints) {
-            if (scannedAccessPoint.matches(wifiConfiguration) &&
-                    scannedAccessPoint.isReachable()) {
+        for (WifiEntry wifiEntry : wifiEntries) {
+            if (!TextUtils.equals(wifiEntry.getSsid(), sanitizeSsid(wifiConfiguration.SSID))) {
+                continue;
+            }
+            final int security =
+                    WifiDppUtils.getSecurityTypeFromWifiConfiguration(wifiConfiguration);
+            if (security == wifiEntry.getSecurity()) {
+                return true;
+            }
+
+            // Default security type of PSK/SAE transition mode WifiEntry is SECURITY_PSK and
+            // there is no way to know if a WifiEntry is of transition mode. Give it a chance.
+            if (security == WifiEntry.SECURITY_SAE
+                    && wifiEntry.getSecurity() == WifiEntry.SECURITY_PSK) {
                 return true;
             }
         }
@@ -323,8 +352,27 @@
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
-        mWifiTracker = WifiTrackerFactory.create(getActivity(), /* wifiListener */ this,
-                getSettingsLifecycle(), /* includeSaved */ false, /* includeScans */ true);
+        mWorkerThread = new HandlerThread(
+                TAG + "{" + Integer.toHexString(System.identityHashCode(this)) + "}",
+                Process.THREAD_PRIORITY_BACKGROUND);
+        mWorkerThread.start();
+        final Clock elapsedRealtimeClock = new SimpleClock(ZoneOffset.UTC) {
+            @Override
+            public long millis() {
+                return SystemClock.elapsedRealtime();
+            }
+        };
+        final Context context = getContext();
+        mWifiPickerTracker = new WifiPickerTracker(getSettingsLifecycle(), context,
+                context.getSystemService(WifiManager.class),
+                context.getSystemService(ConnectivityManager.class),
+                context.getSystemService(NetworkScoreManager.class),
+                new Handler(Looper.getMainLooper()),
+                mWorkerThread.getThreadHandler(),
+                elapsedRealtimeClock,
+                MAX_SCAN_AGE_MILLIS,
+                SCAN_INTERVAL_MILLIS,
+                null /* listener */);
 
         // setTitle for TalkBack
         if (mIsConfiguratorMode) {
@@ -349,6 +397,13 @@
     }
 
     @Override
+    public void onDestroyView() {
+        mWorkerThread.quit();
+
+        super.onDestroyView();
+    }
+
+    @Override
     public final View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
         return inflater.inflate(R.layout.wifi_dpp_qrcode_scanner_fragment, container,
@@ -633,8 +688,7 @@
     @Override
     public void onSuccess() {
         final Intent resultIntent = new Intent();
-        resultIntent.putExtra(WifiDialogActivity.KEY_WIFI_CONFIGURATION,
-                mEnrolleeWifiConfiguration);
+        resultIntent.putExtra(KEY_WIFI_CONFIGURATION, mEnrolleeWifiConfiguration);
 
         final Activity hostActivity = getActivity();
         hostActivity.setResult(Activity.RESULT_OK, resultIntent);
@@ -690,27 +744,6 @@
         }
     }
 
-    /** Called when the state of Wifi has changed. */
-    @Override
-    public void onWifiStateChanged(int state) {
-        // Do nothing.
-    }
-
-    /** Called when the connection state of wifi has changed. */
-    @Override
-    public void onConnectedChanged() {
-        // Do nothing.
-    }
-
-    /**
-     * Called to indicate the list of AccessPoints has been updated and
-     * getAccessPoints should be called to get the latest information.
-     */
-    @Override
-    public void onAccessPointsChanged() {
-        // Do nothing.
-    }
-
     @VisibleForTesting
     protected boolean isDecodeTaskAlive() {
         return mCamera != null && mCamera.isDecodeTaskAlive();
diff --git a/src/com/android/settings/wifi/dpp/WifiDppUtils.java b/src/com/android/settings/wifi/dpp/WifiDppUtils.java
index 7a502c9..bd3eaa6 100644
--- a/src/com/android/settings/wifi/dpp/WifiDppUtils.java
+++ b/src/com/android/settings/wifi/dpp/WifiDppUtils.java
@@ -65,7 +65,7 @@
      */
     static final String TAG_FRAGMENT_ADD_DEVICE = "add_device_fragment";
 
-    /** The data is from {@code com.android.settingslib.wifi.AccessPoint.securityToString} */
+    /** The data is one of the static String SECURITY_* in {@link WifiQrCode} */
     static final String EXTRA_WIFI_SECURITY = "security";
 
     /** The data corresponding to {@code WifiConfiguration} SSID */
@@ -83,10 +83,6 @@
     /** The data to recognize if it's a Wi-Fi hotspot for configuration */
     static final String EXTRA_IS_HOTSPOT = "isHotspot";
 
-    /** Used by {@link android.provider.Settings#ACTION_PROCESS_WIFI_EASY_CONNECT_URI} to
-     * indicate test mode UI should be shown. Test UI does not make API calls. Value is a boolean.*/
-    static final String EXTRA_TEST = "test";
-
     /**
      * Default status code for Easy Connect
      */
@@ -261,36 +257,6 @@
      *
      * @param context     The context to use for the content resolver
      * @param wifiManager An instance of {@link WifiManager}
-     * @param accessPoint An instance of {@link AccessPoint}
-     * @return Intent for launching QR code scanner
-     */
-    public static Intent getConfiguratorQrCodeScannerIntentOrNull(Context context,
-            WifiManager wifiManager, AccessPoint accessPoint) {
-        final Intent intent = new Intent(context, WifiDppConfiguratorActivity.class);
-        if (isSupportConfiguratorQrCodeScanner(context, accessPoint)) {
-            intent.setAction(WifiDppConfiguratorActivity.ACTION_CONFIGURATOR_QR_CODE_SCANNER);
-        } else {
-            return null;
-        }
-
-        final WifiConfiguration wifiConfiguration = accessPoint.getConfig();
-        setConfiguratorIntentExtra(intent, wifiManager, wifiConfiguration);
-
-        if (wifiConfiguration.networkId == WifiConfiguration.INVALID_NETWORK_ID) {
-            throw new IllegalArgumentException("Invalid network ID");
-        } else {
-            intent.putExtra(EXTRA_WIFI_NETWORK_ID, wifiConfiguration.networkId);
-        }
-
-        return intent;
-    }
-
-    /**
-     * Returns an intent to launch QR code scanner. It may return null if the security is not
-     * supported by QR code scanner.
-     *
-     * @param context     The context to use for the content resolver
-     * @param wifiManager An instance of {@link WifiManager}
      * @param wifiEntry An instance of {@link WifiEntry}
      * @return Intent for launching QR code scanner
      */
@@ -439,20 +405,6 @@
     }
 
     /**
-     * Checks if QR code scanner supports to config other devices with the Wi-Fi network
-     *
-     * @param context The context to use for {@link WifiManager#isEasyConnectSupported()}
-     * @param accessPoint The {@link AccessPoint} of the Wi-Fi network
-     */
-    public static boolean isSupportConfiguratorQrCodeScanner(Context context,
-            AccessPoint accessPoint) {
-        if (accessPoint.isPasspoint()) {
-            return false;
-        }
-        return isSupportWifiDpp(context, accessPoint.getSecurity());
-    }
-
-    /**
      * Checks if QR code generator supports to config other devices with the Wi-Fi network
      *
      * @param context The context to use for {@code WifiManager}
@@ -470,12 +422,11 @@
      * Checks if this device supports to be configured by the Wi-Fi network of the security
      *
      * @param context The context to use for {@code WifiManager}
-     * @param accesspointSecurity The security constants defined in {@link AccessPoint}
+     * @param wifiEntrySecurity The security constants defined in {@link WifiEntry}
      */
-    public static boolean isSupportEnrolleeQrCodeScanner(Context context,
-            int accesspointSecurity) {
-        return isSupportWifiDpp(context, accesspointSecurity) ||
-                isSupportZxing(context, accesspointSecurity);
+    public static boolean isSupportEnrolleeQrCodeScanner(Context context, int wifiEntrySecurity) {
+        return isSupportWifiDpp(context, wifiEntrySecurity)
+                || isSupportZxing(context, wifiEntrySecurity);
     }
 
     private static boolean isSupportHotspotConfiguratorQrCodeGenerator(
@@ -487,39 +438,39 @@
                 || softApConfiguration.getSecurityType() == SoftApConfiguration.SECURITY_TYPE_OPEN;
     }
 
-    private static boolean isSupportWifiDpp(Context context, int accesspointSecurity) {
+    private static boolean isSupportWifiDpp(Context context, int wifiEntrySecurity) {
         if (!isWifiDppEnabled(context)) {
             return false;
         }
 
         // DPP 1.0 only supports SAE and PSK.
         final WifiManager wifiManager = context.getSystemService(WifiManager.class);
-        switch (accesspointSecurity) {
-            case AccessPoint.SECURITY_SAE:
+        switch (wifiEntrySecurity) {
+            case WifiEntry.SECURITY_SAE:
                 if (wifiManager.isWpa3SaeSupported()) {
                     return true;
                 }
                 break;
-            case AccessPoint.SECURITY_PSK:
+            case WifiEntry.SECURITY_PSK:
                 return true;
             default:
         }
         return false;
     }
 
-    private static boolean isSupportZxing(Context context, int accesspointSecurity) {
+    private static boolean isSupportZxing(Context context, int wifiEntrySecurity) {
         final WifiManager wifiManager = context.getSystemService(WifiManager.class);
-        switch (accesspointSecurity) {
-            case AccessPoint.SECURITY_PSK:
-            case AccessPoint.SECURITY_WEP:
-            case AccessPoint.SECURITY_NONE:
+        switch (wifiEntrySecurity) {
+            case WifiEntry.SECURITY_PSK:
+            case WifiEntry.SECURITY_WEP:
+            case WifiEntry.SECURITY_NONE:
                 return true;
-            case AccessPoint.SECURITY_SAE:
+            case WifiEntry.SECURITY_SAE:
                 if (wifiManager.isWpa3SaeSupported()) {
                     return true;
                 }
                 break;
-            case AccessPoint.SECURITY_OWE:
+            case WifiEntry.SECURITY_OWE:
                 if (wifiManager.isEnhancedOpenSupported()) {
                     return true;
                 }
@@ -538,4 +489,25 @@
                 VIBRATE_DURATION_QR_CODE_RECOGNITION.toMillis(),
                 VibrationEffect.DEFAULT_AMPLITUDE));
     }
+
+    @WifiEntry.Security
+    static int getSecurityTypeFromWifiConfiguration(WifiConfiguration config) {
+        if (config.allowedKeyManagement.get(WifiConfiguration.KeyMgmt.SAE)) {
+            return WifiEntry.SECURITY_SAE;
+        }
+        if (config.allowedKeyManagement.get(WifiConfiguration.KeyMgmt.WPA_PSK)) {
+            return WifiEntry.SECURITY_PSK;
+        }
+        if (config.allowedKeyManagement.get(WifiConfiguration.KeyMgmt.SUITE_B_192)) {
+            return WifiEntry.SECURITY_EAP_SUITE_B;
+        }
+        if (config.allowedKeyManagement.get(WifiConfiguration.KeyMgmt.WPA_EAP)
+                || config.allowedKeyManagement.get(WifiConfiguration.KeyMgmt.IEEE8021X)) {
+            return WifiEntry.SECURITY_EAP;
+        }
+        if (config.allowedKeyManagement.get(WifiConfiguration.KeyMgmt.OWE)) {
+            return WifiEntry.SECURITY_OWE;
+        }
+        return (config.wepKeys[0] != null) ? WifiEntry.SECURITY_WEP : WifiEntry.SECURITY_NONE;
+    }
 }
diff --git a/src/com/android/settings/wifi/dpp/WifiNetworkListFragment.java b/src/com/android/settings/wifi/dpp/WifiNetworkListFragment.java
index c854828..a017fac 100644
--- a/src/com/android/settings/wifi/dpp/WifiNetworkListFragment.java
+++ b/src/com/android/settings/wifi/dpp/WifiNetworkListFragment.java
@@ -20,13 +20,20 @@
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.content.Intent;
+import android.net.ConnectivityManager;
+import android.net.NetworkScoreManager;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
-import android.util.Log;
-import android.view.View;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.Looper;
+import android.os.Process;
+import android.os.SimpleClock;
+import android.os.SystemClock;
 import android.widget.Toast;
 
+import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
 
@@ -34,47 +41,63 @@
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.wifi.AddNetworkFragment;
-import com.android.settingslib.wifi.AccessPoint;
-import com.android.settingslib.wifi.AccessPointPreference;
-import com.android.settingslib.wifi.WifiSavedConfigUtils;
-import com.android.settingslib.wifi.WifiTracker;
-import com.android.settingslib.wifi.WifiTrackerFactory;
+import com.android.settingslib.wifi.WifiEntryPreference;
+import com.android.wifitrackerlib.SavedNetworkTracker;
+import com.android.wifitrackerlib.WifiEntry;
 
+import java.time.Clock;
+import java.time.ZoneOffset;
 import java.util.List;
 import java.util.stream.Collectors;
 
 public class WifiNetworkListFragment extends SettingsPreferenceFragment implements
-        WifiTracker.WifiListener, AccessPoint.AccessPointListener {
+        SavedNetworkTracker.SavedNetworkTrackerCallback, Preference.OnPreferenceClickListener {
     private static final String TAG = "WifiNetworkListFragment";
 
-    private static final String WIFI_CONFIG_KEY = "wifi_config_key";
+    @VisibleForTesting static final String WIFI_CONFIG_KEY = "wifi_config_key";
     private static final String PREF_KEY_ACCESS_POINTS = "access_points";
 
-    private static final int ADD_NETWORK_REQUEST = 1;
+    @VisibleForTesting
+    static final int ADD_NETWORK_REQUEST = 1;
 
-    private PreferenceCategory mAccessPointsPreferenceCategory;
-    private AccessPointPreference.UserBadgeCache mUserBadgeCache;
-    private Preference mAddPreference;
-    // Only shows up if mIsTest == true
-    private Preference mFakeNetworkPreference;
+    @VisibleForTesting PreferenceCategory mPreferenceGroup;
+    @VisibleForTesting Preference mAddPreference;
 
-    private WifiManager mWifiManager;
-    private WifiTracker mWifiTracker;
+    @VisibleForTesting WifiManager mWifiManager;
 
     private WifiManager.ActionListener mSaveListener;
-    private boolean mIsTest;
+
+    // Max age of tracked WifiEntries
+    private static final long MAX_SCAN_AGE_MILLIS = 15_000;
+    // Interval between initiating SavedNetworkTracker scans
+    private static final long SCAN_INTERVAL_MILLIS = 10_000;
+
+    @VisibleForTesting SavedNetworkTracker mSavedNetworkTracker;
+    @VisibleForTesting HandlerThread mWorkerThread;
 
     // Container Activity must implement this interface
     public interface OnChooseNetworkListener {
         void onChooseNetwork(WifiNetworkConfig wifiNetworkConfig);
     }
-    private OnChooseNetworkListener mOnChooseNetworkListener;
+    @VisibleForTesting OnChooseNetworkListener mOnChooseNetworkListener;
 
     @Override
     public int getMetricsCategory() {
         return SettingsEnums.SETTINGS_WIFI_DPP_CONFIGURATOR;
     }
 
+    private static class DisableUnreachableWifiEntryPreference extends WifiEntryPreference {
+        DisableUnreachableWifiEntryPreference(Context context, WifiEntry entry) {
+            super(context, entry);
+        }
+
+        @Override
+        public void onUpdated() {
+            super.onUpdated();
+            this.setEnabled(getWifiEntry().getLevel() != WifiEntry.WIFI_LEVEL_UNREACHABLE);
+        }
+    }
+
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
@@ -94,14 +117,8 @@
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
-        mWifiTracker = WifiTrackerFactory.create(getActivity(), this,
-                getSettingsLifecycle(), /* includeSaved */true, /* includeScans */ true);
-        mWifiManager = mWifiTracker.getManager();
-
-        final Bundle args = getArguments();
-        if (args != null) {
-            mIsTest = args.getBoolean(WifiDppUtils.EXTRA_TEST, false);
-        }
+        final Context context = getContext();
+        mWifiManager = context.getSystemService(WifiManager.class);
 
         mSaveListener = new WifiManager.ActionListener() {
             @Override
@@ -111,25 +128,52 @@
 
             @Override
             public void onFailure(int reason) {
-                Activity activity = getActivity();
-                if (activity != null) {
-                    Toast.makeText(activity,
-                            R.string.wifi_failed_save_message,
+                final Activity activity = getActivity();
+                if (activity != null && !activity.isFinishing()) {
+                    Toast.makeText(activity, R.string.wifi_failed_save_message,
                             Toast.LENGTH_SHORT).show();
                 }
             }
         };
+
+        mWorkerThread = new HandlerThread(TAG
+                + "{" + Integer.toHexString(System.identityHashCode(this)) + "}",
+                Process.THREAD_PRIORITY_BACKGROUND);
+        mWorkerThread.start();
+        final Clock elapsedRealtimeClock = new SimpleClock(ZoneOffset.UTC) {
+            @Override
+            public long millis() {
+                return SystemClock.elapsedRealtime();
+            }
+        };
+        mSavedNetworkTracker = new SavedNetworkTracker(getSettingsLifecycle(), context,
+                context.getSystemService(WifiManager.class),
+                context.getSystemService(ConnectivityManager.class),
+                context.getSystemService(NetworkScoreManager.class),
+                new Handler(Looper.getMainLooper()),
+                mWorkerThread.getThreadHandler(),
+                elapsedRealtimeClock,
+                MAX_SCAN_AGE_MILLIS,
+                SCAN_INTERVAL_MILLIS,
+                this);
+    }
+
+    @Override
+    public void onDestroyView() {
+        mWorkerThread.quit();
+
+        super.onDestroyView();
     }
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
 
-        if (requestCode == ADD_NETWORK_REQUEST) {
-            if (resultCode == Activity.RESULT_OK) {
-                handleAddNetworkSubmitEvent(data);
+        if (requestCode == ADD_NETWORK_REQUEST && resultCode == Activity.RESULT_OK) {
+            final WifiConfiguration wifiConfiguration = data.getParcelableExtra(WIFI_CONFIG_KEY);
+            if (wifiConfiguration != null) {
+                mWifiManager.save(wifiConfiguration, mSaveListener);
             }
-            mWifiTracker.resumeScanning();
         }
     }
 
@@ -137,203 +181,81 @@
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         addPreferencesFromResource(R.xml.wifi_dpp_network_list);
 
-        mAccessPointsPreferenceCategory = findPreference(PREF_KEY_ACCESS_POINTS);
-
-        mFakeNetworkPreference = new Preference(getPrefContext());
-        mFakeNetworkPreference.setIcon(R.drawable.ic_wifi_signal_0);
-        mFakeNetworkPreference.setKey("fake_key");
-        mFakeNetworkPreference.setTitle("fake network");
+        mPreferenceGroup = findPreference(PREF_KEY_ACCESS_POINTS);
 
         mAddPreference = new Preference(getPrefContext());
         mAddPreference.setIcon(R.drawable.ic_add_24dp);
         mAddPreference.setTitle(R.string.wifi_add_network);
-
-        mUserBadgeCache = new AccessPointPreference.UserBadgeCache(getPackageManager());
+        mAddPreference.setOnPreferenceClickListener(this);
     }
 
     /** Called when the state of Wifi has changed. */
     @Override
-    public void onWifiStateChanged(int state) {
-        final int wifiState = mWifiManager.getWifiState();
-        switch (wifiState) {
-            case WifiManager.WIFI_STATE_ENABLED:
-                updateAccessPointPreferences();
-                break;
+    public void onSavedWifiEntriesChanged() {
+        final List<WifiEntry> savedWifiEntries = mSavedNetworkTracker.getSavedWifiEntries().stream()
+                .filter(entry -> isValidForDppConfiguration(entry))
+                .collect(Collectors.toList());
 
-            case WifiManager.WIFI_STATE_ENABLING:
-            case WifiManager.WIFI_STATE_DISABLING:
-                removeAccessPointPreferences();
-                break;
+        int index = 0;
+        mPreferenceGroup.removeAll();
+        for (WifiEntry savedEntry : savedWifiEntries) {
+            final DisableUnreachableWifiEntryPreference preference =
+                    new DisableUnreachableWifiEntryPreference(getContext(), savedEntry);
+            preference.setOnPreferenceClickListener(this);
+            preference.setEnabled(savedEntry.getLevel() != WifiEntry.WIFI_LEVEL_UNREACHABLE);
+            preference.setOrder(index++);
+
+            mPreferenceGroup.addPreference(preference);
         }
+
+        mAddPreference.setOrder(index);
+        mPreferenceGroup.addPreference(mAddPreference);
     }
 
-    /** Called when the connection state of wifi has changed. */
     @Override
-    public void onConnectedChanged() {
+    public void onSubscriptionWifiEntriesChanged() {
         // Do nothing.
     }
 
-    /**
-     * Called to indicate the list of AccessPoints has been updated and
-     * getAccessPoints should be called to get the latest information.
-     */
     @Override
-    public void onAccessPointsChanged() {
-        updateAccessPointPreferences();
+    public void onWifiStateChanged() {
+        // Do nothing.
     }
 
     @Override
-    public void onAccessPointChanged(final AccessPoint accessPoint) {
-        Log.d(TAG, "onAccessPointChanged (singular) callback initiated");
-        View view = getView();
-        if (view != null) {
-            view.post(() -> {
-                final Object tag = accessPoint.getTag();
-                if (tag != null) {
-                    ((AccessPointPreference) tag).refresh();
-                }
-            });
-        }
-    }
-
-    @Override
-    public void onLevelChanged(AccessPoint accessPoint) {
-        ((AccessPointPreference) accessPoint.getTag()).onLevelChanged();
-    }
-
-    @Override
-    public boolean onPreferenceTreeClick(Preference preference) {
-        if (preference instanceof AccessPointPreference) {
-            final AccessPoint selectedAccessPoint =
-                    ((AccessPointPreference) preference).getAccessPoint();
-            if (selectedAccessPoint == null) {
-                return false;
-            }
+    public boolean onPreferenceClick(Preference preference) {
+        if (preference instanceof WifiEntryPreference) {
+            final WifiEntry selectedWifiEntry = ((WifiEntryPreference) preference).getWifiEntry();
 
             // Launch WifiDppAddDeviceFragment to start DPP in Configurator-Initiator role.
-            final WifiConfiguration wifiConfig = selectedAccessPoint.getConfig();
+            final WifiConfiguration wifiConfig = selectedWifiEntry.getWifiConfiguration();
             if (wifiConfig == null) {
                 throw new IllegalArgumentException("Invalid access point");
             }
             final WifiNetworkConfig networkConfig = WifiNetworkConfig.getValidConfigOrNull(
-                    selectedAccessPoint.getSecurityString(/* concise */ true),
+                    WifiDppUtils.getSecurityString(selectedWifiEntry),
                     wifiConfig.getPrintableSsid(), wifiConfig.preSharedKey, wifiConfig.hiddenSSID,
                     wifiConfig.networkId, /* isHotspot */ false);
             if (mOnChooseNetworkListener != null) {
                 mOnChooseNetworkListener.onChooseNetwork(networkConfig);
             }
         } else if (preference == mAddPreference) {
-            launchAddNetworkFragment();
-        } else if (preference == mFakeNetworkPreference) {
-            if (mOnChooseNetworkListener != null) {
-                mOnChooseNetworkListener.onChooseNetwork(
-                        new WifiNetworkConfig(
-                                WifiQrCode.SECURITY_WPA_PSK,
-                                /* ssid */ WifiNetworkConfig.FAKE_SSID,
-                                /* preSharedKey */ WifiNetworkConfig.FAKE_PASSWORD,
-                                /* hiddenSsid */ true,
-                                /* networkId */ WifiConfiguration.INVALID_NETWORK_ID,
-                                /* isHotspot*/ false));
-            }
+            new SubSettingLauncher(getContext())
+                .setTitleRes(R.string.wifi_add_network)
+                .setDestination(AddNetworkFragment.class.getName())
+                .setSourceMetricsCategory(getMetricsCategory())
+                .setResultListener(this, ADD_NETWORK_REQUEST)
+                .launch();
         } else {
             return super.onPreferenceTreeClick(preference);
         }
         return true;
     }
 
-    private void handleAddNetworkSubmitEvent(Intent data) {
-        final WifiConfiguration wifiConfiguration = data.getParcelableExtra(WIFI_CONFIG_KEY);
-        if (wifiConfiguration != null) {
-            mWifiManager.save(wifiConfiguration, mSaveListener);
-        }
-    }
-
-    private boolean isValidForDppConfiguration(AccessPoint accessPoint) {
-        final int security = accessPoint.getSecurity();
+    private boolean isValidForDppConfiguration(WifiEntry wifiEntry) {
+        final int security = wifiEntry.getSecurity();
 
         // DPP 1.0 only support PSK and SAE.
-        return security == AccessPoint.SECURITY_PSK || security == AccessPoint.SECURITY_SAE;
-    }
-
-    private void launchAddNetworkFragment() {
-        new SubSettingLauncher(getContext())
-                .setTitleRes(R.string.wifi_add_network)
-                .setDestination(AddNetworkFragment.class.getName())
-                .setSourceMetricsCategory(getMetricsCategory())
-                .setResultListener(this, ADD_NETWORK_REQUEST)
-                .launch();
-    }
-
-    private void removeAccessPointPreferences() {
-        mAccessPointsPreferenceCategory.removeAll();
-        mAccessPointsPreferenceCategory.setVisible(false);
-    }
-
-    private void updateAccessPointPreferences() {
-        // in case state has changed
-        if (!mWifiManager.isWifiEnabled()) {
-            return;
-        }
-
-        List<AccessPoint> savedAccessPoints =
-                WifiSavedConfigUtils.getAllConfigs(getContext(), mWifiManager);
-
-        savedAccessPoints = savedAccessPoints.stream()
-                .filter(accessPoint -> isValidForDppConfiguration(accessPoint))
-                .map(accessPoint -> getScannedAccessPointIfAvailable(accessPoint))
-                .sorted((ap1, ap2) -> {
-                    // orders reachable Wi-Fi networks on top
-                    if (ap1.isReachable() && !ap2.isReachable()) {
-                        return -1;
-                    } else if (!ap1.isReachable() && ap2.isReachable()) {
-                        return 1;
-                    }
-
-                    String ap1Title = nullToEmpty(ap1.getTitle());
-                    String ap2Title = nullToEmpty(ap2.getTitle());
-
-                    return ap1Title.compareToIgnoreCase(ap2Title);
-                }).collect(Collectors.toList());
-
-        int index = 0;
-        mAccessPointsPreferenceCategory.removeAll();
-        for (AccessPoint savedAccessPoint : savedAccessPoints) {
-            final AccessPointPreference preference =
-                    createAccessPointPreference(savedAccessPoint);
-
-            preference.setOrder(index++);
-            preference.setEnabled(savedAccessPoint.isReachable());
-            savedAccessPoint.setListener(this);
-
-            preference.refresh();
-            mAccessPointsPreferenceCategory.addPreference(preference);
-        }
-        mAddPreference.setOrder(index);
-        mAccessPointsPreferenceCategory.addPreference(mAddPreference);
-
-        if (mIsTest) {
-            mAccessPointsPreferenceCategory.addPreference(mFakeNetworkPreference);
-        }
-    }
-
-    private String nullToEmpty(String string) {
-        return (string == null) ? "" : string;
-    }
-
-    // Replaces with an AccessPoint from scanned result for signal information
-    private AccessPoint getScannedAccessPointIfAvailable(AccessPoint savedAccessPoint) {
-        final List<AccessPoint> scannedAccessPoints = mWifiTracker.getAccessPoints();
-        final WifiConfiguration savedWifiConfiguration = savedAccessPoint.getConfig();
-        for (AccessPoint scannedAccessPoint : scannedAccessPoints) {
-            if (scannedAccessPoint.matches(savedWifiConfiguration)) {
-                return scannedAccessPoint;
-            }
-        }
-        return savedAccessPoint;
-    }
-
-    private AccessPointPreference createAccessPointPreference(AccessPoint accessPoint) {
-        return new AccessPointPreference(accessPoint, getPrefContext(), mUserBadgeCache,
-                R.drawable.ic_wifi_signal_0, /* forSavedNetworks */ false);
+        return security == WifiEntry.SECURITY_PSK || security == WifiEntry.SECURITY_SAE;
     }
 }
diff --git a/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsPreferenceController.java b/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsPreferenceController.java
deleted file mode 100644
index 397fb8b..0000000
--- a/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsPreferenceController.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi.savedaccesspoints;
-
-import android.content.Context;
-import android.net.wifi.WifiManager;
-
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceGroup;
-import androidx.preference.PreferenceScreen;
-
-import com.android.settings.core.BasePreferenceController;
-import com.android.settingslib.wifi.AccessPoint;
-import com.android.settingslib.wifi.AccessPointPreference;
-import com.android.settingslib.wifi.AccessPointPreference.UserBadgeCache;
-import com.android.settingslib.wifi.WifiSavedConfigUtils;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * Controller that manages a PreferenceGroup, which contains a list of saved access points.
- *
- * Migrating from Wi-Fi SettingsLib to to WifiTrackerLib, this object will be removed in the near
- * future, please develop in
- * {@link com.android.settings.wifi.savedaccesspoints2.SavedAccessPointsPreferenceController2}.
- */
-public class SavedAccessPointsPreferenceController extends BasePreferenceController implements
-        Preference.OnPreferenceClickListener {
-
-    protected final WifiManager mWifiManager;
-    private final UserBadgeCache mUserBadgeCache;
-    private PreferenceGroup mPreferenceGroup;
-    private SavedAccessPointsWifiSettings mHost;
-    @VisibleForTesting
-    List<AccessPoint> mAccessPoints;
-
-    public SavedAccessPointsPreferenceController(Context context, String preferenceKey) {
-        super(context, preferenceKey);
-        mUserBadgeCache = new AccessPointPreference.UserBadgeCache(context.getPackageManager());
-        mWifiManager = context.getSystemService(WifiManager.class);
-    }
-
-    public SavedAccessPointsPreferenceController setHost(SavedAccessPointsWifiSettings host) {
-        mHost = host;
-        return this;
-    }
-
-    @Override
-    public int getAvailabilityStatus() {
-        refreshSavedAccessPoints();
-        return mAccessPoints.size() > 0 ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
-    }
-
-    @Override
-    public void displayPreference(PreferenceScreen screen) {
-        mPreferenceGroup = screen.findPreference(getPreferenceKey());
-        refreshSavedAccessPoints();
-        updatePreference();
-        super.displayPreference(screen);
-    }
-
-    @Override
-    public boolean onPreferenceClick(Preference preference) {
-        if (mHost != null) {
-            final Preference preferenceInGroup =
-                    mPreferenceGroup.findPreference(preference.getKey());
-            mHost.showWifiPage((AccessPointPreference) preferenceInGroup);
-        }
-        return false;
-    }
-
-    protected void refreshSavedAccessPoints() {
-        mAccessPoints = WifiSavedConfigUtils.getAllConfigs(mContext, mWifiManager).stream()
-                .filter(accessPoint -> !accessPoint.isPasspointConfig())
-                .sorted(SavedNetworkComparator.INSTANCE)
-                .collect(Collectors.toList());
-    }
-
-    private void updatePreference() {
-        mPreferenceGroup.removeAll();
-        for (AccessPoint accessPoint : mAccessPoints) {
-            final String key = accessPoint.getKey();
-
-            final AccessPointPreference preference = new AccessPointPreference(accessPoint,
-                    mContext, mUserBadgeCache, true /* forSavedNetworks */);
-            preference.setKey(key);
-            preference.setIcon(null);
-            preference.setOnPreferenceClickListener(this);
-
-            mPreferenceGroup.addPreference(preference);
-        }
-    }
-}
diff --git a/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsWifiSettings.java b/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsWifiSettings.java
deleted file mode 100644
index 262dce6..0000000
--- a/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsWifiSettings.java
+++ /dev/null
@@ -1,137 +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.wifi.savedaccesspoints;
-
-import android.annotation.Nullable;
-import android.app.settings.SettingsEnums;
-import android.content.Context;
-import android.os.Bundle;
-
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.PreferenceScreen;
-
-import com.android.settings.R;
-import com.android.settings.core.SubSettingLauncher;
-import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.wifi.WifiSettings;
-import com.android.settings.wifi.details.WifiNetworkDetailsFragment;
-import com.android.settingslib.wifi.AccessPoint;
-import com.android.settingslib.wifi.AccessPointPreference;
-
-/**
- * UI to manage saved networks/access points.
- *
- * Migrating from Wi-Fi SettingsLib to to WifiTrackerLib, this object will be removed in the near
- * future, please develop in
- * {@link com.android.settings.wifi.savedaccesspoints2.SavedAccessPointsWifiSettings2}.
- */
-public class SavedAccessPointsWifiSettings extends DashboardFragment {
-
-    private static final String TAG = "SavedAccessPoints";
-
-    @VisibleForTesting
-    Bundle mAccessPointSavedState;
-    private AccessPoint mSelectedAccessPoint;
-
-    // Instance state key
-    private static final String SAVE_DIALOG_ACCESS_POINT_STATE = "wifi_ap_state";
-
-    @Override
-    public int getMetricsCategory() {
-        return SettingsEnums.WIFI_SAVED_ACCESS_POINTS;
-    }
-
-    @Override
-    protected int getPreferenceScreenResId() {
-        return R.xml.wifi_display_saved_access_points;
-    }
-
-    @Override
-    protected String getLogTag() {
-        return TAG;
-    }
-
-    @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-        use(SavedAccessPointsPreferenceController.class)
-                .setHost(this);
-        use(SubscribedAccessPointsPreferenceController.class)
-                .setHost(this);
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (savedInstanceState != null) {
-            if (savedInstanceState.containsKey(SAVE_DIALOG_ACCESS_POINT_STATE)) {
-                mAccessPointSavedState =
-                        savedInstanceState.getBundle(SAVE_DIALOG_ACCESS_POINT_STATE);
-            } else {
-                mAccessPointSavedState = null;
-            }
-        }
-    }
-
-    @Override
-    public void onStart() {
-        super.onStart();
-        if (mAccessPointSavedState != null) {
-            final PreferenceScreen screen = getPreferenceScreen();
-            use(SavedAccessPointsPreferenceController.class).displayPreference(screen);
-            use(SubscribedAccessPointsPreferenceController.class).displayPreference(screen);
-        }
-    }
-
-    public void showWifiPage(@Nullable AccessPointPreference accessPoint) {
-        removeDialog(WifiSettings.WIFI_DIALOG_ID);
-
-        if (accessPoint != null) {
-            // Save the access point and edit mode
-            mSelectedAccessPoint = accessPoint.getAccessPoint();
-        } else {
-            // No access point is selected. Clear saved state.
-            mSelectedAccessPoint = null;
-            mAccessPointSavedState = null;
-        }
-
-        if (mSelectedAccessPoint == null) {
-            mSelectedAccessPoint = new AccessPoint(getActivity(), mAccessPointSavedState);
-        }
-        final Bundle savedState = new Bundle();
-        mSelectedAccessPoint.saveWifiState(savedState);
-
-        new SubSettingLauncher(getContext())
-                .setTitleText(mSelectedAccessPoint.getTitle())
-                .setDestination(WifiNetworkDetailsFragment.class.getName())
-                .setArguments(savedState)
-                .setSourceMetricsCategory(getMetricsCategory())
-                .launch();
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        // If the dialog is showing (indicated by the existence of mSelectedAccessPoint), then we
-        // save its state.
-        if (mSelectedAccessPoint != null) {
-            mAccessPointSavedState = new Bundle();
-            mSelectedAccessPoint.saveWifiState(mAccessPointSavedState);
-            outState.putBundle(SAVE_DIALOG_ACCESS_POINT_STATE, mAccessPointSavedState);
-        }
-    }
-}
diff --git a/src/com/android/settings/wifi/savedaccesspoints/SavedNetworkComparator.java b/src/com/android/settings/wifi/savedaccesspoints/SavedNetworkComparator.java
deleted file mode 100644
index e66ef23..0000000
--- a/src/com/android/settings/wifi/savedaccesspoints/SavedNetworkComparator.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi.savedaccesspoints;
-
-import android.icu.text.Collator;
-
-import com.android.settingslib.wifi.AccessPoint;
-
-import java.util.Comparator;
-
-public final class SavedNetworkComparator {
-    public static final Comparator<AccessPoint> INSTANCE =
-            new Comparator<AccessPoint>() {
-                final Collator mCollator = Collator.getInstance();
-
-                @Override
-                public int compare(AccessPoint ap1, AccessPoint ap2) {
-                    return mCollator.compare(
-                            nullToEmpty(ap1.getTitle()), nullToEmpty(ap2.getTitle()));
-                }
-
-                private String nullToEmpty(String string) {
-                    return (string == null) ? "" : string;
-                }
-            };
-}
diff --git a/src/com/android/settings/wifi/savedaccesspoints/SubscribedAccessPointsPreferenceController.java b/src/com/android/settings/wifi/savedaccesspoints/SubscribedAccessPointsPreferenceController.java
deleted file mode 100644
index 23ba7c4..0000000
--- a/src/com/android/settings/wifi/savedaccesspoints/SubscribedAccessPointsPreferenceController.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi.savedaccesspoints;
-
-import android.content.Context;
-
-import com.android.settingslib.wifi.WifiSavedConfigUtils;
-
-import java.util.stream.Collectors;
-
-/**
- * Controller that manages a PreferenceGroup, which contains a list of subscribed access points.
- *
- * Migrating from Wi-Fi SettingsLib to to WifiTrackerLib, this object will be removed in the near
- * future, please develop in
- * {@link com.android.settings.wifi.savedaccesspoints2.SubscribedAccessPointsPreferenceController2}.
- */
-public class SubscribedAccessPointsPreferenceController extends
-        SavedAccessPointsPreferenceController {
-
-    public SubscribedAccessPointsPreferenceController(Context context, String preferenceKey) {
-        super(context, preferenceKey);
-    }
-
-    @Override
-    protected void refreshSavedAccessPoints() {
-        mAccessPoints = WifiSavedConfigUtils.getAllConfigs(mContext, mWifiManager).stream()
-                .filter(accessPoint -> accessPoint.isPasspointConfig())
-                .sorted(SavedNetworkComparator.INSTANCE)
-                .collect(Collectors.toList());
-    }
-}
diff --git a/src/com/android/settings/wifi/savedaccesspoints2/SavedAccessPointsWifiSettings2.java b/src/com/android/settings/wifi/savedaccesspoints2/SavedAccessPointsWifiSettings2.java
index c70f077..e579ad7 100644
--- a/src/com/android/settings/wifi/savedaccesspoints2/SavedAccessPointsWifiSettings2.java
+++ b/src/com/android/settings/wifi/savedaccesspoints2/SavedAccessPointsWifiSettings2.java
@@ -32,6 +32,7 @@
 import android.util.Log;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
@@ -50,15 +51,15 @@
 public class SavedAccessPointsWifiSettings2 extends DashboardFragment
         implements SavedNetworkTracker.SavedNetworkTrackerCallback {
 
-    private static final String TAG = "SavedAccessPoints2";
+    @VisibleForTesting static final String TAG = "SavedAccessPoints2";
 
     // Max age of tracked WifiEntries
     private static final long MAX_SCAN_AGE_MILLIS = 15_000;
     // Interval between initiating SavedNetworkTracker scans
     private static final long SCAN_INTERVAL_MILLIS = 10_000;
 
-    private SavedNetworkTracker mSavedNetworkTracker;
-    private HandlerThread mWorkerThread;
+    @VisibleForTesting SavedNetworkTracker mSavedNetworkTracker;
+    @VisibleForTesting HandlerThread mWorkerThread;
 
     @Override
     public int getMetricsCategory() {
diff --git a/src/com/android/settings/wifi/slice/ConnectToWifiHandler.java b/src/com/android/settings/wifi/slice/ConnectToWifiHandler.java
index 5c92d81..779a57e 100644
--- a/src/com/android/settings/wifi/slice/ConnectToWifiHandler.java
+++ b/src/com/android/settings/wifi/slice/ConnectToWifiHandler.java
@@ -19,61 +19,74 @@
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.net.ConnectivityManager;
-import android.net.Network;
-import android.net.wifi.WifiManager;
-import android.os.Bundle;
+import android.text.TextUtils;
+import android.widget.Toast;
 
 import androidx.annotation.VisibleForTesting;
 
-import com.android.settings.wifi.WifiConnectListener;
+import com.android.settings.R;
+import com.android.settings.slices.SliceBackgroundWorker;
 import com.android.settings.wifi.WifiDialogActivity;
-import com.android.settings.wifi.WifiUtils;
-import com.android.settingslib.wifi.AccessPoint;
+import com.android.wifitrackerlib.WifiEntry;
+import com.android.wifitrackerlib.WifiEntry.ConnectCallback;
 
 /**
  * This receiver helps connect to Wi-Fi network
  */
 public class ConnectToWifiHandler extends BroadcastReceiver {
 
+    static final String KEY_CHOSEN_WIFIENTRY_KEY = "key_chosen_wifientry_key";
+    static final String KEY_WIFI_SLICE_URI = "key_wifi_slice_uri";
+
     @Override
     public void onReceive(Context context, Intent intent) {
         if (context == null || intent == null) {
             return;
         }
-
-        final Network network = intent.getParcelableExtra(ConnectivityManager.EXTRA_NETWORK);
-        final Bundle accessPointState = intent.getBundleExtra(
-                WifiDialogActivity.KEY_ACCESS_POINT_STATE);
-
-        if (network != null) {
-            WifiScanWorker.clearClickedWifi();
-            final ConnectivityManager cm = context.getSystemService(ConnectivityManager.class);
-            // start captive portal app to sign in to network
-            cm.startCaptivePortalApp(network);
-        } else if (accessPointState != null) {
-            connect(context, new AccessPoint(context, accessPointState));
+        final String key = intent.getStringExtra(KEY_CHOSEN_WIFIENTRY_KEY);
+        if (TextUtils.isEmpty(key)) {
+            return;
         }
+        if (intent.getParcelableExtra(KEY_WIFI_SLICE_URI) == null) {
+            return;
+        }
+        final WifiScanWorker worker = getWifiScanWorker(intent);
+        if (worker == null) {
+            return;
+        }
+        final WifiEntry wifiEntry = worker.getWifiEntry(key);
+        if (wifiEntry == null) {
+            return;
+        }
+        wifiEntry.connect(new WifiEntryConnectCallback(context, wifiEntry));
     }
 
     @VisibleForTesting
-    void connect(Context context, AccessPoint accessPoint) {
-        ContextualWifiScanWorker.saveSession();
-        WifiScanWorker.saveClickedWifi(accessPoint);
+    WifiScanWorker getWifiScanWorker(Intent intent) {
+        return SliceBackgroundWorker.getInstance(intent.getParcelableExtra(KEY_WIFI_SLICE_URI));
+    }
 
-        final WifiConnectListener connectListener = new WifiConnectListener(context);
-        switch (WifiUtils.getConnectingType(accessPoint)) {
-            case WifiUtils.CONNECT_TYPE_OSU_PROVISION:
-                accessPoint.startOsuProvisioning(connectListener);
-                break;
+    @VisibleForTesting
+    static class WifiEntryConnectCallback implements WifiEntry.ConnectCallback {
+        final Context mContext;
+        final WifiEntry mWifiEntry;
 
-            case WifiUtils.CONNECT_TYPE_OPEN_NETWORK:
-                accessPoint.generateOpenNetworkConfig();
+        WifiEntryConnectCallback(Context context, WifiEntry connectWifiEntry) {
+            mContext = context;
+            mWifiEntry = connectWifiEntry;
+        }
 
-            case WifiUtils.CONNECT_TYPE_SAVED_NETWORK:
-                final WifiManager wifiManager = context.getSystemService(WifiManager.class);
-                wifiManager.connect(accessPoint.getConfig(), connectListener);
-                break;
+        @Override
+        public void onConnectResult(@ConnectStatus int status) {
+            if (status == ConnectCallback.CONNECT_STATUS_FAILURE_NO_CONFIG) {
+                final Intent intent = new Intent(mContext, WifiDialogActivity.class)
+                        .putExtra(WifiDialogActivity.KEY_CHOSEN_WIFIENTRY_KEY, mWifiEntry.getKey());
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                mContext.startActivity(intent);
+            } else if (status == CONNECT_STATUS_FAILURE_UNKNOWN) {
+                Toast.makeText(mContext, R.string.wifi_failed_connect_message,
+                        Toast.LENGTH_SHORT).show();
+            }
         }
     }
 }
diff --git a/src/com/android/settings/wifi/slice/ContextualWifiScanWorker.java b/src/com/android/settings/wifi/slice/ContextualWifiScanWorker.java
index 616c92f..aa73a17 100644
--- a/src/com/android/settings/wifi/slice/ContextualWifiScanWorker.java
+++ b/src/com/android/settings/wifi/slice/ContextualWifiScanWorker.java
@@ -18,7 +18,6 @@
 
 import android.content.Context;
 import android.net.Uri;
-import android.os.SystemClock;
 
 import com.android.settings.slices.SliceBackgroundWorker;
 
@@ -27,44 +26,12 @@
  */
 public class ContextualWifiScanWorker extends WifiScanWorker {
 
-    private static long sVisibleUiSessionToken;
-    private static long sActiveSession;
-
     public ContextualWifiScanWorker(Context context, Uri uri) {
         super(context, uri);
     }
 
-    /**
-     * Starts a new visible UI session for the purpose of automatically starting captive portal.
-     *
-     * A visible UI session is defined as a duration of time when a UI screen is visible to user.
-     * Going to a sub-page and coming out breaks the continuation, leaving the page and coming back
-     * breaks it too.
-     */
-    public static void newVisibleUiSession() {
-        sVisibleUiSessionToken = SystemClock.elapsedRealtime();
-    }
-
-    static void saveSession() {
-        sActiveSession = sVisibleUiSessionToken;
-    }
-
-    @Override
-    protected void clearClickedWifiOnSliceUnpinned() {
-        // Do nothing for contextual Wi-Fi slice
-    }
-
-    @Override
-    protected boolean isSessionValid() {
-        if (sVisibleUiSessionToken != sActiveSession) {
-            clearClickedWifi();
-            return false;
-        }
-        return true;
-    }
-
     @Override
     protected int getApRowCount() {
         return ContextualWifiSlice.getApRowCount();
     }
-}
\ No newline at end of file
+}
diff --git a/src/com/android/settings/wifi/slice/ContextualWifiSlice.java b/src/com/android/settings/wifi/slice/ContextualWifiSlice.java
index ea9a745..4806573 100644
--- a/src/com/android/settings/wifi/slice/ContextualWifiSlice.java
+++ b/src/com/android/settings/wifi/slice/ContextualWifiSlice.java
@@ -18,10 +18,8 @@
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
+import android.net.ConnectivityManager;
 import android.net.NetworkCapabilities;
-import android.net.NetworkInfo;
-import android.net.NetworkInfo.DetailedState;
-import android.net.NetworkInfo.State;
 import android.net.Uri;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
@@ -37,7 +35,7 @@
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.slices.CustomSliceRegistry;
 import com.android.settings.slices.CustomSliceable;
-import com.android.settingslib.wifi.AccessPoint;
+import com.android.wifitrackerlib.WifiEntry;
 
 /**
  * {@link CustomSliceable} for Wi-Fi, used by contextual homepage.
@@ -52,8 +50,12 @@
     @VisibleForTesting
     static boolean sApRowCollapsed;
 
+    private final ConnectivityManager mConnectivityManager;
+
     public ContextualWifiSlice(Context context) {
         super(context);
+
+        mConnectivityManager = mContext.getSystemService(ConnectivityManager.class);
     }
 
     @Override
@@ -84,16 +86,17 @@
     }
 
     @Override
-    protected ListBuilder.RowBuilder getHeaderRow(boolean isWifiEnabled, AccessPoint accessPoint) {
-        final ListBuilder.RowBuilder builder = super.getHeaderRow(isWifiEnabled, accessPoint);
-        builder.setTitleItem(getHeaderIcon(isWifiEnabled, accessPoint), ListBuilder.ICON_IMAGE);
+    protected ListBuilder.RowBuilder getHeaderRow(boolean isWifiEnabled,
+            WifiSliceItem wifiSliceItem) {
+        final ListBuilder.RowBuilder builder = super.getHeaderRow(isWifiEnabled, wifiSliceItem);
+        builder.setTitleItem(getHeaderIcon(isWifiEnabled, wifiSliceItem), ListBuilder.ICON_IMAGE);
         if (sApRowCollapsed) {
-            builder.setSubtitle(getSubtitle(accessPoint));
+            builder.setSubtitle(getHeaderSubtitle(wifiSliceItem));
         }
         return builder;
     }
 
-    private IconCompat getHeaderIcon(boolean isWifiEnabled, AccessPoint accessPoint) {
+    private IconCompat getHeaderIcon(boolean isWifiEnabled, WifiSliceItem wifiSliceItem) {
         final Drawable drawable;
         final int tint;
         if (!isWifiEnabled) {
@@ -103,7 +106,8 @@
         } else {
             // get icon of medium signal strength
             drawable = mContext.getDrawable(com.android.settingslib.Utils.getWifiIconResource(2));
-            if (isNetworkConnected(accessPoint)) {
+            if (wifiSliceItem != null
+                    && wifiSliceItem.getConnectedState() == WifiEntry.CONNECTED_STATE_CONNECTED) {
                 tint = Utils.getColorAccentDefaultColor(mContext);
             } else {
                 tint = Utils.getColorAttrDefaultColor(mContext, android.R.attr.colorControlNormal);
@@ -113,49 +117,16 @@
         return Utils.createIconWithDrawable(drawable);
     }
 
-    private boolean isNetworkConnected(AccessPoint accessPoint) {
-        if (accessPoint == null) {
-            return false;
-        }
-
-        final NetworkInfo networkInfo = accessPoint.getNetworkInfo();
-        if (networkInfo == null) {
-            return false;
-        }
-
-        return networkInfo.getState() == State.CONNECTED;
-    }
-
-    private CharSequence getSubtitle(AccessPoint accessPoint) {
-        if (isCaptivePortal()) {
-            final int id = mContext.getResources()
-                    .getIdentifier("network_available_sign_in", "string", "android");
-            return mContext.getText(id);
-        }
-
-        if (accessPoint == null) {
+    private CharSequence getHeaderSubtitle(WifiSliceItem wifiSliceItem) {
+        if (wifiSliceItem == null
+                || wifiSliceItem.getConnectedState() == WifiEntry.CONNECTED_STATE_DISCONNECTED) {
             return mContext.getText(R.string.disconnected);
         }
-
-        final NetworkInfo networkInfo = accessPoint.getNetworkInfo();
-        if (networkInfo == null) {
-            return mContext.getText(R.string.disconnected);
+        if (wifiSliceItem.getConnectedState() == WifiEntry.CONNECTED_STATE_CONNECTING) {
+            return mContext.getString(R.string.wifi_connecting_to_message,
+                wifiSliceItem.getTitle());
         }
-
-        final State state = networkInfo.getState();
-        DetailedState detailedState;
-        if (state == State.CONNECTING) {
-            detailedState = DetailedState.CONNECTING;
-        } else if (state == State.CONNECTED) {
-            detailedState = DetailedState.CONNECTED;
-        } else {
-            detailedState = networkInfo.getDetailedState();
-        }
-
-        final String[] formats = mContext.getResources().getStringArray(
-                R.array.wifi_status_with_ssid);
-        final int index = detailedState.ordinal();
-        return String.format(formats[index], accessPoint.getTitle());
+        return mContext.getString(R.string.wifi_connected_to_message, wifiSliceItem.getTitle());
     }
 
     private boolean hasWorkingNetwork() {
diff --git a/src/com/android/settings/wifi/slice/WifiScanWorker.java b/src/com/android/settings/wifi/slice/WifiScanWorker.java
index 9d0f821..16c4ebc 100644
--- a/src/com/android/settings/wifi/slice/WifiScanWorker.java
+++ b/src/com/android/settings/wifi/slice/WifiScanWorker.java
@@ -16,243 +16,187 @@
 
 package com.android.settings.wifi.slice;
 
-import static android.net.NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL;
-import static android.net.NetworkCapabilities.NET_CAPABILITY_PARTIAL_CONNECTIVITY;
-import static android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED;
-import static android.net.NetworkCapabilities.TRANSPORT_WIFI;
-
 import static com.android.settings.wifi.slice.WifiSlice.DEFAULT_EXPANDED_ROW_COUNT;
 
 import android.content.Context;
-import android.content.Intent;
 import android.net.ConnectivityManager;
-import android.net.ConnectivityManager.NetworkCallback;
-import android.net.Network;
-import android.net.NetworkCapabilities;
-import android.net.NetworkRequest;
+import android.net.NetworkScoreManager;
 import android.net.Uri;
-import android.net.wifi.WifiInfo;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
-import android.os.UserHandle;
+import android.net.wifi.WifiManager;
+import android.os.HandlerThread;
+import android.os.Process;
+import android.os.SimpleClock;
+import android.os.SystemClock;
 import android.text.TextUtils;
-import android.util.Log;
 
 import androidx.annotation.VisibleForTesting;
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.LifecycleRegistry;
 
-import com.android.internal.util.Preconditions;
 import com.android.settings.slices.SliceBackgroundWorker;
-import com.android.settingslib.wifi.AccessPoint;
-import com.android.settingslib.wifi.WifiTracker;
+import com.android.settingslib.utils.ThreadUtils;
+import com.android.wifitrackerlib.WifiEntry;
+import com.android.wifitrackerlib.WifiEntry.WifiEntryCallback;
+import com.android.wifitrackerlib.WifiPickerTracker;
 
+import java.time.Clock;
+import java.time.ZoneOffset;
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * {@link SliceBackgroundWorker} for Wi-Fi, used by {@link WifiSlice}.
  */
-public class WifiScanWorker extends SliceBackgroundWorker<AccessPoint> implements
-        WifiTracker.WifiListener {
+public class WifiScanWorker extends SliceBackgroundWorker<WifiSliceItem> implements
+        WifiPickerTracker.WifiPickerTrackerCallback, LifecycleOwner, WifiEntryCallback {
 
     private static final String TAG = "WifiScanWorker";
 
+    // Max age of tracked WifiEntries.
+    private static final long MAX_SCAN_AGE_MILLIS = 15_000;
+    // Interval between initiating WifiPickerTracker scans.
+    private static final long SCAN_INTERVAL_MILLIS = 10_000;
+
     @VisibleForTesting
-    WifiNetworkCallback mNetworkCallback;
-
-    private final Context mContext;
-    private final ConnectivityManager mConnectivityManager;
-    private final WifiTracker mWifiTracker;
-
-    private static String sClickedWifiSsid;
+    final LifecycleRegistry mLifecycleRegistry;
+    @VisibleForTesting
+    WifiPickerTracker mWifiPickerTracker;
+    // Worker thread used for WifiPickerTracker work
+    private final HandlerThread mWorkerThread;
 
     public WifiScanWorker(Context context, Uri uri) {
         super(context, uri);
-        mContext = context;
-        mConnectivityManager = context.getSystemService(ConnectivityManager.class);
-        mWifiTracker = new WifiTracker(mContext, this /* wifiListener */,
-                true /* includeSaved */, true /* includeScans */);
+
+        mLifecycleRegistry = new LifecycleRegistry(this);
+
+        mWorkerThread = new HandlerThread(TAG, Process.THREAD_PRIORITY_BACKGROUND);
+        mWorkerThread.start();
+        final Clock elapsedRealtimeClock = new SimpleClock(ZoneOffset.UTC) {
+            @Override
+            public long millis() {
+                return SystemClock.elapsedRealtime();
+            }
+        };
+        mWifiPickerTracker = new WifiPickerTracker(getLifecycle(), context,
+                context.getSystemService(WifiManager.class),
+                context.getSystemService(ConnectivityManager.class),
+                context.getSystemService(NetworkScoreManager.class),
+                ThreadUtils.getUiThreadHandler(),
+                mWorkerThread.getThreadHandler(),
+                elapsedRealtimeClock,
+                MAX_SCAN_AGE_MILLIS,
+                SCAN_INTERVAL_MILLIS,
+                this);
+
+        mLifecycleRegistry.markState(Lifecycle.State.INITIALIZED);
+        mLifecycleRegistry.markState(Lifecycle.State.CREATED);
     }
 
     @Override
     protected void onSlicePinned() {
-        mWifiTracker.onStart();
-        onAccessPointsChanged();
+        mLifecycleRegistry.markState(Lifecycle.State.STARTED);
+        mLifecycleRegistry.markState(Lifecycle.State.RESUMED);
+        updateResults();
     }
 
     @Override
     protected void onSliceUnpinned() {
-        mWifiTracker.onStop();
-        unregisterNetworkCallback();
-        clearClickedWifiOnSliceUnpinned();
+        mLifecycleRegistry.markState(Lifecycle.State.STARTED);
+        mLifecycleRegistry.markState(Lifecycle.State.CREATED);
     }
 
     @Override
     public void close() {
-        mWifiTracker.onDestroy();
+        mLifecycleRegistry.markState(Lifecycle.State.DESTROYED);
+        mWorkerThread.quit();
     }
 
     @Override
-    public void onWifiStateChanged(int state) {
+    public Lifecycle getLifecycle() {
+        return mLifecycleRegistry;
+    }
+
+    /** Called when the state of Wifi has changed. */
+    @Override
+    public void onWifiStateChanged() {
         notifySliceChange();
     }
 
+    /**
+     * Update the results when data changes
+     */
     @Override
-    public void onConnectedChanged() {
+    public void onWifiEntriesChanged() {
+        updateResults();
     }
 
+    /**
+     * Indicates the state of the WifiEntry has changed and clients may retrieve updates through
+     * the WifiEntry getter methods.
+     */
     @Override
-    public void onAccessPointsChanged() {
-        // in case state has changed
-        if (!mWifiTracker.getManager().isWifiEnabled()) {
-            updateResults(null);
-            return;
-        }
-        // AccessPoints are sorted by the WifiTracker
-        final List<AccessPoint> accessPoints = mWifiTracker.getAccessPoints();
-        final List<AccessPoint> resultList = new ArrayList<>();
-        final int apRowCount = getApRowCount();
-        for (AccessPoint ap : accessPoints) {
-            if (ap.isReachable()) {
-                resultList.add(clone(ap));
-                if (resultList.size() >= apRowCount) {
-                    break;
-                }
-            }
-        }
-        updateResults(resultList);
+    public void onUpdated() {
+        updateResults();
     }
 
     protected int getApRowCount() {
         return DEFAULT_EXPANDED_ROW_COUNT;
     }
 
-    private AccessPoint clone(AccessPoint accessPoint) {
-        final Bundle savedState = new Bundle();
-        accessPoint.saveWifiState(savedState);
-        return new AccessPoint(mContext, savedState);
+    @Override
+    public void onNumSavedSubscriptionsChanged() {
+        // Do nothing.
     }
 
     @Override
-    protected boolean areListsTheSame(List<AccessPoint> a, List<AccessPoint> b) {
-        if (!a.equals(b)) {
-            return false;
-        }
+    public void onNumSavedNetworksChanged() {
+        // Do nothing.
+    }
 
-        // compare access point states one by one
-        final int listSize = a.size();
-        for (int i = 0; i < listSize; i++) {
-            if (a.get(i).getDetailedState() != b.get(i).getDetailedState()) {
-                return false;
+    /**
+     * To get the WifiEntry of key.
+     */
+    public WifiEntry getWifiEntry(String key) {
+        // Get specified WifiEntry.
+        WifiEntry keyWifiEntry = null;
+        final WifiEntry connectedWifiEntry = mWifiPickerTracker.getConnectedWifiEntry();
+        if (connectedWifiEntry != null && TextUtils.equals(key, connectedWifiEntry.getKey())) {
+            keyWifiEntry = connectedWifiEntry;
+        } else {
+            for (WifiEntry wifiEntry : mWifiPickerTracker.getWifiEntries()) {
+                if (TextUtils.equals(key, wifiEntry.getKey())) {
+                    keyWifiEntry = wifiEntry;
+                    break;
+                }
             }
         }
-        return true;
+        return keyWifiEntry;
     }
 
-    static void saveClickedWifi(AccessPoint accessPoint) {
-        sClickedWifiSsid = accessPoint.getSsidStr();
-    }
-
-    static void clearClickedWifi() {
-        sClickedWifiSsid = null;
-    }
-
-    static boolean isWifiClicked(WifiInfo info) {
-        final String ssid = WifiInfo.sanitizeSsid(info.getSSID());
-        return !TextUtils.isEmpty(ssid) && TextUtils.equals(ssid, sClickedWifiSsid);
-    }
-
-    protected void clearClickedWifiOnSliceUnpinned() {
-        clearClickedWifi();
-    }
-
-    protected boolean isSessionValid() {
-        return true;
-    }
-
-    public void registerNetworkCallback(Network wifiNetwork) {
-        if (wifiNetwork == null) {
+    @VisibleForTesting
+    void updateResults() {
+        if (mWifiPickerTracker.getWifiState() != WifiManager.WIFI_STATE_ENABLED
+                || mLifecycleRegistry.getCurrentState() != Lifecycle.State.RESUMED) {
+            super.updateResults(null);
             return;
         }
 
-        if (mNetworkCallback != null && mNetworkCallback.isSameNetwork(wifiNetwork)) {
-            return;
+        final List<WifiSliceItem> resultList = new ArrayList<>();
+        final WifiEntry connectedWifiEntry = mWifiPickerTracker.getConnectedWifiEntry();
+        if (connectedWifiEntry != null) {
+            connectedWifiEntry.setListener(this);
+            resultList.add(new WifiSliceItem(getContext(), connectedWifiEntry));
         }
-
-        unregisterNetworkCallback();
-
-        mNetworkCallback = new WifiNetworkCallback(wifiNetwork);
-        mConnectivityManager.registerNetworkCallback(
-                new NetworkRequest.Builder()
-                        .clearCapabilities()
-                        .addTransportType(TRANSPORT_WIFI)
-                        .build(),
-                mNetworkCallback,
-                new Handler(Looper.getMainLooper()));
-    }
-
-    public void unregisterNetworkCallback() {
-        if (mNetworkCallback != null) {
-            try {
-                mConnectivityManager.unregisterNetworkCallback(mNetworkCallback);
-            } catch (RuntimeException e) {
-                Log.e(TAG, "Unregistering CaptivePortalNetworkCallback failed.", e);
+        for (WifiEntry wifiEntry : mWifiPickerTracker.getWifiEntries()) {
+            if (resultList.size() >= getApRowCount()) {
+                break;
             }
-            mNetworkCallback = null;
-        }
-    }
-
-    class WifiNetworkCallback extends NetworkCallback {
-
-        private final Network mNetwork;
-        private boolean mIsCaptivePortal;
-        private boolean mHasPartialConnectivity;
-        private boolean mIsValidated;
-
-        WifiNetworkCallback(Network network) {
-            mNetwork = Preconditions.checkNotNull(network);
-        }
-
-        @Override
-        public void onCapabilitiesChanged(Network network, NetworkCapabilities nc) {
-            if (!isSameNetwork(network)) {
-                return;
-            }
-
-            final boolean prevIsCaptivePortal = mIsCaptivePortal;
-            final boolean prevHasPartialConnectivity = mHasPartialConnectivity;
-            final boolean prevIsValidated = mIsValidated;
-
-            mIsCaptivePortal = nc.hasCapability(NET_CAPABILITY_CAPTIVE_PORTAL);
-            mHasPartialConnectivity = nc.hasCapability(NET_CAPABILITY_PARTIAL_CONNECTIVITY);
-            mIsValidated = nc.hasCapability(NET_CAPABILITY_VALIDATED);
-
-            if (prevIsCaptivePortal == mIsCaptivePortal
-                    && prevHasPartialConnectivity == mHasPartialConnectivity
-                    && prevIsValidated == mIsValidated) {
-                return;
-            }
-
-            notifySliceChange();
-
-            // Automatically start captive portal
-            if (!prevIsCaptivePortal && mIsCaptivePortal
-                    && isWifiClicked(mWifiTracker.getManager().getConnectionInfo())
-                    && isSessionValid()) {
-                final Intent intent = new Intent(mContext, ConnectToWifiHandler.class)
-                        .putExtra(ConnectivityManager.EXTRA_NETWORK, network)
-                        .addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
-                // Sending a broadcast in the system process needs to specify a user
-                mContext.sendBroadcastAsUser(intent, UserHandle.CURRENT);
+            if (wifiEntry.getLevel() != WifiEntry.WIFI_LEVEL_UNREACHABLE) {
+                wifiEntry.setListener(this);
+                resultList.add(new WifiSliceItem(getContext(), wifiEntry));
             }
         }
-
-        /**
-         * Returns true if the supplied network is not null and is the same as the originally
-         * supplied value.
-         */
-        public boolean isSameNetwork(Network network) {
-            return mNetwork.equals(network);
-        }
+        super.updateResults(resultList);
     }
 }
diff --git a/src/com/android/settings/wifi/slice/WifiSlice.java b/src/com/android/settings/wifi/slice/WifiSlice.java
index a489b05..324d68c 100644
--- a/src/com/android/settings/wifi/slice/WifiSlice.java
+++ b/src/com/android/settings/wifi/slice/WifiSlice.java
@@ -29,9 +29,6 @@
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
-import android.net.ConnectivityManager;
-import android.net.NetworkCapabilities;
-import android.net.NetworkInfo;
 import android.net.Uri;
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
@@ -52,9 +49,8 @@
 import com.android.settings.slices.SliceBuilderUtils;
 import com.android.settings.wifi.WifiDialogActivity;
 import com.android.settings.wifi.WifiSettings;
-import com.android.settings.wifi.WifiUtils;
-import com.android.settings.wifi.details.WifiNetworkDetailsFragment;
-import com.android.settingslib.wifi.AccessPoint;
+import com.android.settings.wifi.details2.WifiNetworkDetailsFragment2;
+import com.android.wifitrackerlib.WifiEntry;
 
 import java.util.Arrays;
 import java.util.List;
@@ -71,12 +67,10 @@
 
     protected final Context mContext;
     protected final WifiManager mWifiManager;
-    protected final ConnectivityManager mConnectivityManager;
 
     public WifiSlice(Context context) {
         mContext = context;
         mWifiManager = mContext.getSystemService(WifiManager.class);
-        mConnectivityManager = mContext.getSystemService(ConnectivityManager.class);
     }
 
     @Override
@@ -87,17 +81,16 @@
     @Override
     public Slice getSlice() {
         final boolean isWifiEnabled = isWifiEnabled();
-        ListBuilder listBuilder = getListBuilder(isWifiEnabled, null /* accessPoint */);
+        ListBuilder listBuilder = getListBuilder(isWifiEnabled, null /* wifiSliceItem */);
         if (!isWifiEnabled) {
-            WifiScanWorker.clearClickedWifi();
             return listBuilder.build();
         }
 
         final WifiScanWorker worker = SliceBackgroundWorker.getInstance(getUri());
-        final List<AccessPoint> apList = worker != null ? worker.getResults() : null;
+        final List<WifiSliceItem> apList = worker != null ? worker.getResults() : null;
         final int apCount = apList == null ? 0 : apList.size();
-        final boolean isFirstApActive = apCount > 0 && apList.get(0).isActive();
-        handleNetworkCallback(worker, isFirstApActive);
+        final boolean isFirstApActive = apCount > 0
+                && apList.get(0).getConnectedState() != WifiEntry.CONNECTED_STATE_DISCONNECTED;
 
         if (isFirstApActive) {
             // refresh header subtext
@@ -112,7 +105,7 @@
         final CharSequence placeholder = mContext.getText(R.string.summary_placeholder);
         for (int i = 0; i < DEFAULT_EXPANDED_ROW_COUNT; i++) {
             if (i < apCount) {
-                listBuilder.addRow(getAccessPointRow(apList.get(i)));
+                listBuilder.addRow(getWifiSliceItemRow(apList.get(i)));
             } else if (i == apCount) {
                 listBuilder.addRow(getLoadingRow(placeholder));
             } else {
@@ -124,22 +117,12 @@
         return listBuilder.build();
     }
 
-    private void handleNetworkCallback(WifiScanWorker worker, boolean isFirstApActive) {
-        if (worker == null) {
-            return;
-        }
-        if (isFirstApActive) {
-            worker.registerNetworkCallback(mWifiManager.getCurrentNetwork());
-        } else {
-            worker.unregisterNetworkCallback();
-        }
-    }
-
     protected boolean isApRowCollapsed() {
         return false;
     }
 
-    protected ListBuilder.RowBuilder getHeaderRow(boolean isWifiEnabled, AccessPoint accessPoint) {
+    protected ListBuilder.RowBuilder getHeaderRow(boolean isWifiEnabled,
+            WifiSliceItem wifiSliceItem) {
         final IconCompat icon = IconCompat.createWithResource(mContext,
                 R.drawable.ic_settings_wireless);
         final String title = mContext.getString(R.string.wifi_settings);
@@ -152,115 +135,90 @@
                 .setPrimaryAction(primarySliceAction);
     }
 
-    private ListBuilder getListBuilder(boolean isWifiEnabled, AccessPoint accessPoint) {
+    private ListBuilder getListBuilder(boolean isWifiEnabled, WifiSliceItem wifiSliceItem) {
         final PendingIntent toggleAction = getBroadcastIntent(mContext);
         final SliceAction toggleSliceAction = SliceAction.createToggle(toggleAction,
                 null /* actionTitle */, isWifiEnabled);
         final ListBuilder builder = new ListBuilder(mContext, getUri(), ListBuilder.INFINITY)
                 .setAccentColor(COLOR_NOT_TINTED)
                 .setKeywords(getKeywords())
-                .addRow(getHeaderRow(isWifiEnabled, accessPoint))
+                .addRow(getHeaderRow(isWifiEnabled, wifiSliceItem))
                 .addAction(toggleSliceAction);
         return builder;
     }
 
-    private ListBuilder.RowBuilder getAccessPointRow(AccessPoint accessPoint) {
-        final boolean isCaptivePortal = accessPoint.isActive() && isCaptivePortal();
-        final CharSequence title = accessPoint.getTitle();
-        final CharSequence summary = getAccessPointSummary(accessPoint, isCaptivePortal);
-        final IconCompat levelIcon = getAccessPointLevelIcon(accessPoint);
+    private ListBuilder.RowBuilder getWifiSliceItemRow(WifiSliceItem wifiSliceItem) {
+        final CharSequence title = wifiSliceItem.getTitle();
+        final IconCompat levelIcon = getWifiSliceItemLevelIcon(wifiSliceItem);
         final ListBuilder.RowBuilder rowBuilder = new ListBuilder.RowBuilder()
                 .setTitleItem(levelIcon, ListBuilder.ICON_IMAGE)
                 .setTitle(title)
-                .setSubtitle(summary)
-                .setPrimaryAction(getAccessPointAction(accessPoint, isCaptivePortal, levelIcon,
-                        title));
+                .setSubtitle(wifiSliceItem.getSummary())
+                .setContentDescription(wifiSliceItem.getContentDescription())
+                .setPrimaryAction(getWifiEntryAction(wifiSliceItem, levelIcon, title));
 
-        if (isCaptivePortal) {
-            rowBuilder.addEndItem(getCaptivePortalEndAction(accessPoint, title));
-        } else {
-            final IconCompat endIcon = getEndIcon(accessPoint);
-            if (endIcon != null) {
-                rowBuilder.addEndItem(endIcon, ListBuilder.ICON_IMAGE);
-            }
+        final IconCompat endIcon = getEndIcon(wifiSliceItem);
+        if (endIcon != null) {
+            rowBuilder.addEndItem(endIcon, ListBuilder.ICON_IMAGE);
         }
         return rowBuilder;
     }
 
-    private CharSequence getAccessPointSummary(AccessPoint accessPoint, boolean isCaptivePortal) {
-        if (isCaptivePortal) {
-            return mContext.getText(R.string.wifi_tap_to_sign_in);
-        }
-
-        final CharSequence summary = accessPoint.getSettingsSummary();
-        return TextUtils.isEmpty(summary) ? mContext.getText(R.string.disconnected) : summary;
-    }
-
-    private IconCompat getAccessPointLevelIcon(AccessPoint accessPoint) {
+    private IconCompat getWifiSliceItemLevelIcon(WifiSliceItem wifiSliceItem) {
         final @ColorInt int tint;
-        if (accessPoint.isActive()) {
-            final NetworkInfo.State state = accessPoint.getNetworkInfo().getState();
-            if (state == NetworkInfo.State.CONNECTED) {
-                tint = Utils.getColorAccentDefaultColor(mContext);
-            } else { // connecting
-                tint = Utils.getDisabled(mContext, Utils.getColorAttrDefaultColor(mContext,
-                        android.R.attr.colorControlNormal));
-            }
-        } else {
+        if (wifiSliceItem.getConnectedState() == WifiEntry.CONNECTED_STATE_CONNECTED) {
+            tint = Utils.getColorAccentDefaultColor(mContext);
+        } else if (wifiSliceItem.getConnectedState() == WifiEntry.CONNECTED_STATE_DISCONNECTED) {
             tint = Utils.getColorAttrDefaultColor(mContext, android.R.attr.colorControlNormal);
+        } else {
+            tint = Utils.getDisabled(mContext, Utils.getColorAttrDefaultColor(mContext,
+                        android.R.attr.colorControlNormal));
         }
 
         final Drawable drawable = mContext.getDrawable(
-                com.android.settingslib.Utils.getWifiIconResource(accessPoint.getLevel()));
+                com.android.settingslib.Utils.getWifiIconResource(wifiSliceItem.getLevel()));
         drawable.setTint(tint);
         return Utils.createIconWithDrawable(drawable);
     }
 
-    private IconCompat getEndIcon(AccessPoint accessPoint) {
-        if (accessPoint.isActive()) {
+    private IconCompat getEndIcon(WifiSliceItem wifiSliceItem) {
+        if (wifiSliceItem.getConnectedState() != WifiEntry.CONNECTED_STATE_DISCONNECTED) {
             return null;
-        } else if (accessPoint.getSecurity() != AccessPoint.SECURITY_NONE) {
+        }
+
+        if (wifiSliceItem.getSecurity() != WifiEntry.SECURITY_NONE) {
             return IconCompat.createWithResource(mContext, R.drawable.ic_friction_lock_closed);
-        } else if (accessPoint.isMetered()) {
-            return IconCompat.createWithResource(mContext, R.drawable.ic_friction_money);
         }
         return null;
     }
 
-    private SliceAction getCaptivePortalEndAction(AccessPoint accessPoint, CharSequence title) {
-        return getAccessPointAction(accessPoint, false /* isCaptivePortal */,
-                IconCompat.createWithResource(mContext, R.drawable.ic_settings_accent), title);
-    }
+    private SliceAction getWifiEntryAction(WifiSliceItem wifiSliceItem, IconCompat icon,
+            CharSequence title) {
+        final int requestCode = wifiSliceItem.getKey().hashCode();
 
-    private SliceAction getAccessPointAction(AccessPoint accessPoint, boolean isCaptivePortal,
-            IconCompat icon, CharSequence title) {
-        final int requestCode = accessPoint.hashCode();
-        if (isCaptivePortal) {
-            final Intent intent = new Intent(mContext, ConnectToWifiHandler.class)
-                    .putExtra(ConnectivityManager.EXTRA_NETWORK, mWifiManager.getCurrentNetwork());
-            return getBroadcastAction(requestCode, intent, icon, title);
-        }
-
-        final Bundle extras = new Bundle();
-        accessPoint.saveWifiState(extras);
-
-        if (accessPoint.isActive()) {
+        if (wifiSliceItem.getConnectedState() != WifiEntry.CONNECTED_STATE_DISCONNECTED) {
+            final Bundle bundle = new Bundle();
+            bundle.putString(WifiNetworkDetailsFragment2.KEY_CHOSEN_WIFIENTRY_KEY,
+                    wifiSliceItem.getKey());
             final Intent intent = new SubSettingLauncher(mContext)
                     .setTitleRes(R.string.pref_title_network_details)
-                    .setDestination(WifiNetworkDetailsFragment.class.getName())
-                    .setArguments(extras)
+                    .setDestination(WifiNetworkDetailsFragment2.class.getName())
+                    .setArguments(bundle)
                     .setSourceMetricsCategory(SettingsEnums.WIFI)
                     .toIntent();
             return getActivityAction(requestCode, intent, icon, title);
-        } else if (WifiUtils.getConnectingType(accessPoint) != WifiUtils.CONNECT_TYPE_OTHERS) {
-            final Intent intent = new Intent(mContext, ConnectToWifiHandler.class)
-                    .putExtra(WifiDialogActivity.KEY_ACCESS_POINT_STATE, extras);
-            return getBroadcastAction(requestCode, intent, icon, title);
-        } else {
+        }
+
+        if (wifiSliceItem.shouldEditBeforeConnect()) {
             final Intent intent = new Intent(mContext, WifiDialogActivity.class)
-                    .putExtra(WifiDialogActivity.KEY_ACCESS_POINT_STATE, extras);
+                    .putExtra(WifiDialogActivity.KEY_CHOSEN_WIFIENTRY_KEY, wifiSliceItem.getKey());
             return getActivityAction(requestCode, intent, icon, title);
         }
+
+        final Intent intent = new Intent(mContext, ConnectToWifiHandler.class)
+                .putExtra(ConnectToWifiHandler.KEY_CHOSEN_WIFIENTRY_KEY, wifiSliceItem.getKey())
+                .putExtra(ConnectToWifiHandler.KEY_WIFI_SLICE_URI, getUri());
+        return getBroadcastAction(requestCode, intent, icon, title);
     }
 
     private SliceAction getActivityAction(int requestCode, Intent intent, IconCompat icon,
@@ -291,12 +249,6 @@
                 .setSubtitle(title);
     }
 
-    protected boolean isCaptivePortal() {
-        final NetworkCapabilities nc = mConnectivityManager.getNetworkCapabilities(
-                mWifiManager.getCurrentNetwork());
-        return WifiUtils.canSignIntoNetwork(nc);
-    }
-
     /**
      * Update the current wifi status to the boolean value keyed by
      * {@link android.app.slice.Slice#EXTRA_TOGGLE_STATE} on {@param intent}.
diff --git a/src/com/android/settings/wifi/slice/WifiSliceItem.java b/src/com/android/settings/wifi/slice/WifiSliceItem.java
new file mode 100644
index 0000000..7a0f0d7
--- /dev/null
+++ b/src/com/android/settings/wifi/slice/WifiSliceItem.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wifi.slice;
+
+import android.content.Context;
+import android.text.TextUtils;
+
+import com.android.settingslib.R;
+import com.android.wifitrackerlib.WifiEntry;
+
+/**
+ * The data set which is needed by a Wi-Fi Slice, it collects necessary data from {@link WifiEntry}
+ * and provides similar getter methods for corresponding data.
+ */
+public class WifiSliceItem {
+
+    private final Context mContext;
+    private final String mKey;
+    private final String mTitle;
+    private final int mSecurity;
+    private final int mConnectedState;
+    private final int mLevel;
+    private final boolean mShouldEditBeforeConnect;
+    private final String mSummary;
+
+    // These values must be kept within [WifiEntry.WIFI_LEVEL_MIN, WifiEntry.WIFI_LEVEL_MAX]
+    private static final int[] WIFI_CONNECTION_STRENGTH = {
+            R.string.accessibility_no_wifi,
+            R.string.accessibility_wifi_one_bar,
+            R.string.accessibility_wifi_two_bars,
+            R.string.accessibility_wifi_three_bars,
+            R.string.accessibility_wifi_signal_full
+    };
+
+    public WifiSliceItem(Context context, WifiEntry wifiEntry) {
+        mContext = context;
+        mKey = wifiEntry.getKey();
+        mTitle = wifiEntry.getTitle();
+        mSecurity = wifiEntry.getSecurity();
+        mConnectedState = wifiEntry.getConnectedState();
+        mLevel = wifiEntry.getLevel();
+        mShouldEditBeforeConnect = wifiEntry.shouldEditBeforeConnect();
+        mSummary = wifiEntry.getSummary(false /* concise */);
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (!(other instanceof WifiSliceItem)) {
+            return false;
+        }
+
+        final WifiSliceItem otherItem = (WifiSliceItem) other;
+        if (!TextUtils.equals(getKey(), otherItem.getKey())) {
+            return false;
+        }
+        if (getConnectedState() != otherItem.getConnectedState()) {
+            return false;
+        }
+        if (getLevel() != otherItem.getLevel()) {
+            return false;
+        }
+        if (!TextUtils.equals(getSummary(), otherItem.getSummary())) {
+            return false;
+        }
+        return true;
+    }
+
+    public String getKey() {
+        return mKey;
+    }
+
+    public String getTitle() {
+        return mTitle;
+    }
+
+    public int getSecurity() {
+        return mSecurity;
+    }
+
+    public int getConnectedState() {
+        return mConnectedState;
+    }
+
+    public int getLevel() {
+        return mLevel;
+    }
+
+    /**
+     * In Wi-Fi picker, when users click a saved network, it will connect to the Wi-Fi network.
+     * However, for some special cases, Wi-Fi picker should show Wi-Fi editor UI for users to edit
+     * security or password before connecting. Or users will always get connection fail results.
+     */
+    public boolean shouldEditBeforeConnect() {
+        return mShouldEditBeforeConnect;
+    }
+
+    /**
+     * Returns a 'NOT' concise summary, this is different from WifiEntry#getSummary().
+     */
+    public String getSummary() {
+        return mSummary;
+    }
+
+    /**
+     * This method has similar code as WifiEntryPreference#buildContentDescription().
+     * TODO(b/154191825): Adds WifiEntry#getContentDescription() to replace the duplicate code.
+     */
+    public CharSequence getContentDescription() {
+        CharSequence contentDescription = mTitle;
+        if (!TextUtils.isEmpty(mSummary)) {
+            contentDescription = TextUtils.concat(contentDescription, ",", mSummary);
+        }
+        if (mLevel >= 0 && mLevel < WIFI_CONNECTION_STRENGTH.length) {
+            contentDescription = TextUtils.concat(contentDescription, ",",
+                    mContext.getString(WIFI_CONNECTION_STRENGTH[mLevel]));
+        }
+        return TextUtils.concat(contentDescription, ",", mSecurity == WifiEntry.SECURITY_NONE
+                ? mContext.getString(R.string.accessibility_wifi_security_type_none)
+                : mContext.getString(R.string.accessibility_wifi_security_type_secured));
+    }
+}
diff --git a/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java
index a4a51dc..be67d22 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java
@@ -118,7 +118,7 @@
 
     @Override
     public boolean isTextValid(String value) {
-        return WifiUtils.isHotspotPasswordValid(value);
+        return WifiUtils.isHotspotWpa2PasswordValid(value);
     }
 
     private static String generateRandomPassword() {
diff --git a/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java b/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java
index 912fb8c..e83eb1c 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java
@@ -162,12 +162,12 @@
     }
 
     @Override
-    public void onWhitelistStatusChanged(int uid, boolean isWhitelisted) {
+    public void onAllowlistStatusChanged(int uid, boolean isAllowlisted) {
         // we don't care, since we just want to read the value
     }
 
     @Override
-    public void onBlacklistStatusChanged(int uid, boolean isBlacklisted) {
+    public void onDenylistStatusChanged(int uid, boolean isDenylisted) {
         // we don't care, since we just want to read the value
     }
 }
diff --git a/tests/perftests/Android.bp b/tests/perftests/Android.bp
index 7708bbe..1ba5d9c 100644
--- a/tests/perftests/Android.bp
+++ b/tests/perftests/Android.bp
@@ -19,4 +19,4 @@
     test_suites: ["device-tests"],
 
     instrumentation_for: "Settings",
-}
\ No newline at end of file
+}
diff --git a/tests/perftests/AndroidManifest.xml b/tests/perftests/AndroidManifest.xml
index 972467f..8aae24a 100644
--- a/tests/perftests/AndroidManifest.xml
+++ b/tests/perftests/AndroidManifest.xml
@@ -15,15 +15,15 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.android.settings.tests.perf">
+    package="com.android.settings.tests.perf">
 
     <application>
-        <uses-library android:name="android.test.runner"/>
+        <uses-library android:name="android.test.runner" />
     </application>
 
     <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
-                     android:targetPackage="com.android.settings.tests.perf"
-                     android:label="Settings Performance Test Cases">
+        android:targetPackage="com.android.settings.tests.perf"
+        android:label="Settings Performance Test Cases">
     </instrumentation>
 
 </manifest>
diff --git a/tests/perftests/src/com/android/settings/tests/perf/LaunchSettingsTest.java b/tests/perftests/src/com/android/settings/tests/perf/LaunchSettingsTest.java
index f55598c..a8c5230 100644
--- a/tests/perftests/src/com/android/settings/tests/perf/LaunchSettingsTest.java
+++ b/tests/perftests/src/com/android/settings/tests/perf/LaunchSettingsTest.java
@@ -21,8 +21,10 @@
 
 import android.app.Instrumentation;
 import android.os.Bundle;
+import android.util.Log;
 import android.support.test.uiautomator.By;
 import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.UiSelector;
 import android.support.test.uiautomator.Until;
 
 import androidx.test.InstrumentationRegistry;
@@ -34,9 +36,9 @@
 import org.junit.runner.RunWith;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.Collections;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -54,10 +56,13 @@
         }
     }
 
+    private static final String SCREEN_TIME_OUT = "7200000";
+    private static final String DEFAULT_SCREEN_TIMEOUT = "15000";
     private static final int TIME_OUT = 5000;
     private static final int TEST_TIME = 10;
     private static final Pattern PATTERN = Pattern.compile("TotalTime:\\s[0-9]*");
     private static final Page[] PAGES;
+    private static final String TAG = "SettingsPerfTests";
 
     static {
         PAGES = new Page[]{
@@ -65,7 +70,8 @@
                 new Page("android.settings.WIFI_SETTINGS", "Use Wi‑Fi", "Wi-Fi"),
                 new Page("android.settings.BLUETOOTH_SETTINGS", "Connected devices", "BlueTooth"),
                 new Page("android.settings.APPLICATION_SETTINGS", "App info", "Application"),
-                new Page("android.intent.action.POWER_USAGE_SUMMARY", "Battery", "Battery")
+                new Page("android.intent.action.POWER_USAGE_SUMMARY", "Battery", "Battery"),
+                new Page("android.settings.INTERNAL_STORAGE_SETTINGS", "Storage", "Storage")
         };
     }
 
@@ -73,6 +79,8 @@
     private UiDevice mDevice;
     private Instrumentation mInstrumentation;
     private Map<String, ArrayList<Integer>> mResult;
+    private String mDefaultScreenTimeout;
+    private String mDefaultAirplaneModeStatus;
 
     @Before
     public void setUp() throws Exception {
@@ -80,6 +88,11 @@
         mDevice = UiDevice.getInstance(getInstrumentation());
         mInstrumentation = InstrumentationRegistry.getInstrumentation();
         mResult = new LinkedHashMap<>();
+        mDefaultScreenTimeout = mDevice.executeShellCommand(
+                "settings get system screen_off_timeout");
+        mDefaultAirplaneModeStatus = getAirplaneModeStatus();
+        setScreenTimeOut(SCREEN_TIME_OUT);
+        setAirplaneMode();
         mDevice.pressHome();
         mDevice.waitForIdle(TIME_OUT);
 
@@ -92,6 +105,9 @@
     public void tearDown() throws Exception {
         putResultToBundle();
         mInstrumentation.sendStatus(0, mBundle);
+        resetScreenTimeout();
+        resetAirplaneMode();
+        closeApp();
     }
 
     @Test
@@ -105,19 +121,19 @@
 
     private void executePreformanceTest(String action, String displayName, String title)
             throws Exception {
+        closeApp();
+        mDevice.waitForIdle(TIME_OUT);
         final String mString = mDevice.executeShellCommand("am start -W -a" + action);
         mDevice.wait(Until.findObject(By.text(displayName)), TIME_OUT);
         handleLaunchResult(title, mString);
-        closeApp();
-        mDevice.waitForIdle(TIME_OUT);
     }
 
-    private void handleLaunchResult(String title, String s) {
-        Matcher mMatcher = PATTERN.matcher(s);
+    private void handleLaunchResult(String title, String shellCommandResult) {
+        Matcher mMatcher = PATTERN.matcher(shellCommandResult);
         if (mMatcher.find()) {
             mResult.get(title).add(Integer.valueOf(mMatcher.group().split("\\s")[1]));
         } else {
-            fail("Some pages can't be found");
+            fail(String.format("Not found %s.\n %s", title, shellCommandResult));
         }
     }
 
@@ -129,23 +145,92 @@
     private void putResultToBundle() {
         for (String string : mResult.keySet()) {
             mBundle.putString(String.format("LaunchSettingsTest_%s_%s", string, "max"),
-                    getMax(mResult.get(string)));
+                    getMax(string));
             mBundle.putString(String.format("LaunchSettingsTest_%s_%s", string, "min"),
-                    getMin(mResult.get(string)));
+                    getMin(string));
             mBundle.putString(String.format("LaunchSettingsTest_%s_%s", string, "avg"),
-                    getAvg(mResult.get(string)));
+                    getAvg(string));
+            mBundle.putString(String.format("LaunchSettingsTest_%s_%s", string, "25 Percentile"),
+                    getPercentile(string, 25));
+            mBundle.putString(String.format("LaunchSettingsTest_%s_%s", string, "50 Percentile"),
+                    getPercentile(string, 50));
+            mBundle.putString(String.format("LaunchSettingsTest_%s_%s", string, "75 Percentile"),
+                    getPercentile(string, 75));
+            mBundle.putString(String.format("LaunchSettingsTest_%s_%s", string, "all_results"),
+                    mResult.get(string).toString());
+            mBundle.putString(String.format("LaunchSettingsTest_%s_%s", string, "results_count"),
+                    String.valueOf(mResult.get(string).size()));
         }
     }
 
-    private String getMax(ArrayList<Integer> launchResult) {
-        return String.format("%s", launchResult.isEmpty() ? "null" : Collections.max(launchResult));
+    private String getMax(String page) {
+        if (mResult.get(page).size() == TEST_TIME) {
+            return String.format("%s", Collections.max(mResult.get(page)));
+        }
+        Log.e(TAG, String.format("Fail to get max of %s.", page));
+        return "0";
+
     }
 
-    private String getMin(ArrayList<Integer> launchResult) {
-        return String.format("%s", launchResult.isEmpty() ? "null" : Collections.min(launchResult));
+    private String getMin(String page) {
+        if (mResult.get(page).size() == TEST_TIME) {
+            return String.format("%s", Collections.min(mResult.get(page)));
+        }
+        Log.e(TAG, String.format("Fail to get min of %s.", page));
+        return "0";
     }
 
-    private String getAvg(ArrayList<Integer> launchResult) {
-        return String.valueOf((int) launchResult.stream().mapToInt(i -> i).average().orElse(0));
+    private String getAvg(String page) {
+        if (mResult.get(page).size() == TEST_TIME) {
+            return String.valueOf((int) mResult.get(page).stream().mapToInt(
+                    i -> i).average().orElse(0));
+        }
+        Log.e(TAG, String.format("Fail to get avg of %s.", page));
+        return "0";
+    }
+
+    private void setScreenTimeOut(String timeout) throws Exception {
+        mDevice.executeShellCommand("settings put system screen_off_timeout " + timeout);
+    }
+
+    private void resetScreenTimeout() throws Exception {
+        String timeout = DEFAULT_SCREEN_TIMEOUT;
+        if (!mDefaultScreenTimeout.isEmpty()) {
+            timeout = mDefaultScreenTimeout;
+        }
+        setScreenTimeOut(timeout);
+    }
+
+    private void setAirplaneMode() throws Exception {
+        if (mDefaultAirplaneModeStatus.equals("0\n")) {
+            clickAirplaneMode();
+        }
+    }
+
+    private void resetAirplaneMode() throws Exception {
+        if (!getAirplaneModeStatus().equals(mDefaultAirplaneModeStatus)) {
+            clickAirplaneMode();
+        }
+    }
+
+    private void clickAirplaneMode() throws Exception {
+        mDevice.executeShellCommand("am start -W -a android.settings.AIRPLANE_MODE_SETTINGS");
+        mDevice.waitForIdle(TIME_OUT);
+        mDevice.findObject(By.textContains("Airplane")).click();
+        mDevice.waitForIdle(TIME_OUT);
+    }
+
+    private String getAirplaneModeStatus() throws Exception {
+        return mDevice.executeShellCommand("settings get global airplane_mode_on");
+    }
+
+    private String getPercentile(String page, double position) {
+        Collections.sort(mResult.get(page));
+        if (mResult.get(page).size() == TEST_TIME) {
+            return String.valueOf(
+                    mResult.get(page).get((int) (Math.ceil(TEST_TIME * position / 100)) - 1));
+        }
+        Log.e(TAG, String.format("Fail to get percentile of %s.", page));
+        return "0";
     }
 }
\ No newline at end of file
diff --git a/tests/robotests/Android.bp b/tests/robotests/Android.bp
index efef10a..421b576 100644
--- a/tests/robotests/Android.bp
+++ b/tests/robotests/Android.bp
@@ -68,6 +68,10 @@
         "androidx.test.ext.junit",
     ],
 
+    libs: [
+        "ims-common",
+    ],
+
     java_resource_dirs: ["config", "resources"],
 
     instrumentation_for: "SettingsRoboTestStub",
diff --git a/tests/robotests/assets/grandfather_invalid_base_preference_controller_constructor b/tests/robotests/assets/exempt_invalid_base_preference_controller_constructor
similarity index 93%
rename from tests/robotests/assets/grandfather_invalid_base_preference_controller_constructor
rename to tests/robotests/assets/exempt_invalid_base_preference_controller_constructor
index c29807b..b8c2575 100644
--- a/tests/robotests/assets/grandfather_invalid_base_preference_controller_constructor
+++ b/tests/robotests/assets/exempt_invalid_base_preference_controller_constructor
@@ -11,5 +11,4 @@
 com.android.settings.fuelgauge.batterysaver.BatterySaverButtonPreferenceController
 com.android.settings.fuelgauge.batterytip.BatteryTipPreferenceController
 com.android.settings.security.VisiblePatternProfilePreferenceController
-com.android.settings.wifi.details.WifiMeteredPreferenceController
 com.android.settings.wifi.details2.WifiMeteredPreferenceController2
diff --git a/tests/robotests/assets/grandfather_not_implementing_index_provider b/tests/robotests/assets/exempt_not_implementing_index_provider
similarity index 100%
rename from tests/robotests/assets/grandfather_not_implementing_index_provider
rename to tests/robotests/assets/exempt_not_implementing_index_provider
diff --git a/tests/robotests/assets/grandfather_not_implementing_instrumentable b/tests/robotests/assets/exempt_not_implementing_instrumentable
similarity index 100%
rename from tests/robotests/assets/grandfather_not_implementing_instrumentable
rename to tests/robotests/assets/exempt_not_implementing_instrumentable
diff --git a/tests/robotests/assets/grandfather_not_in_search_index_provider_registry b/tests/robotests/assets/exempt_not_in_search_index_provider_registry
similarity index 100%
rename from tests/robotests/assets/grandfather_not_in_search_index_provider_registry
rename to tests/robotests/assets/exempt_not_in_search_index_provider_registry
diff --git a/tests/robotests/assets/grandfather_not_sharing_pref_controllers_with_search_provider b/tests/robotests/assets/exempt_not_sharing_pref_controllers_with_search_provider
similarity index 100%
rename from tests/robotests/assets/grandfather_not_sharing_pref_controllers_with_search_provider
rename to tests/robotests/assets/exempt_not_sharing_pref_controllers_with_search_provider
diff --git a/tests/robotests/assets/grandfather_slice_controller_not_in_xml b/tests/robotests/assets/exempt_slice_controller_not_in_xml
similarity index 100%
rename from tests/robotests/assets/grandfather_slice_controller_not_in_xml
rename to tests/robotests/assets/exempt_slice_controller_not_in_xml
diff --git a/tests/robotests/res/values-mcc998/config.xml b/tests/robotests/res/values-mcc998/config.xml
index f9b9137..6572b14 100644
--- a/tests/robotests/res/values-mcc998/config.xml
+++ b/tests/robotests/res/values-mcc998/config.xml
@@ -15,6 +15,6 @@
   -->
 
 <resources>
-    <!-- List of packages that should be whitelisted for slice uri access. Do not translate -->
-    <string-array name="slice_whitelist_package_names" translatable="false"/>
+    <!-- List of packages that should be allowlisted for slice uri access. Do not translate -->
+    <string-array name="slice_allowlist_package_names" translatable="false"/>
 </resources>
diff --git a/tests/robotests/res/values-mcc999/config.xml b/tests/robotests/res/values-mcc999/config.xml
index ff17891..b1d4be9 100644
--- a/tests/robotests/res/values-mcc999/config.xml
+++ b/tests/robotests/res/values-mcc999/config.xml
@@ -81,9 +81,9 @@
         <item>fake_package/fake_service</item>
     </string-array>
 
-    <!-- List of packages that should be whitelisted for slice uri access. Do not translate -->
-    <string-array name="slice_whitelist_package_names" translatable="false">
-        <item>com.android.settings.slice_whitelist_package</item>
+    <!-- List of packages that should be allowlisted for slice uri access. Do not translate -->
+    <string-array name="slice_allowlist_package_names" translatable="false">
+        <item>com.android.settings.slice_allowlist_package</item>
     </string-array>
 
     <!-- Email address for the homepage contextual cards feedback -->
diff --git a/tests/robotests/src/com/android/settings/MasterClearConfirmTest.java b/tests/robotests/src/com/android/settings/MainClearConfirmTest.java
similarity index 66%
rename from tests/robotests/src/com/android/settings/MasterClearConfirmTest.java
rename to tests/robotests/src/com/android/settings/MainClearConfirmTest.java
index f2000e5..c302250 100644
--- a/tests/robotests/src/com/android/settings/MasterClearConfirmTest.java
+++ b/tests/robotests/src/com/android/settings/MainClearConfirmTest.java
@@ -42,7 +42,7 @@
 import java.util.ArrayList;
 
 @RunWith(RobolectricTestRunner.class)
-public class MasterClearConfirmTest {
+public class MainClearConfirmTest {
 
     private FragmentActivity mActivity;
 
@@ -55,85 +55,85 @@
     @Mock
     private PersistentDataBlockManager mPersistentDataBlockManager;
 
-    private MasterClearConfirm mMasterClearConfirm;
+    private MainClearConfirm mMainClearConfirm;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mActivity = Robolectric.setupActivity(FragmentActivity.class);
-        mMasterClearConfirm = spy(new MasterClearConfirm());
+        mMainClearConfirm = spy(new MainClearConfirm());
     }
 
     @Test
     public void setSubtitle_eraseEsim() {
-        MasterClearConfirm masterClearConfirm = new MasterClearConfirm();
-        masterClearConfirm.mEraseEsims = true;
-        masterClearConfirm.mContentView =
-                LayoutInflater.from(mActivity).inflate(R.layout.master_clear_confirm, null);
+        MainClearConfirm mainClearConfirm = new MainClearConfirm();
+        mainClearConfirm.mEraseEsims = true;
+        mainClearConfirm.mContentView =
+                LayoutInflater.from(mActivity).inflate(R.layout.main_clear_confirm, null);
 
-        masterClearConfirm.setSubtitle();
+        mainClearConfirm.setSubtitle();
 
-        assertThat(((TextView) masterClearConfirm.mContentView
+        assertThat(((TextView) mainClearConfirm.mContentView
                 .findViewById(R.id.sud_layout_description)).getText())
-                .isEqualTo(mActivity.getString(R.string.master_clear_final_desc_esim));
+                .isEqualTo(mActivity.getString(R.string.main_clear_final_desc_esim));
     }
 
     @Test
     public void setSubtitle_notEraseEsim() {
-        MasterClearConfirm masterClearConfirm = new MasterClearConfirm();
-        masterClearConfirm.mEraseEsims = false;
-        masterClearConfirm.mContentView =
-                LayoutInflater.from(mActivity).inflate(R.layout.master_clear_confirm, null);
+        MainClearConfirm mainClearConfirm = new MainClearConfirm();
+        mainClearConfirm.mEraseEsims = false;
+        mainClearConfirm.mContentView =
+                LayoutInflater.from(mActivity).inflate(R.layout.main_clear_confirm, null);
 
-        masterClearConfirm.setSubtitle();
+        mainClearConfirm.setSubtitle();
 
-        assertThat(((TextView) masterClearConfirm.mContentView
+        assertThat(((TextView) mainClearConfirm.mContentView
                 .findViewById(R.id.sud_layout_description)).getText())
-                .isEqualTo(mActivity.getString(R.string.master_clear_final_desc));
+                .isEqualTo(mActivity.getString(R.string.main_clear_final_desc));
     }
 
     @Test
     public void shouldWipePersistentDataBlock_noPersistentDataBlockManager_shouldReturnFalse() {
-        assertThat(mMasterClearConfirm.shouldWipePersistentDataBlock(null)).isFalse();
+        assertThat(mMainClearConfirm.shouldWipePersistentDataBlock(null)).isFalse();
     }
 
     @Test
     public void shouldWipePersistentDataBlock_deviceIsStillBeingProvisioned_shouldReturnFalse() {
-        doReturn(true).when(mMasterClearConfirm).isDeviceStillBeingProvisioned();
+        doReturn(true).when(mMainClearConfirm).isDeviceStillBeingProvisioned();
 
-        assertThat(mMasterClearConfirm.shouldWipePersistentDataBlock(
+        assertThat(mMainClearConfirm.shouldWipePersistentDataBlock(
                 mPersistentDataBlockManager)).isFalse();
     }
 
     @Test
     public void shouldWipePersistentDataBlock_oemUnlockAllowed_shouldReturnFalse() {
-        doReturn(false).when(mMasterClearConfirm).isDeviceStillBeingProvisioned();
-        doReturn(true).when(mMasterClearConfirm).isOemUnlockedAllowed();
+        doReturn(false).when(mMainClearConfirm).isDeviceStillBeingProvisioned();
+        doReturn(true).when(mMainClearConfirm).isOemUnlockedAllowed();
 
-        assertThat(mMasterClearConfirm.shouldWipePersistentDataBlock(
+        assertThat(mMainClearConfirm.shouldWipePersistentDataBlock(
                 mPersistentDataBlockManager)).isFalse();
     }
 
     @Test
     public void shouldWipePersistentDataBlock_frpPolicyNotSupported_shouldReturnFalse() {
-        when(mMasterClearConfirm.getActivity()).thenReturn(mMockActivity);
+        when(mMainClearConfirm.getActivity()).thenReturn(mMockActivity);
 
-        doReturn(false).when(mMasterClearConfirm).isDeviceStillBeingProvisioned();
-        doReturn(false).when(mMasterClearConfirm).isOemUnlockedAllowed();
+        doReturn(false).when(mMainClearConfirm).isDeviceStillBeingProvisioned();
+        doReturn(false).when(mMainClearConfirm).isOemUnlockedAllowed();
         when(mMockActivity.getSystemService(Context.DEVICE_POLICY_SERVICE))
                 .thenReturn(mDevicePolicyManager);
         when(mDevicePolicyManager.isFactoryResetProtectionPolicySupported()).thenReturn(false);
 
-        assertThat(mMasterClearConfirm.shouldWipePersistentDataBlock(
+        assertThat(mMainClearConfirm.shouldWipePersistentDataBlock(
                 mPersistentDataBlockManager)).isFalse();
     }
 
     @Test
     public void shouldWipePersistentDataBlock_hasFactoryResetProtectionPolicy_shouldReturnFalse() {
-        when(mMasterClearConfirm.getActivity()).thenReturn(mMockActivity);
+        when(mMainClearConfirm.getActivity()).thenReturn(mMockActivity);
 
-        doReturn(false).when(mMasterClearConfirm).isDeviceStillBeingProvisioned();
-        doReturn(false).when(mMasterClearConfirm).isOemUnlockedAllowed();
+        doReturn(false).when(mMainClearConfirm).isDeviceStillBeingProvisioned();
+        doReturn(false).when(mMainClearConfirm).isOemUnlockedAllowed();
         ArrayList<String> accounts = new ArrayList<>();
         accounts.add("test");
         FactoryResetProtectionPolicy frp = new FactoryResetProtectionPolicy.Builder()
@@ -146,16 +146,16 @@
         when(mDevicePolicyManager.getFactoryResetProtectionPolicy(null)).thenReturn(frp);
         when(mDevicePolicyManager.isOrganizationOwnedDeviceWithManagedProfile()).thenReturn(true);
 
-        assertThat(mMasterClearConfirm.shouldWipePersistentDataBlock(
+        assertThat(mMainClearConfirm.shouldWipePersistentDataBlock(
                 mPersistentDataBlockManager)).isFalse();
     }
 
     @Test
     public void shouldWipePersistentDataBlock_isNotOrganizationOwnedDevice_shouldReturnTrue() {
-        when(mMasterClearConfirm.getActivity()).thenReturn(mMockActivity);
+        when(mMainClearConfirm.getActivity()).thenReturn(mMockActivity);
 
-        doReturn(false).when(mMasterClearConfirm).isDeviceStillBeingProvisioned();
-        doReturn(false).when(mMasterClearConfirm).isOemUnlockedAllowed();
+        doReturn(false).when(mMainClearConfirm).isDeviceStillBeingProvisioned();
+        doReturn(false).when(mMainClearConfirm).isOemUnlockedAllowed();
 
         when(mMockActivity.getSystemService(Context.DEVICE_POLICY_SERVICE))
                 .thenReturn(mDevicePolicyManager);
@@ -163,7 +163,7 @@
         when(mDevicePolicyManager.getFactoryResetProtectionPolicy(null)).thenReturn(null);
         when(mDevicePolicyManager.isOrganizationOwnedDeviceWithManagedProfile()).thenReturn(false);
 
-        assertThat(mMasterClearConfirm.shouldWipePersistentDataBlock(
+        assertThat(mMainClearConfirm.shouldWipePersistentDataBlock(
                 mPersistentDataBlockManager)).isTrue();
     }
 }
diff --git a/tests/robotests/src/com/android/settings/MasterClearTest.java b/tests/robotests/src/com/android/settings/MainClearTest.java
similarity index 63%
rename from tests/robotests/src/com/android/settings/MasterClearTest.java
rename to tests/robotests/src/com/android/settings/MainClearTest.java
index 03d42a9..5a88198 100644
--- a/tests/robotests/src/com/android/settings/MasterClearTest.java
+++ b/tests/robotests/src/com/android/settings/MainClearTest.java
@@ -11,7 +11,7 @@
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
- * limitations under the License
+ * limitations under the License.
  */
 
 package com.android.settings;
@@ -69,7 +69,7 @@
 
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = ShadowUtils.class)
-public class MasterClearTest {
+public class MainClearTest {
 
     private static final String TEST_ACCOUNT_TYPE = "android.test.account.type";
     private static final String TEST_CONFIRMATION_PACKAGE = "android.test.conf.pkg";
@@ -93,7 +93,7 @@
     @Mock
     private Intent mMockIntent;
 
-    private MasterClear mMasterClear;
+    private MainClear mMainClear;
     private ShadowActivity mShadowActivity;
     private FragmentActivity mActivity;
     private ShadowUserManager mShadowUserManager;
@@ -102,13 +102,13 @@
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        mMasterClear = spy(new MasterClear());
+        mMainClear = spy(new MainClear());
         mActivity = Robolectric.setupActivity(FragmentActivity.class);
         mShadowActivity = Shadows.shadowOf(mActivity);
         UserManager userManager = mActivity.getSystemService(UserManager.class);
         mShadowUserManager = Shadows.shadowOf(userManager);
         mShadowUserManager.setIsAdminUser(true);
-        mContentView = LayoutInflater.from(mActivity).inflate(R.layout.master_clear, null);
+        mContentView = LayoutInflater.from(mActivity).inflate(R.layout.main_clear, null);
 
         // Make scrollView only have one child
         when(mScrollView.getChildAt(0)).thenReturn(mLinearLayout);
@@ -123,78 +123,78 @@
     @Test
     public void testShowFinalConfirmation_eraseEsimVisible_eraseEsimChecked() {
         final Context context = mock(Context.class);
-        when(mMasterClear.getContext()).thenReturn(context);
+        when(mMainClear.getContext()).thenReturn(context);
 
-        mMasterClear.mEsimStorage = mContentView.findViewById(R.id.erase_esim);
-        mMasterClear.mExternalStorage = mContentView.findViewById(R.id.erase_external);
-        mMasterClear.mEsimStorageContainer = mContentView.findViewById(R.id.erase_esim_container);
-        mMasterClear.mEsimStorageContainer.setVisibility(View.VISIBLE);
-        mMasterClear.mEsimStorage.setChecked(true);
-        mMasterClear.showFinalConfirmation();
+        mMainClear.mEsimStorage = mContentView.findViewById(R.id.erase_esim);
+        mMainClear.mExternalStorage = mContentView.findViewById(R.id.erase_external);
+        mMainClear.mEsimStorageContainer = mContentView.findViewById(R.id.erase_esim_container);
+        mMainClear.mEsimStorageContainer.setVisibility(View.VISIBLE);
+        mMainClear.mEsimStorage.setChecked(true);
+        mMainClear.showFinalConfirmation();
 
         final ArgumentCaptor<Intent> intent = ArgumentCaptor.forClass(Intent.class);
 
         verify(context).startActivity(intent.capture());
         assertThat(intent.getValue().getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS)
-                .getBoolean(MasterClear.ERASE_ESIMS_EXTRA, false))
+                .getBoolean(MainClear.ERASE_ESIMS_EXTRA, false))
                 .isTrue();
     }
 
     @Test
     public void testShowFinalConfirmation_eraseEsimVisible_eraseEsimUnchecked() {
         final Context context = mock(Context.class);
-        when(mMasterClear.getContext()).thenReturn(context);
+        when(mMainClear.getContext()).thenReturn(context);
 
-        mMasterClear.mEsimStorage = mContentView.findViewById(R.id.erase_esim);
-        mMasterClear.mExternalStorage = mContentView.findViewById(R.id.erase_external);
-        mMasterClear.mEsimStorageContainer = mContentView.findViewById(R.id.erase_esim_container);
-        mMasterClear.mEsimStorageContainer.setVisibility(View.VISIBLE);
-        mMasterClear.mEsimStorage.setChecked(false);
-        mMasterClear.showFinalConfirmation();
+        mMainClear.mEsimStorage = mContentView.findViewById(R.id.erase_esim);
+        mMainClear.mExternalStorage = mContentView.findViewById(R.id.erase_external);
+        mMainClear.mEsimStorageContainer = mContentView.findViewById(R.id.erase_esim_container);
+        mMainClear.mEsimStorageContainer.setVisibility(View.VISIBLE);
+        mMainClear.mEsimStorage.setChecked(false);
+        mMainClear.showFinalConfirmation();
         final ArgumentCaptor<Intent> intent = ArgumentCaptor.forClass(Intent.class);
 
         verify(context).startActivity(intent.capture());
         assertThat(intent.getValue().getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS)
-                .getBoolean(MasterClear.ERASE_ESIMS_EXTRA, false))
+                .getBoolean(MainClear.ERASE_ESIMS_EXTRA, false))
                 .isFalse();
     }
 
     @Test
     public void testShowFinalConfirmation_eraseEsimGone_eraseEsimChecked() {
         final Context context = mock(Context.class);
-        when(mMasterClear.getContext()).thenReturn(context);
+        when(mMainClear.getContext()).thenReturn(context);
 
-        mMasterClear.mEsimStorage = mContentView.findViewById(R.id.erase_esim);
-        mMasterClear.mExternalStorage = mContentView.findViewById(R.id.erase_external);
-        mMasterClear.mEsimStorageContainer = mContentView.findViewById(R.id.erase_esim_container);
-        mMasterClear.mEsimStorageContainer.setVisibility(View.GONE);
-        mMasterClear.mEsimStorage.setChecked(true);
-        mMasterClear.showFinalConfirmation();
+        mMainClear.mEsimStorage = mContentView.findViewById(R.id.erase_esim);
+        mMainClear.mExternalStorage = mContentView.findViewById(R.id.erase_external);
+        mMainClear.mEsimStorageContainer = mContentView.findViewById(R.id.erase_esim_container);
+        mMainClear.mEsimStorageContainer.setVisibility(View.GONE);
+        mMainClear.mEsimStorage.setChecked(true);
+        mMainClear.showFinalConfirmation();
 
         final ArgumentCaptor<Intent> intent = ArgumentCaptor.forClass(Intent.class);
 
         verify(context).startActivity(intent.capture());
         assertThat(intent.getValue().getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS)
-            .getBoolean(MasterClear.ERASE_ESIMS_EXTRA, false))
+            .getBoolean(MainClear.ERASE_ESIMS_EXTRA, false))
             .isTrue();
     }
 
     @Test
     public void testShowFinalConfirmation_eraseEsimGone_eraseEsimUnchecked() {
         final Context context = mock(Context.class);
-        when(mMasterClear.getContext()).thenReturn(context);
+        when(mMainClear.getContext()).thenReturn(context);
 
-        mMasterClear.mEsimStorage = mContentView.findViewById(R.id.erase_esim);
-        mMasterClear.mExternalStorage = mContentView.findViewById(R.id.erase_external);
-        mMasterClear.mEsimStorageContainer = mContentView.findViewById(R.id.erase_esim_container);
-        mMasterClear.mEsimStorageContainer.setVisibility(View.GONE);
-        mMasterClear.mEsimStorage.setChecked(false);
-        mMasterClear.showFinalConfirmation();
+        mMainClear.mEsimStorage = mContentView.findViewById(R.id.erase_esim);
+        mMainClear.mExternalStorage = mContentView.findViewById(R.id.erase_external);
+        mMainClear.mEsimStorageContainer = mContentView.findViewById(R.id.erase_esim_container);
+        mMainClear.mEsimStorageContainer.setVisibility(View.GONE);
+        mMainClear.mEsimStorage.setChecked(false);
+        mMainClear.showFinalConfirmation();
         final ArgumentCaptor<Intent> intent = ArgumentCaptor.forClass(Intent.class);
 
         verify(context).startActivity(intent.capture());
         assertThat(intent.getValue().getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS)
-            .getBoolean(MasterClear.ERASE_ESIMS_EXTRA, false))
+            .getBoolean(MainClear.ERASE_ESIMS_EXTRA, false))
             .isFalse();
     }
 
@@ -204,7 +204,7 @@
                 false /* isEuiccEnabled */,
                 true /* isEuiccProvisioned */,
                 false /* isDeveloper */);
-        assertThat(mMasterClear.showWipeEuicc()).isFalse();
+        assertThat(mMainClear.showWipeEuicc()).isFalse();
     }
 
     @Test
@@ -213,7 +213,7 @@
                 true /* isEuiccEnabled */,
                 false /* isEuiccProvisioned */,
                 false /* isDeveloper */);
-        assertThat(mMasterClear.showWipeEuicc()).isFalse();
+        assertThat(mMainClear.showWipeEuicc()).isFalse();
     }
 
     @Test
@@ -222,7 +222,7 @@
                 true /* isEuiccEnabled */,
                 true /* isEuiccProvisioned */,
                 false /* isDeveloper */);
-        assertThat(mMasterClear.showWipeEuicc()).isTrue();
+        assertThat(mMainClear.showWipeEuicc()).isTrue();
     }
 
     @Test
@@ -231,7 +231,7 @@
                 true /* isEuiccEnabled */,
                 false /* isEuiccProvisioned */,
                 true /* isDeveloper */);
-        assertThat(mMasterClear.showWipeEuicc()).isTrue();
+        assertThat(mMainClear.showWipeEuicc()).isTrue();
     }
 
     @Test
@@ -243,32 +243,32 @@
     public void testHasReachedBottom_NotScrollDown_returnFalse() {
         initScrollView(100, 0, 200);
 
-        assertThat(mMasterClear.hasReachedBottom(mScrollView)).isFalse();
+        assertThat(mMainClear.hasReachedBottom(mScrollView)).isFalse();
     }
 
     @Test
     public void testHasReachedBottom_CanNotScroll_returnTrue() {
         initScrollView(100, 0, 80);
 
-        assertThat(mMasterClear.hasReachedBottom(mScrollView)).isTrue();
+        assertThat(mMainClear.hasReachedBottom(mScrollView)).isTrue();
     }
 
     @Test
     public void testHasReachedBottom_ScrollToBottom_returnTrue() {
         initScrollView(100, 100, 200);
 
-        assertThat(mMasterClear.hasReachedBottom(mScrollView)).isTrue();
+        assertThat(mMainClear.hasReachedBottom(mScrollView)).isTrue();
     }
 
     @Test
-    public void testInitiateMasterClear_inDemoMode_sendsIntent() {
+    public void testInitiateMainClear_inDemoMode_sendsIntent() {
         ShadowUtils.setIsDemoUser(true);
 
         final ComponentName componentName =
                 ComponentName.unflattenFromString("com.android.retaildemo/.DeviceAdminReceiver");
         ShadowUtils.setDeviceOwnerComponent(componentName);
 
-        mMasterClear.mInitiateListener.onClick(mContentView);
+        mMainClear.mInitiateListener.onClick(mContentView);
         final Intent intent = mShadowActivity.getNextStartedActivity();
         assertThat(Intent.ACTION_FACTORY_RESET).isEqualTo(intent.getAction());
         assertThat(componentName).isNotNull();
@@ -278,87 +278,87 @@
     @Test
     public void testOnActivityResultInternal_invalideRequest() {
         int invalidRequestCode = -1;
-        doReturn(false).when(mMasterClear).isValidRequestCode(eq(invalidRequestCode));
+        doReturn(false).when(mMainClear).isValidRequestCode(eq(invalidRequestCode));
 
-        mMasterClear.onActivityResultInternal(invalidRequestCode, Activity.RESULT_OK, null);
+        mMainClear.onActivityResultInternal(invalidRequestCode, Activity.RESULT_OK, null);
 
-        verify(mMasterClear, times(1)).isValidRequestCode(eq(invalidRequestCode));
-        verify(mMasterClear, times(0)).establishInitialState();
-        verify(mMasterClear, times(0)).getAccountConfirmationIntent();
-        verify(mMasterClear, times(0)).showFinalConfirmation();
+        verify(mMainClear, times(1)).isValidRequestCode(eq(invalidRequestCode));
+        verify(mMainClear, times(0)).establishInitialState();
+        verify(mMainClear, times(0)).getAccountConfirmationIntent();
+        verify(mMainClear, times(0)).showFinalConfirmation();
     }
 
     @Test
     public void testOnActivityResultInternal_resultCanceled() {
-        doReturn(true).when(mMasterClear).isValidRequestCode(eq(MasterClear.KEYGUARD_REQUEST));
-        doNothing().when(mMasterClear).establishInitialState();
+        doReturn(true).when(mMainClear).isValidRequestCode(eq(MainClear.KEYGUARD_REQUEST));
+        doNothing().when(mMainClear).establishInitialState();
 
-        mMasterClear
-                .onActivityResultInternal(MasterClear.KEYGUARD_REQUEST, Activity.RESULT_CANCELED,
+        mMainClear
+                .onActivityResultInternal(MainClear.KEYGUARD_REQUEST, Activity.RESULT_CANCELED,
                         null);
 
-        verify(mMasterClear, times(1)).isValidRequestCode(eq(MasterClear.KEYGUARD_REQUEST));
-        verify(mMasterClear, times(1)).establishInitialState();
-        verify(mMasterClear, times(0)).getAccountConfirmationIntent();
-        verify(mMasterClear, times(0)).showFinalConfirmation();
+        verify(mMainClear, times(1)).isValidRequestCode(eq(MainClear.KEYGUARD_REQUEST));
+        verify(mMainClear, times(1)).establishInitialState();
+        verify(mMainClear, times(0)).getAccountConfirmationIntent();
+        verify(mMainClear, times(0)).showFinalConfirmation();
     }
 
     @Test
     public void testOnActivityResultInternal_keyguardRequestTriggeringConfirmAccount() {
-        doReturn(true).when(mMasterClear).isValidRequestCode(eq(MasterClear.KEYGUARD_REQUEST));
-        doReturn(mMockIntent).when(mMasterClear).getAccountConfirmationIntent();
-        doNothing().when(mMasterClear).showAccountCredentialConfirmation(eq(mMockIntent));
+        doReturn(true).when(mMainClear).isValidRequestCode(eq(MainClear.KEYGUARD_REQUEST));
+        doReturn(mMockIntent).when(mMainClear).getAccountConfirmationIntent();
+        doNothing().when(mMainClear).showAccountCredentialConfirmation(eq(mMockIntent));
 
-        mMasterClear
-                .onActivityResultInternal(MasterClear.KEYGUARD_REQUEST, Activity.RESULT_OK, null);
+        mMainClear
+                .onActivityResultInternal(MainClear.KEYGUARD_REQUEST, Activity.RESULT_OK, null);
 
-        verify(mMasterClear, times(1)).isValidRequestCode(eq(MasterClear.KEYGUARD_REQUEST));
-        verify(mMasterClear, times(0)).establishInitialState();
-        verify(mMasterClear, times(1)).getAccountConfirmationIntent();
-        verify(mMasterClear, times(1)).showAccountCredentialConfirmation(eq(mMockIntent));
+        verify(mMainClear, times(1)).isValidRequestCode(eq(MainClear.KEYGUARD_REQUEST));
+        verify(mMainClear, times(0)).establishInitialState();
+        verify(mMainClear, times(1)).getAccountConfirmationIntent();
+        verify(mMainClear, times(1)).showAccountCredentialConfirmation(eq(mMockIntent));
     }
 
     @Test
     public void testOnActivityResultInternal_keyguardRequestTriggeringShowFinal() {
-        doReturn(true).when(mMasterClear).isValidRequestCode(eq(MasterClear.KEYGUARD_REQUEST));
-        doReturn(null).when(mMasterClear).getAccountConfirmationIntent();
-        doNothing().when(mMasterClear).showFinalConfirmation();
+        doReturn(true).when(mMainClear).isValidRequestCode(eq(MainClear.KEYGUARD_REQUEST));
+        doReturn(null).when(mMainClear).getAccountConfirmationIntent();
+        doNothing().when(mMainClear).showFinalConfirmation();
 
-        mMasterClear
-                .onActivityResultInternal(MasterClear.KEYGUARD_REQUEST, Activity.RESULT_OK, null);
+        mMainClear
+                .onActivityResultInternal(MainClear.KEYGUARD_REQUEST, Activity.RESULT_OK, null);
 
-        verify(mMasterClear, times(1)).isValidRequestCode(eq(MasterClear.KEYGUARD_REQUEST));
-        verify(mMasterClear, times(0)).establishInitialState();
-        verify(mMasterClear, times(1)).getAccountConfirmationIntent();
-        verify(mMasterClear, times(1)).showFinalConfirmation();
+        verify(mMainClear, times(1)).isValidRequestCode(eq(MainClear.KEYGUARD_REQUEST));
+        verify(mMainClear, times(0)).establishInitialState();
+        verify(mMainClear, times(1)).getAccountConfirmationIntent();
+        verify(mMainClear, times(1)).showFinalConfirmation();
     }
 
     @Test
     public void testOnActivityResultInternal_confirmRequestTriggeringShowFinal() {
-        doReturn(true).when(mMasterClear)
-                .isValidRequestCode(eq(MasterClear.CREDENTIAL_CONFIRM_REQUEST));
-        doNothing().when(mMasterClear).showFinalConfirmation();
+        doReturn(true).when(mMainClear)
+                .isValidRequestCode(eq(MainClear.CREDENTIAL_CONFIRM_REQUEST));
+        doNothing().when(mMainClear).showFinalConfirmation();
 
-        mMasterClear.onActivityResultInternal(
-                MasterClear.CREDENTIAL_CONFIRM_REQUEST, Activity.RESULT_OK, null);
+        mMainClear.onActivityResultInternal(
+                MainClear.CREDENTIAL_CONFIRM_REQUEST, Activity.RESULT_OK, null);
 
-        verify(mMasterClear, times(1))
-                .isValidRequestCode(eq(MasterClear.CREDENTIAL_CONFIRM_REQUEST));
-        verify(mMasterClear, times(0)).establishInitialState();
-        verify(mMasterClear, times(0)).getAccountConfirmationIntent();
-        verify(mMasterClear, times(1)).showFinalConfirmation();
+        verify(mMainClear, times(1))
+                .isValidRequestCode(eq(MainClear.CREDENTIAL_CONFIRM_REQUEST));
+        verify(mMainClear, times(0)).establishInitialState();
+        verify(mMainClear, times(0)).getAccountConfirmationIntent();
+        verify(mMainClear, times(1)).showFinalConfirmation();
     }
 
     @Test
     public void testGetAccountConfirmationIntent_unsupported() {
-        when(mMasterClear.getActivity()).thenReturn(mActivity);
+        when(mMainClear.getActivity()).thenReturn(mActivity);
         /* Using the default resources, account confirmation shouldn't trigger */
-        assertThat(mMasterClear.getAccountConfirmationIntent()).isNull();
+        assertThat(mMainClear.getAccountConfirmationIntent()).isNull();
     }
 
     @Test
     public void testGetAccountConfirmationIntent_no_relevant_accounts() {
-        when(mMasterClear.getActivity()).thenReturn(mMockActivity);
+        when(mMainClear.getActivity()).thenReturn(mMockActivity);
         when(mMockActivity.getString(R.string.account_type)).thenReturn(TEST_ACCOUNT_TYPE);
         when(mMockActivity.getString(R.string.account_confirmation_package))
                 .thenReturn(TEST_CONFIRMATION_PACKAGE);
@@ -368,12 +368,12 @@
         Account[] accounts = new Account[0];
         when(mMockActivity.getSystemService(Context.ACCOUNT_SERVICE)).thenReturn(mAccountManager);
         when(mAccountManager.getAccountsByType(TEST_ACCOUNT_TYPE)).thenReturn(accounts);
-        assertThat(mMasterClear.getAccountConfirmationIntent()).isNull();
+        assertThat(mMainClear.getAccountConfirmationIntent()).isNull();
     }
 
     @Test
     public void testGetAccountConfirmationIntent_unresolved() {
-        when(mMasterClear.getActivity()).thenReturn(mMockActivity);
+        when(mMainClear.getActivity()).thenReturn(mMockActivity);
         when(mMockActivity.getString(R.string.account_type)).thenReturn(TEST_ACCOUNT_TYPE);
         when(mMockActivity.getString(R.string.account_confirmation_package))
                 .thenReturn(TEST_CONFIRMATION_PACKAGE);
@@ -385,12 +385,12 @@
         // The package manager should not resolve the confirmation intent targeting the non-existent
         // confirmation package.
         when(mMockActivity.getPackageManager()).thenReturn(mPackageManager);
-        assertThat(mMasterClear.getAccountConfirmationIntent()).isNull();
+        assertThat(mMainClear.getAccountConfirmationIntent()).isNull();
     }
 
     @Test
     public void testTryShowAccountConfirmation_ok() {
-        when(mMasterClear.getActivity()).thenReturn(mMockActivity);
+        when(mMainClear.getActivity()).thenReturn(mMockActivity);
         // Only try to show account confirmation if the appropriate resource overlays are available.
         when(mMockActivity.getString(R.string.account_type)).thenReturn(TEST_ACCOUNT_TYPE);
         when(mMockActivity.getString(R.string.account_confirmation_package))
@@ -411,7 +411,7 @@
         resolveInfo.activityInfo = activityInfo;
         when(mPackageManager.resolveActivity(any(), eq(0))).thenReturn(resolveInfo);
 
-        Intent actualIntent = mMasterClear.getAccountConfirmationIntent();
+        Intent actualIntent = mMainClear.getAccountConfirmationIntent();
         assertThat(TEST_CONFIRMATION_PACKAGE).isEqualTo(
                 actualIntent.getComponent().getPackageName());
         assertThat(TEST_CONFIRMATION_CLASS).isEqualTo(actualIntent.getComponent().getClassName());
@@ -420,40 +420,40 @@
     @Test
     public void testShowAccountCredentialConfirmation() {
         // Finally mock out the startActivityForResultCall
-        doNothing().when(mMasterClear)
+        doNothing().when(mMainClear)
                 .startActivityForResult(eq(mMockIntent),
-                        eq(MasterClear.CREDENTIAL_CONFIRM_REQUEST));
-        mMasterClear.showAccountCredentialConfirmation(mMockIntent);
-        verify(mMasterClear, times(1))
+                        eq(MainClear.CREDENTIAL_CONFIRM_REQUEST));
+        mMainClear.showAccountCredentialConfirmation(mMockIntent);
+        verify(mMainClear, times(1))
                 .startActivityForResult(eq(mMockIntent),
-                        eq(MasterClear.CREDENTIAL_CONFIRM_REQUEST));
+                        eq(MainClear.CREDENTIAL_CONFIRM_REQUEST));
     }
 
     @Test
     public void testIsValidRequestCode() {
-        assertThat(mMasterClear.isValidRequestCode(MasterClear.KEYGUARD_REQUEST)).isTrue();
-        assertThat(mMasterClear.isValidRequestCode(MasterClear.CREDENTIAL_CONFIRM_REQUEST))
+        assertThat(mMainClear.isValidRequestCode(MainClear.KEYGUARD_REQUEST)).isTrue();
+        assertThat(mMainClear.isValidRequestCode(MainClear.CREDENTIAL_CONFIRM_REQUEST))
                 .isTrue();
-        assertThat(mMasterClear.isValidRequestCode(0)).isFalse();
+        assertThat(mMainClear.isValidRequestCode(0)).isFalse();
     }
 
     @Test
     public void testOnGlobalLayout_shouldNotRemoveListener() {
         final ViewTreeObserver viewTreeObserver = mock(ViewTreeObserver.class);
-        mMasterClear.mScrollView = mScrollView;
-        doNothing().when(mMasterClear).onGlobalLayout();
-        doReturn(true).when(mMasterClear).hasReachedBottom(any());
+        mMainClear.mScrollView = mScrollView;
+        doNothing().when(mMainClear).onGlobalLayout();
+        doReturn(true).when(mMainClear).hasReachedBottom(any());
         when(mScrollView.getViewTreeObserver()).thenReturn(viewTreeObserver);
 
-        mMasterClear.onGlobalLayout();
+        mMainClear.onGlobalLayout();
 
-        verify(viewTreeObserver, never()).removeOnGlobalLayoutListener(mMasterClear);
+        verify(viewTreeObserver, never()).removeOnGlobalLayoutListener(mMainClear);
     }
 
     private void prepareEuiccState(
             boolean isEuiccEnabled, boolean isEuiccProvisioned, boolean isDeveloper) {
-        doReturn(mActivity).when(mMasterClear).getContext();
-        doReturn(isEuiccEnabled).when(mMasterClear).isEuiccEnabled(any());
+        doReturn(mActivity).when(mMainClear).getContext();
+        doReturn(isEuiccEnabled).when(mMainClear).isEuiccEnabled(any());
         ContentResolver cr = mActivity.getContentResolver();
         Settings.Global.putInt(cr, Settings.Global.EUICC_PROVISIONED, isEuiccProvisioned ? 1 : 0);
         DevelopmentSettingsEnabler.setDevelopmentSettingsEnabled(mActivity, isDeveloper);
diff --git a/tests/robotests/src/com/android/settings/ResetNetworkTest.java b/tests/robotests/src/com/android/settings/ResetNetworkTest.java
index 3b1d73b..d703279 100644
--- a/tests/robotests/src/com/android/settings/ResetNetworkTest.java
+++ b/tests/robotests/src/com/android/settings/ResetNetworkTest.java
@@ -18,10 +18,9 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.robolectric.Shadows.shadowOf;
-
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
+import static org.robolectric.Shadows.shadowOf;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -57,7 +56,7 @@
 
         Intent intent = shadowOf(mActivity).getNextStartedActivity();
         assertThat(intent.getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS)
-                .getBoolean(MasterClear.ERASE_ESIMS_EXTRA, false)).isTrue();
+                .getBoolean(MainClear.ERASE_ESIMS_EXTRA, false)).isTrue();
     }
 
     @Test
@@ -69,7 +68,7 @@
 
         Intent intent = shadowOf(mActivity).getNextStartedActivity();
         assertThat(intent.getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS)
-                .getBoolean(MasterClear.ERASE_ESIMS_EXTRA, false)).isFalse();
+                .getBoolean(MainClear.ERASE_ESIMS_EXTRA, false)).isFalse();
     }
 
     @Test
@@ -81,7 +80,7 @@
 
         Intent intent = shadowOf(mActivity).getNextStartedActivity();
         assertThat(intent.getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS)
-                .getBoolean(MasterClear.ERASE_ESIMS_EXTRA, false)).isFalse();
+                .getBoolean(MainClear.ERASE_ESIMS_EXTRA, false)).isFalse();
     }
 
     @Test
@@ -93,6 +92,6 @@
 
         Intent intent = shadowOf(mActivity).getNextStartedActivity();
         assertThat(intent.getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS)
-                .getBoolean(MasterClear.ERASE_ESIMS_EXTRA, false)).isFalse();
+                .getBoolean(MainClear.ERASE_ESIMS_EXTRA, false)).isFalse();
     }
 }
diff --git a/tests/robotests/src/com/android/settings/TetherSettingsTest.java b/tests/robotests/src/com/android/settings/TetherSettingsTest.java
index 3c38c51d..f46ca7a 100644
--- a/tests/robotests/src/com/android/settings/TetherSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/TetherSettingsTest.java
@@ -113,7 +113,7 @@
         FeatureFlagUtils.setEnabled(mContext, FeatureFlags.TETHER_ALL_IN_ONE, false);
         // We can ignore the condition of Utils.isMonkeyRunning()
         // In normal case, monkey and robotest should not execute at the same time
-        when(mConnectivityManager.getTetherableUsbRegexs()).thenReturn(new String[]{"dummyRegex"});
+        when(mConnectivityManager.getTetherableUsbRegexs()).thenReturn(new String[]{"fakeRegex"});
 
         final List<String> niks =
             TetherSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
@@ -135,7 +135,7 @@
     public void testTetherNonIndexableKeys_bluetoothAvailable_bluetoothKeyNotReturned() {
         FeatureFlagUtils.setEnabled(mContext, FeatureFlags.TETHER_ALL_IN_ONE, false);
         when(mConnectivityManager.getTetherableBluetoothRegexs())
-                .thenReturn(new String[]{"dummyRegex"});
+                .thenReturn(new String[]{"fakeRegex"});
 
         final List<String> niks =
             TetherSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
index bf63130..329c23d 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
@@ -60,8 +60,8 @@
 
 @RunWith(RobolectricTestRunner.class)
 public class AccessibilitySettingsTest {
-    private static final String DUMMY_PACKAGE_NAME = "com.dummy.example";
-    private static final String DUMMY_CLASS_NAME = DUMMY_PACKAGE_NAME + ".dummy_a11y_service";
+    private static final String DUMMY_PACKAGE_NAME = "com.mock.example";
+    private static final String DUMMY_CLASS_NAME = DUMMY_PACKAGE_NAME + ".mock_a11y_service";
     private static final ComponentName DUMMY_COMPONENT_NAME = new ComponentName(DUMMY_PACKAGE_NAME,
             DUMMY_CLASS_NAME);
     private static final int ON = 1;
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityUtilTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityUtilTest.java
index ac3198f..83c5bc2 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityUtilTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityUtilTest.java
@@ -44,9 +44,9 @@
     private static final int ON = 1;
     private static final int OFF = 0;
     private static final String SECURE_TEST_KEY = "secure_test_key";
-    private static final String DUMMY_PACKAGE_NAME = "com.dummy.example";
-    private static final String DUMMY_CLASS_NAME = DUMMY_PACKAGE_NAME + ".dummy_a11y_service";
-    private static final String DUMMY_CLASS_NAME2 = DUMMY_PACKAGE_NAME + ".dummy_a11y_service2";
+    private static final String DUMMY_PACKAGE_NAME = "com.mock.example";
+    private static final String DUMMY_CLASS_NAME = DUMMY_PACKAGE_NAME + ".mock_a11y_service";
+    private static final String DUMMY_CLASS_NAME2 = DUMMY_PACKAGE_NAME + ".mock_a11y_service2";
     private static final ComponentName DUMMY_COMPONENT_NAME = new ComponentName(DUMMY_PACKAGE_NAME,
             DUMMY_CLASS_NAME);
     private static final ComponentName DUMMY_COMPONENT_NAME2 = new ComponentName(DUMMY_PACKAGE_NAME,
diff --git a/tests/robotests/src/com/android/settings/accessibility/MagnificationEnablePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/MagnificationEnablePreferenceControllerTest.java
deleted file mode 100644
index a34e04a..0000000
--- a/tests/robotests/src/com/android/settings/accessibility/MagnificationEnablePreferenceControllerTest.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.accessibility;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-import android.os.UserHandle;
-import android.provider.Settings;
-
-import androidx.preference.SwitchPreference;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class MagnificationEnablePreferenceControllerTest {
-    private static final String PREF_KEY = "screen_magnification_enable";
-    private static final String KEY_ENABLE = Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE;
-    private static final int UNKNOWN = -1;
-    private Context mContext;
-    private SwitchPreference mPreference;
-    private MagnificationEnablePreferenceController mController;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-        mPreference = new SwitchPreference(mContext);
-        mController = new MagnificationEnablePreferenceController(mContext, PREF_KEY);
-    }
-
-    @Test
-    public void isChecked_enabledFullscreenMagnificationMode_shouldReturnTrue() {
-        Settings.Secure.putIntForUser(mContext.getContentResolver(),
-                KEY_ENABLE, Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN,
-                UserHandle.USER_CURRENT);
-
-        mController.updateState(mPreference);
-
-        assertThat(mController.isChecked()).isTrue();
-        assertThat(mPreference.isChecked()).isTrue();
-    }
-
-    @Test
-    public void isChecked_enabledWindowMagnificationMode_shouldReturnFalse() {
-        Settings.Secure.putIntForUser(mContext.getContentResolver(),
-                KEY_ENABLE, Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW,
-                UserHandle.USER_CURRENT);
-
-        mController.updateState(mPreference);
-
-        assertThat(mController.isChecked()).isFalse();
-        assertThat(mPreference.isChecked()).isFalse();
-    }
-
-
-    @Test
-    public void setChecked_setTrue_shouldEnableFullscreenMagnificationMode() {
-        mController.setChecked(true);
-
-        assertThat(Settings.Secure.getIntForUser(mContext.getContentResolver(),
-                KEY_ENABLE, UNKNOWN,
-                UserHandle.USER_CURRENT)).isEqualTo(
-                Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN);
-    }
-
-    @Test
-    public void setChecked_setFalse_shouldEnableWindowMagnificationMode() {
-        mController.setChecked(false);
-
-        assertThat(Settings.Secure.getIntForUser(mContext.getContentResolver(),
-                KEY_ENABLE, UNKNOWN,
-                UserHandle.USER_CURRENT)).isEqualTo(
-                Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/accessibility/MagnificationModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/MagnificationModePreferenceControllerTest.java
index 5162bc2..7461235 100644
--- a/tests/robotests/src/com/android/settings/accessibility/MagnificationModePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/MagnificationModePreferenceControllerTest.java
@@ -32,8 +32,8 @@
 @RunWith(RobolectricTestRunner.class)
 public class MagnificationModePreferenceControllerTest {
     private static final String PREF_KEY = "screen_magnification_mode";
-    // TODO(b/146019459): Use magnification_capability.
-    private static final String KEY_CAPABILITY = Settings.System.MASTER_MONO;
+    private static final String KEY_CAPABILITY =
+            Settings.Secure.ACCESSIBILITY_MAGNIFICATION_CAPABILITY;
     private static final int WINDOW_SCREEN_VALUE = 2;
     private static final int ALL_VALUE = 3;
 
diff --git a/tests/robotests/src/com/android/settings/accessibility/PaletteListPreferenceTest.java b/tests/robotests/src/com/android/settings/accessibility/PaletteListPreferenceTest.java
new file mode 100644
index 0000000..759b180
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/PaletteListPreferenceTest.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import static org.junit.Assert.assertEquals;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.preference.PreferenceViewHolder;
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.R;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+/** Tests for {@link PaletteListPreference}. */
+@RunWith(RobolectricTestRunner.class)
+public final class PaletteListPreferenceTest {
+
+    private PaletteListPreference mPaletteListPreference;
+    private PreferenceViewHolder mPreferenceViewHolder;
+    private final Context mContext = ApplicationProvider.getApplicationContext();
+
+    @Before
+    public void initObjects() {
+        mPaletteListPreference = new PaletteListPreference(mContext, null);
+
+        final LayoutInflater inflater = LayoutInflater.from(mContext);
+        final View view =
+                inflater.inflate(R.layout.daltonizer_preview, null);
+        mPreferenceViewHolder = PreferenceViewHolder.createInstanceForTests(view);
+    }
+
+    @Test
+    public void initPaletteView_success() {
+        mPaletteListPreference.onBindViewHolder(mPreferenceViewHolder);
+
+        final ViewGroup viewGroup =
+                mPreferenceViewHolder.itemView.findViewById(R.id.palette_view);
+        final int expectedCount =
+                mContext.getResources().getStringArray(R.array.setting_palette_data).length;
+        assertEquals(expectedCount, viewGroup.getChildCount());
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/PaletteListViewTest.java b/tests/robotests/src/com/android/settings/accessibility/PaletteListViewTest.java
deleted file mode 100644
index 13e76d7..0000000
--- a/tests/robotests/src/com/android/settings/accessibility/PaletteListViewTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.accessibility;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-
-import androidx.test.core.app.ApplicationProvider;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-
-/** Tests for {@link PaletteListView} */
-@RunWith(RobolectricTestRunner.class)
-public class PaletteListViewTest {
-
-    private final Context mContext = ApplicationProvider.getApplicationContext();
-    private PaletteListView mPaletteListView;
-
-    @Before
-    public void setUp() {
-        mPaletteListView = new PaletteListView(mContext);
-    }
-
-    @Test
-    public void setColors_applySameLengthArray_configureSuccessful() {
-        final String[] colorName = {"White", "Black", "Yellow"};
-        final String[] colorCode = {"#ffffff", "#000000", "#f9ab00"};
-
-        assertThat(mPaletteListView.setPaletteListColors(colorName, colorCode)).isTrue();
-    }
-
-    @Test
-    public void setColors_applyDifferentLengthArray_configureSuccessful() {
-        final String[] colorName = {"White", "Black", "Yellow", "Orange", "Red"};
-        final String[] colorCode = {"#ffffff", "#000000", "#f9ab00"};
-
-        assertThat(mPaletteListView.setPaletteListColors(colorName, colorCode)).isTrue();
-    }
-
-    @Test
-    public void setColors_configureFailed() {
-        final String[] colorName = null;
-        final String[] colorCode = null;
-
-        assertThat(mPaletteListView.setPaletteListColors(colorName, colorCode)).isFalse();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/accessibility/MasterMonoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/PrimaryMonoPreferenceControllerTest.java
similarity index 94%
rename from tests/robotests/src/com/android/settings/accessibility/MasterMonoPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/accessibility/PrimaryMonoPreferenceControllerTest.java
index ee54b88..fab1b95 100644
--- a/tests/robotests/src/com/android/settings/accessibility/MasterMonoPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/PrimaryMonoPreferenceControllerTest.java
@@ -33,7 +33,7 @@
 import org.robolectric.RuntimeEnvironment;
 
 @RunWith(RobolectricTestRunner.class)
-public class MasterMonoPreferenceControllerTest {
+public class PrimaryMonoPreferenceControllerTest {
 
     private static final int ON = 1;
     private static final int OFF = 0;
@@ -41,13 +41,13 @@
 
     private Context mContext;
     private SwitchPreference mPreference;
-    private MasterMonoPreferenceController mController;
+    private PrimaryMonoPreferenceController mController;
 
     @Before
     public void setUp() {
         mContext = RuntimeEnvironment.application;
         mPreference = new SwitchPreference(mContext);
-        mController = new MasterMonoPreferenceController(mContext, "master_mono");
+        mController = new PrimaryMonoPreferenceController(mContext, "test_key");
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java
index 10d8af7..10a4d85 100644
--- a/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java
@@ -35,8 +35,8 @@
 @RunWith(RobolectricTestRunner.class)
 public class ToggleScreenMagnificationPreferenceFragmentTest {
 
-    private static final String DUMMY_PACKAGE_NAME = "com.dummy.example";
-    private static final String DUMMY_CLASS_NAME = DUMMY_PACKAGE_NAME + ".dummy_a11y_service";
+    private static final String DUMMY_PACKAGE_NAME = "com.mock.example";
+    private static final String DUMMY_CLASS_NAME = DUMMY_PACKAGE_NAME + ".mock_a11y_service";
     private static final ComponentName DUMMY_COMPONENT_NAME = new ComponentName(DUMMY_PACKAGE_NAME,
             DUMMY_CLASS_NAME);
     private static final String SOFTWARE_SHORTCUT_KEY =
diff --git a/tests/robotests/src/com/android/settings/accounts/AvatarViewMixinTest.java b/tests/robotests/src/com/android/settings/accounts/AvatarViewMixinTest.java
index 8dbf2a8..80f21fc 100644
--- a/tests/robotests/src/com/android/settings/accounts/AvatarViewMixinTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AvatarViewMixinTest.java
@@ -62,9 +62,9 @@
 
 @RunWith(RobolectricTestRunner.class)
 public class AvatarViewMixinTest {
-    private static final String DUMMY_ACCOUNT = "test@domain.com";
-    private static final String DUMMY_DOMAIN = "domain.com";
-    private static final String DUMMY_AUTHORITY = "authority.domain.com";
+    private static final String FAKE_ACCOUNT = "test@domain.com";
+    private static final String FAKE_DOMAIN = "domain.com";
+    private static final String FAKE_AUTHORITY = "authority.domain.com";
     private static final String METHOD_GET_ACCOUNT_AVATAR = "getAccountAvatar";
 
     private Context mContext;
@@ -134,7 +134,7 @@
     @Config(qualifiers = "mcc999")
     public void onStart_noAccount_mAccountNameShouldBeNull() {
         final AvatarViewMixin avatarViewMixin = new AvatarViewMixin(mActivity, mImageView);
-        avatarViewMixin.mAccountName = DUMMY_ACCOUNT;
+        avatarViewMixin.mAccountName = FAKE_ACCOUNT;
 
         avatarViewMixin.onStart();
 
@@ -159,7 +159,7 @@
         accountProvider.applicationInfo.packageName = accountProvider.packageName;
         accountProvider.providers = new ProviderInfo[1];
         accountProvider.providers[0] = new ProviderInfo();
-        accountProvider.providers[0].authority = DUMMY_AUTHORITY;
+        accountProvider.providers[0].authority = FAKE_AUTHORITY;
         accountProvider.providers[0].packageName = accountProvider.packageName;
         accountProvider.providers[0].name = "test.class";
         accountProvider.providers[0].applicationInfo = accountProvider.applicationInfo;
@@ -168,22 +168,22 @@
         resolveInfo.providerInfo = accountProvider.providers[0];
         shadowPackageManager.addResolveInfoForIntent(AvatarViewMixin.INTENT_GET_ACCOUNT_DATA,
                 resolveInfo);
-        assertThat(avatarViewMixin.queryProviderAuthority()).isEqualTo(DUMMY_AUTHORITY);
+        assertThat(avatarViewMixin.queryProviderAuthority()).isEqualTo(FAKE_AUTHORITY);
     }
 
     @Test
-    public void callWithGetAccountAvatarMethod_useDummyData_shouldReturnAccountNameAndAvatar() {
+    public void callWithGetAccountAvatarMethod_useFakeData_shouldReturnAccountNameAndAvatar() {
         final ContentResolver contentResolver = mContext.getContentResolver();
         final Uri uri = new Uri.Builder().scheme(ContentResolver.SCHEME_CONTENT).authority(
-                DUMMY_AUTHORITY).build();
+                FAKE_AUTHORITY).build();
         final ContentProvider mockContentProvider = mock(ContentProvider.class);
 
-        ShadowContentResolver.registerProviderInternal(DUMMY_AUTHORITY, mockContentProvider);
+        ShadowContentResolver.registerProviderInternal(FAKE_AUTHORITY, mockContentProvider);
 
         final Bundle bundle = new Bundle();
         final Bitmap bitmap = Bitmap.createBitmap(100, 100, Bitmap.Config.ARGB_8888);
         bundle.putParcelable("account_avatar", bitmap);
-        bundle.putString("account_name", DUMMY_ACCOUNT);
+        bundle.putString("account_name", FAKE_ACCOUNT);
         doReturn(bundle).when(mockContentProvider).call(anyString(), anyString(),
                 any(Bundle.class));
 
@@ -191,7 +191,7 @@
 
         final Object object = bundle.getParcelable("account_avatar");
         assertThat(object instanceof Bitmap).isTrue();
-        assertThat(bundle.getString("account_name")).isEqualTo(DUMMY_ACCOUNT);
+        assertThat(bundle.getString("account_name")).isEqualTo(FAKE_ACCOUNT);
     }
 
     @Test
@@ -209,7 +209,7 @@
 
         @Implementation
         protected Account[] getAccounts(Context context) {
-            return new Account[]{new Account(DUMMY_ACCOUNT, DUMMY_DOMAIN)};
+            return new Account[]{new Account(FAKE_ACCOUNT, FAKE_DOMAIN)};
         }
     }
 }
diff --git a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
index 2bb93b5..1651cb6 100644
--- a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
@@ -329,9 +329,9 @@
 
         ReflectionHelpers.setField(mProvider, "mContext", spyContext);
 
-        final Set<String> whitelist = mProvider.getKeepEnabledPackages();
+        final Set<String> allowlist = mProvider.getKeepEnabledPackages();
 
-        assertThat(whitelist).contains("com.android.settings.intelligence");
+        assertThat(allowlist).contains("com.android.settings.intelligence");
     }
 
     @Test
@@ -351,9 +351,9 @@
 
         ReflectionHelpers.setField(mProvider, "mContext", spyContext);
 
-        final Set<String> whitelist = mProvider.getKeepEnabledPackages();
+        final Set<String> allowlist = mProvider.getKeepEnabledPackages();
 
-        assertThat(whitelist).contains("com.android.packageinstaller");
+        assertThat(allowlist).contains("com.android.packageinstaller");
     }
 
     private void setUpUsersAndInstalledApps() {
diff --git a/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java
index 00d3cb1..e0a0836 100644
--- a/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java
@@ -93,7 +93,7 @@
         entry.hasLauncherEntry = true;
         entry.info = new ApplicationInfo();
         entry.extraInfo = new AppStateDataUsageBridge.DataUsageState(
-                true /* whitelisted */, false /* blacklisted */);
+                true /* allowlisted */, false /* denylisted */);
         apps.add(entry);
         when(mSession.getAllApps()).thenReturn(apps);
 
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java
index e46cd06..95d7659 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java
@@ -297,7 +297,7 @@
         final List<UserInfo> userInfos = new ArrayList<>();
         userInfos.add(new UserInfo(userID1, "User1", UserInfo.FLAG_PRIMARY));
         userInfos.add(new UserInfo(userID2, "yue", UserInfo.FLAG_GUEST));
-        when(mUserManager.getUsers(true)).thenReturn(userInfos);
+        when(mUserManager.getAliveUsers()).thenReturn(userInfos);
         final ApplicationInfo appInfo = new ApplicationInfo();
         appInfo.flags = ApplicationInfo.FLAG_INSTALLED;
         when(mPackageManager.getApplicationInfoAsUser(
@@ -320,7 +320,7 @@
         final List<UserInfo> userInfos = new ArrayList<>();
         userInfos.add(new UserInfo(userID1, "User1", UserInfo.FLAG_PRIMARY));
         userInfos.add(new UserInfo(userID2, "yue", UserInfo.FLAG_GUEST));
-        when(mUserManager.getUsers(true)).thenReturn(userInfos);
+        when(mUserManager.getAliveUsers()).thenReturn(userInfos);
         final ApplicationInfo appInfo = new ApplicationInfo();
         appInfo.flags = ApplicationInfo.FLAG_INSTALLED;
         when(mPackageManager.getApplicationInfoAsUser(
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/ManageExternalStorageDetailsTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/ManageExternalStorageDetailsTest.java
index 88c2471..487760f 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/ManageExternalStorageDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/ManageExternalStorageDetailsTest.java
@@ -37,6 +37,7 @@
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
@@ -85,6 +86,7 @@
     }
 
     @Test
+    @Ignore
     public void onPreferenceChange_enableManageExternalStorage_shouldTriggerAppOpsManager() {
         // Inject mock package details
         final int mockUid = 23333;
@@ -119,6 +121,7 @@
     }
 
     @Test
+    @Ignore
     public void onPreferenceChange_disableManageExternalStorage_shouldTriggerAppOpsManager() {
         // Inject mock package details
         final int mockUid = 24444;
diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java
index 680cd8a..4c51ae7 100644
--- a/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java
+++ b/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java
@@ -16,42 +16,24 @@
 
 package com.android.settings.applications.manageapplications;
 
-import static com.android.settings.applications.manageapplications.AppFilterRegistry
-        .FILTER_APPS_ALL;
-import static com.android.settings.applications.manageapplications.AppFilterRegistry
-        .FILTER_APPS_INSTALL_SOURCES;
-import static com.android.settings.applications.manageapplications.AppFilterRegistry
-        .FILTER_APPS_POWER_WHITELIST;
-import static com.android.settings.applications.manageapplications.AppFilterRegistry
-        .FILTER_APPS_RECENT;
-import static com.android.settings.applications.manageapplications.AppFilterRegistry
-        .FILTER_APPS_USAGE_ACCESS;
-import static com.android.settings.applications.manageapplications.AppFilterRegistry
-        .FILTER_APPS_WITH_OVERLAY;
-import static com.android.settings.applications.manageapplications.AppFilterRegistry
-        .FILTER_APPS_WRITE_SETTINGS;
-import static com.android.settings.applications.manageapplications.ManageApplications
-        .LIST_TYPE_GAMES;
-import static com.android.settings.applications.manageapplications.ManageApplications
-        .LIST_TYPE_HIGH_POWER;
-import static com.android.settings.applications.manageapplications.ManageApplications
-        .LIST_TYPE_MAIN;
-import static com.android.settings.applications.manageapplications.ManageApplications
-        .LIST_TYPE_MANAGE_SOURCES;
-import static com.android.settings.applications.manageapplications.ManageApplications
-        .LIST_TYPE_MOVIES;
-import static com.android.settings.applications.manageapplications.ManageApplications
-        .LIST_TYPE_NOTIFICATION;
-import static com.android.settings.applications.manageapplications.ManageApplications
-        .LIST_TYPE_OVERLAY;
-import static com.android.settings.applications.manageapplications.ManageApplications
-        .LIST_TYPE_PHOTOGRAPHY;
-import static com.android.settings.applications.manageapplications.ManageApplications
-        .LIST_TYPE_STORAGE;
-import static com.android.settings.applications.manageapplications.ManageApplications
-        .LIST_TYPE_USAGE_ACCESS;
-import static com.android.settings.applications.manageapplications.ManageApplications
-        .LIST_TYPE_WRITE_SETTINGS;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_ALL;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_INSTALL_SOURCES;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_POWER_ALLOWLIST;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_RECENT;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_USAGE_ACCESS;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_WITH_OVERLAY;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_WRITE_SETTINGS;
+import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_GAMES;
+import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_HIGH_POWER;
+import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_MAIN;
+import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_MANAGE_SOURCES;
+import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_MOVIES;
+import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_NOTIFICATION;
+import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_OVERLAY;
+import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_PHOTOGRAPHY;
+import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_STORAGE;
+import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_USAGE_ACCESS;
+import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_WRITE_SETTINGS;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -62,27 +44,27 @@
 @RunWith(RobolectricTestRunner.class)
 public class AppFilterRegistryTest {
 
-  @Test
-  public void getDefaultType_shouldMatchForAllListType() {
-      final AppFilterRegistry registry = AppFilterRegistry.getInstance();
-      assertThat(registry.getDefaultFilterType(LIST_TYPE_USAGE_ACCESS))
-          .isEqualTo(FILTER_APPS_USAGE_ACCESS);
-      assertThat(registry.getDefaultFilterType(LIST_TYPE_HIGH_POWER))
-          .isEqualTo(FILTER_APPS_POWER_WHITELIST);
-      assertThat(registry.getDefaultFilterType(LIST_TYPE_OVERLAY))
-          .isEqualTo(FILTER_APPS_WITH_OVERLAY);
-      assertThat(registry.getDefaultFilterType(LIST_TYPE_WRITE_SETTINGS))
-          .isEqualTo(FILTER_APPS_WRITE_SETTINGS);
-      assertThat(registry.getDefaultFilterType(LIST_TYPE_MANAGE_SOURCES))
-          .isEqualTo(FILTER_APPS_INSTALL_SOURCES);
+    @Test
+    public void getDefaultType_shouldMatchForAllListType() {
+        final AppFilterRegistry registry = AppFilterRegistry.getInstance();
+        assertThat(registry.getDefaultFilterType(LIST_TYPE_USAGE_ACCESS))
+                .isEqualTo(FILTER_APPS_USAGE_ACCESS);
+        assertThat(registry.getDefaultFilterType(LIST_TYPE_HIGH_POWER))
+                .isEqualTo(FILTER_APPS_POWER_ALLOWLIST);
+        assertThat(registry.getDefaultFilterType(LIST_TYPE_OVERLAY))
+                .isEqualTo(FILTER_APPS_WITH_OVERLAY);
+        assertThat(registry.getDefaultFilterType(LIST_TYPE_WRITE_SETTINGS))
+                .isEqualTo(FILTER_APPS_WRITE_SETTINGS);
+        assertThat(registry.getDefaultFilterType(LIST_TYPE_MANAGE_SOURCES))
+                .isEqualTo(FILTER_APPS_INSTALL_SOURCES);
 
-      assertThat(registry.getDefaultFilterType(LIST_TYPE_MAIN)).isEqualTo(FILTER_APPS_ALL);
-      assertThat(registry.getDefaultFilterType(LIST_TYPE_NOTIFICATION))
-              .isEqualTo(FILTER_APPS_RECENT);
-      assertThat(registry.getDefaultFilterType(LIST_TYPE_STORAGE)).isEqualTo(FILTER_APPS_ALL);
+        assertThat(registry.getDefaultFilterType(LIST_TYPE_MAIN)).isEqualTo(FILTER_APPS_ALL);
+        assertThat(registry.getDefaultFilterType(LIST_TYPE_NOTIFICATION))
+                .isEqualTo(FILTER_APPS_RECENT);
+        assertThat(registry.getDefaultFilterType(LIST_TYPE_STORAGE)).isEqualTo(FILTER_APPS_ALL);
 
-      assertThat(registry.getDefaultFilterType(LIST_TYPE_GAMES)).isEqualTo(FILTER_APPS_ALL);
-      assertThat(registry.getDefaultFilterType(LIST_TYPE_MOVIES)).isEqualTo(FILTER_APPS_ALL);
-      assertThat(registry.getDefaultFilterType(LIST_TYPE_PHOTOGRAPHY)).isEqualTo(FILTER_APPS_ALL);
-  }
+        assertThat(registry.getDefaultFilterType(LIST_TYPE_GAMES)).isEqualTo(FILTER_APPS_ALL);
+        assertThat(registry.getDefaultFilterType(LIST_TYPE_MOVIES)).isEqualTo(FILTER_APPS_ALL);
+        assertThat(registry.getDefaultFilterType(LIST_TYPE_PHOTOGRAPHY)).isEqualTo(FILTER_APPS_ALL);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java
index 4d420d1..86f5fe8 100644
--- a/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java
@@ -570,12 +570,14 @@
 
         mFragment.createHeader();
 
-        assertThat(mFragment.mFilterAdapter.getCount()).isEqualTo(3);
+        assertThat(mFragment.mFilterAdapter.getCount()).isEqualTo(4);
         assertThat(mFragment.mFilterAdapter.getItem(0)).isEqualTo(
                 mContext.getString(R.string.sort_order_recent_notification));
         assertThat(mFragment.mFilterAdapter.getItem(1)).isEqualTo(
                 mContext.getString(R.string.sort_order_frequent_notification));
         assertThat(mFragment.mFilterAdapter.getItem(2)).isEqualTo(
+                mContext.getString(R.string.filter_all_apps));
+        assertThat(mFragment.mFilterAdapter.getItem(3)).isEqualTo(
                 mContext.getString(R.string.filter_notif_blocked_apps));
     }
 
@@ -594,8 +596,8 @@
         mFragment.onItemSelected(null, null, 0, 0);
 
         AppFilter filter = ReflectionHelpers.getField(adapter, "mCompositeFilter");
-        assertThat(filter.filterApp(createPowerWhiteListApp(false))).isFalse();
-        assertThat(filter.filterApp(createPowerWhiteListApp(true))).isTrue();
+        assertThat(filter.filterApp(createPowerAllowListApp(false))).isFalse();
+        assertThat(filter.filterApp(createPowerAllowListApp(true))).isTrue();
     }
 
     @Test
@@ -613,8 +615,8 @@
         mFragment.onItemSelected(null, null, 1, 0);
 
         AppFilter filter = ReflectionHelpers.getField(adapter, "mCompositeFilter");
-        assertThat(filter.filterApp(createPowerWhiteListApp(false))).isTrue();
-        assertThat(filter.filterApp(createPowerWhiteListApp(true))).isTrue();
+        assertThat(filter.filterApp(createPowerAllowListApp(false))).isTrue();
+        assertThat(filter.filterApp(createPowerAllowListApp(true))).isTrue();
     }
 
     private void setUpOptionMenus() {
@@ -644,11 +646,11 @@
         return appList;
     }
 
-    private AppEntry createPowerWhiteListApp(boolean isPowerWhiteListed) {
+    private AppEntry createPowerAllowListApp(boolean isPowerAllowListed) {
         final ApplicationInfo info = new ApplicationInfo();
         info.sourceDir = "abc";
         final AppEntry entry = new AppEntry(mContext, info, 0);
-        entry.extraInfo = isPowerWhiteListed ? Boolean.TRUE : Boolean.FALSE;
+        entry.extraInfo = isPowerAllowListed ? Boolean.TRUE : Boolean.FALSE;
         return entry;
     }
 }
diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailsTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailsTest.java
index b6c6c6a..4eebd7d 100644
--- a/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailsTest.java
@@ -55,18 +55,18 @@
 
     @Test
     public void testNonPippableApp() {
-        assertThat(checkPackageHasPictureInPictureActivities("com.android.dummypackage")).isFalse();
-        assertThat(checkPackageHasPictureInPictureActivities("com.android.dummypackage",
+        assertThat(checkPackageHasPictureInPictureActivities("com.android.fakepackage")).isFalse();
+        assertThat(checkPackageHasPictureInPictureActivities("com.android.fakepackage",
                 false, false, false)).isFalse();
     }
 
     @Test
     public void testPippableApp() {
-        assertThat(checkPackageHasPictureInPictureActivities("com.android.dummypackage",
+        assertThat(checkPackageHasPictureInPictureActivities("com.android.fakepackage",
                 true)).isTrue();
-        assertThat(checkPackageHasPictureInPictureActivities("com.android.dummypackage",
+        assertThat(checkPackageHasPictureInPictureActivities("com.android.fakepackage",
                 false, true)).isTrue();
-        assertThat(checkPackageHasPictureInPictureActivities("com.android.dummypackage",
+        assertThat(checkPackageHasPictureInPictureActivities("com.android.fakepackage",
                 true, false)).isTrue();
     }
 
diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessControllerTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessControllerTest.java
index 6041e9d..8febbc6 100644
--- a/tests/robotests/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessControllerTest.java
@@ -63,12 +63,6 @@
     }
 
     @Test
-    public void isAvailable_lowMemory_false() {
-        mActivityManager.setIsLowRamDevice(true);
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
     public void logSpecialPermissionChange() {
         ZenAccessController.logSpecialPermissionChange(true, "app", mContext);
         verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessSettingObserverMixinTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessSettingObserverMixinTest.java
index cba1a51..fb565b6 100644
--- a/tests/robotests/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessSettingObserverMixinTest.java
+++ b/tests/robotests/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessSettingObserverMixinTest.java
@@ -65,7 +65,7 @@
     }
 
     @Test
-    public void onStart_lowMemory_shouldNotRegisterListener() {
+    public void onStart_shouldRegisterListener() {
         final ShadowActivityManager sam = Shadow.extract(
                 mContext.getSystemService(ActivityManager.class));
         sam.setIsLowRamDevice(true);
@@ -75,29 +75,11 @@
         mContext.getContentResolver().notifyChange(Settings.Secure.getUriFor(
                 Settings.Secure.ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES), null);
 
-        verify(mListener, never()).onZenAccessPolicyChanged();
-    }
-
-    @Test
-    public void onStart_highMemory_shouldRegisterListener() {
-        final ShadowActivityManager sam = Shadow.extract(
-                mContext.getSystemService(ActivityManager.class));
-        sam.setIsLowRamDevice(false);
-
-        mLifecycle.handleLifecycleEvent(ON_START);
-
-        mContext.getContentResolver().notifyChange(Settings.Secure.getUriFor(
-                Settings.Secure.ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES), null);
-
         verify(mListener).onZenAccessPolicyChanged();
     }
 
     @Test
     public void onStop_shouldUnregisterListener() {
-        final ShadowActivityManager sam = Shadow.extract(
-                mContext.getSystemService(ActivityManager.class));
-        sam.setIsLowRamDevice(false);
-
         mLifecycle.handleLifecycleEvent(ON_START);
         mLifecycle.handleLifecycleEvent(ON_STOP);
 
diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java
index bfe7df3..3521f49 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java
@@ -93,7 +93,6 @@
                 any(byte[].class),
                 any(CancellationSignal.class),
                 anyInt(),
-                anyInt(),
                 callbackCaptor.capture());
 
         return callbackCaptor.getValue();
diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java
index 8be6b30..78ab49b 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java
@@ -151,7 +151,6 @@
                 any(byte[].class),
                 any(CancellationSignal.class),
                 anyInt(),
-                anyInt(),
                 callbackCaptor.capture());
 
         return callbackCaptor.getValue();
diff --git a/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java
index da11781..20cc59d 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java
@@ -145,6 +145,15 @@
     }
 
     @Test
+    public void onClick_Preference_connected_setActive() {
+        when(mCachedBluetoothDevice.isConnected()).thenReturn(true);
+
+        mBluetoothDeviceUpdater.onPreferenceClick(mPreference);
+
+        verify(mCachedBluetoothDevice).setActive();
+    }
+
+    @Test
     public void forceUpdate_findCachedBluetoothDeviceIsMatched_addPreference() {
         final List<BluetoothDevice> bluetoothDevices = new ArrayList<>();
         bluetoothDevices.add(mBluetoothDevice);
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDeviceDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDeviceDashboardFragmentTest.java
new file mode 100644
index 0000000..6261015
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDeviceDashboardFragmentTest.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.connecteddevice;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.bluetooth.BluetoothAdapter;
+
+import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadow.api.Shadow;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = ShadowBluetoothAdapter.class)
+public class PreviouslyConnectedDeviceDashboardFragmentTest {
+
+    private ShadowBluetoothAdapter mShadowBluetoothAdapter;
+    private PreviouslyConnectedDeviceDashboardFragment mFragment;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mShadowBluetoothAdapter = Shadow.extract(BluetoothAdapter.getDefaultAdapter());
+        mFragment = new PreviouslyConnectedDeviceDashboardFragment();
+        mFragment.mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+    }
+
+    @Test
+    public void onStart_bluetoothIsDisable_enableBluetooth() {
+        mShadowBluetoothAdapter.setEnabled(false);
+
+        assertThat(mFragment.mBluetoothAdapter.isEnabled()).isFalse();
+        mFragment.enableBluetoothIfNecessary();
+
+        assertThat(mFragment.mBluetoothAdapter.isEnabled()).isTrue();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java
index 90cbea9..d73471f 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java
@@ -23,7 +23,10 @@
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothDevice;
 import android.content.Context;
 import android.content.pm.PackageManager;
 
@@ -32,9 +35,14 @@
 import androidx.preference.PreferenceGroup;
 import androidx.preference.PreferenceManager;
 
+import com.android.settings.R;
+import com.android.settings.bluetooth.BluetoothDevicePreference;
 import com.android.settings.bluetooth.BluetoothDeviceUpdater;
 import com.android.settings.connecteddevice.dock.DockUpdater;
 import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
+import com.android.settings.widget.SingleTargetGearPreference;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -43,11 +51,21 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadow.api.Shadow;
+
+import java.util.ArrayList;
+import java.util.List;
 
 @RunWith(RobolectricTestRunner.class)
+@Config(shadows = ShadowBluetoothAdapter.class)
 public class PreviouslyConnectedDevicePreferenceControllerTest {
 
-    private final String KEY = "test_key";
+    private static final String KEY = "test_key";
+    private static final String FAKE_ADDRESS_1 = "AA:AA:AA:AA:AA:01";
+    private static final String FAKE_ADDRESS_2 = "AA:AA:AA:AA:AA:02";
+    private static final String FAKE_ADDRESS_3 = "AA:AA:AA:AA:AA:03";
+    private static final String FAKE_ADDRESS_4 = "AA:AA:AA:AA:AA:04";
 
     @Mock
     private DashboardFragment mDashboardFragment;
@@ -59,10 +77,29 @@
     private PackageManager mPackageManager;
     @Mock
     private PreferenceManager mPreferenceManager;
+    @Mock
+    private Preference mSeeAllPreference;
+    @Mock
+    private CachedBluetoothDevice mCachedDevice1;
+    @Mock
+    private CachedBluetoothDevice mCachedDevice2;
+    @Mock
+    private CachedBluetoothDevice mCachedDevice3;
+    @Mock
+    private CachedBluetoothDevice mCachedDevice4;
+    @Mock
+    private BluetoothDevice mBluetoothDevice1;
+    @Mock
+    private BluetoothDevice mBluetoothDevice2;
+    @Mock
+    private BluetoothDevice mBluetoothDevice3;
+    @Mock
+    private BluetoothDevice mBluetoothDevice4;
 
     private Context mContext;
     private PreviouslyConnectedDevicePreferenceController mPreConnectedDeviceController;
     private PreferenceGroup mPreferenceGroup;
+    private ShadowBluetoothAdapter mShadowBluetoothAdapter;
 
     @Before
     public void setUp() {
@@ -74,11 +111,29 @@
                 new PreviouslyConnectedDevicePreferenceController(mContext, KEY);
         mPreConnectedDeviceController.setBluetoothDeviceUpdater(mBluetoothDeviceUpdater);
         mPreConnectedDeviceController.setSavedDockUpdater(mDockUpdater);
+        mShadowBluetoothAdapter = Shadow.extract(BluetoothAdapter.getDefaultAdapter());
+
+        when(mCachedDevice1.getDevice()).thenReturn(mBluetoothDevice1);
+        when(mCachedDevice1.getAddress()).thenReturn(FAKE_ADDRESS_1);
+        when(mCachedDevice2.getDevice()).thenReturn(mBluetoothDevice2);
+        when(mCachedDevice2.getAddress()).thenReturn(FAKE_ADDRESS_2);
+        when(mCachedDevice3.getDevice()).thenReturn(mBluetoothDevice3);
+        when(mCachedDevice3.getAddress()).thenReturn(FAKE_ADDRESS_3);
+        when(mCachedDevice4.getDevice()).thenReturn(mBluetoothDevice4);
+        when(mCachedDevice4.getAddress()).thenReturn(FAKE_ADDRESS_4);
+
+        final List<BluetoothDevice> mMostRecentlyConnectedDevices = new ArrayList<>();
+        mMostRecentlyConnectedDevices.add(mBluetoothDevice1);
+        mMostRecentlyConnectedDevices.add(mBluetoothDevice2);
+        mMostRecentlyConnectedDevices.add(mBluetoothDevice4);
+        mMostRecentlyConnectedDevices.add(mBluetoothDevice3);
+        mShadowBluetoothAdapter.setMostRecentlyConnectedDevices(mMostRecentlyConnectedDevices);
 
         mPreferenceGroup = spy(new PreferenceCategory(mContext));
         doReturn(mPreferenceManager).when(mPreferenceGroup).getPreferenceManager();
         mPreferenceGroup.setVisible(false);
         mPreConnectedDeviceController.setPreferenceGroup(mPreferenceGroup);
+        mPreConnectedDeviceController.mSeeAllPreference = mSeeAllPreference;
     }
 
     @Test
@@ -87,11 +142,14 @@
         mPreConnectedDeviceController.onStart();
         verify(mBluetoothDeviceUpdater).registerCallback();
         verify(mDockUpdater).registerCallback();
+        verify(mContext).registerReceiver(mPreConnectedDeviceController.mReceiver,
+                mPreConnectedDeviceController.mIntentFilter);
 
         // unregister the callback in onStop()
         mPreConnectedDeviceController.onStop();
         verify(mBluetoothDeviceUpdater).unregisterCallback();
         verify(mDockUpdater).unregisterCallback();
+        verify(mContext).unregisterReceiver(mPreConnectedDeviceController.mReceiver);
     }
 
     @Test
@@ -122,32 +180,76 @@
 
     @Test
     public void onDeviceAdded_addDevicePreference_displayIt() {
-        mPreConnectedDeviceController.onDeviceAdded(new Preference(mContext));
+        final BluetoothDevicePreference preference1 = new BluetoothDevicePreference(
+                mContext, mCachedDevice1, true, BluetoothDevicePreference.SortType.TYPE_NO_SORT);
 
-        assertThat(mPreferenceGroup.isVisible()).isTrue();
-        assertThat(mPreferenceGroup.getPreferenceCount()).isEqualTo(1);
+        mPreConnectedDeviceController.onDeviceAdded(preference1);
+
+        assertThat(mPreferenceGroup.getPreferenceCount()).isEqualTo(2);
+    }
+
+    @Test
+    public void onDeviceAdded_addDockDevicePreference_displayIt() {
+        final SingleTargetGearPreference dockPreference = new SingleTargetGearPreference(
+                mContext, null /* AttributeSet */);
+
+        mPreConnectedDeviceController.onDeviceAdded(dockPreference);
+
+        assertThat(mPreferenceGroup.getPreferenceCount()).isEqualTo(2);
     }
 
     @Test
     public void onDeviceAdded_addFourDevicePreference_onlyDisplayThree() {
-        mPreConnectedDeviceController.onDeviceAdded(new Preference(mContext));
-        mPreConnectedDeviceController.onDeviceAdded(new Preference(mContext));
-        mPreConnectedDeviceController.onDeviceAdded(new Preference(mContext));
-        mPreConnectedDeviceController.onDeviceAdded(new Preference(mContext));
+        final BluetoothDevicePreference preference1 = new BluetoothDevicePreference(
+                mContext, mCachedDevice1, true, BluetoothDevicePreference.SortType.TYPE_NO_SORT);
+        final BluetoothDevicePreference preference2 = new BluetoothDevicePreference(
+                mContext, mCachedDevice2, true, BluetoothDevicePreference.SortType.TYPE_NO_SORT);
+        final BluetoothDevicePreference preference3 = new BluetoothDevicePreference(
+                mContext, mCachedDevice3, true, BluetoothDevicePreference.SortType.TYPE_NO_SORT);
+        final BluetoothDevicePreference preference4 = new BluetoothDevicePreference(
+                mContext, mCachedDevice4, true, BluetoothDevicePreference.SortType.TYPE_NO_SORT);
+        final SingleTargetGearPreference dockPreference = new SingleTargetGearPreference(
+                mContext, null /* AttributeSet */);
 
-        assertThat(mPreferenceGroup.isVisible()).isTrue();
-        assertThat(mPreferenceGroup.getPreferenceCount()).isEqualTo(3);
+        mPreConnectedDeviceController.onDeviceAdded(preference1);
+        mPreConnectedDeviceController.onDeviceAdded(preference2);
+        mPreConnectedDeviceController.onDeviceAdded(preference3);
+        mPreConnectedDeviceController.onDeviceAdded(preference4);
+        mPreConnectedDeviceController.onDeviceAdded(dockPreference);
+
+        // 3 BluetoothDevicePreference and 1 see all preference
+        assertThat(mPreferenceGroup.getPreferenceCount()).isEqualTo(4);
     }
 
     @Test
-    public void onDeviceRemoved_removeLastDevice_setInvisible() {
-        final Preference preference = new Preference(mContext);
-        mPreferenceGroup.addPreference(preference);
-        mPreferenceGroup.setVisible(true);
+    public void onDeviceRemoved_removeLastDevice_showSeeAllPreference() {
+        final BluetoothDevicePreference preference1 = new BluetoothDevicePreference(
+                mContext, mCachedDevice1, true, BluetoothDevicePreference.SortType.TYPE_NO_SORT);
+        final SingleTargetGearPreference dockPreference = new SingleTargetGearPreference(
+                mContext, null /* AttributeSet */);
+        mPreferenceGroup.addPreference(preference1);
+        mPreferenceGroup.addPreference(dockPreference);
 
-        mPreConnectedDeviceController.onDeviceRemoved(preference);
+        mPreConnectedDeviceController.onDeviceRemoved(preference1);
+        mPreConnectedDeviceController.onDeviceRemoved(dockPreference);
 
-        assertThat(mPreferenceGroup.isVisible()).isFalse();
-        assertThat(mPreferenceGroup.getPreferenceCount()).isEqualTo(0);
+        assertThat(mPreferenceGroup.getPreferenceCount()).isEqualTo(1);
+    }
+
+    @Test
+    public void updatePreferenceVisibility_bluetoothIsEnable_shouldShowCorrectText() {
+        mShadowBluetoothAdapter.setEnabled(true);
+        mPreConnectedDeviceController.updatePreferenceVisibility();
+
+        verify(mSeeAllPreference).setSummary("");
+    }
+
+    @Test
+    public void updatePreferenceVisibility_bluetoothIsDisable_shouldShowCorrectText() {
+        mShadowBluetoothAdapter.setEnabled(false);
+        mPreConnectedDeviceController.updatePreferenceVisibility();
+
+        verify(mSeeAllPreference).setSummary(
+                mContext.getString(R.string.connected_device_see_all_summary));
     }
 }
diff --git a/tests/robotests/src/com/android/settings/core/BasePreferenceControllerSignatureInspector.java b/tests/robotests/src/com/android/settings/core/BasePreferenceControllerSignatureInspector.java
index 2d1dc5c..817218e 100644
--- a/tests/robotests/src/com/android/settings/core/BasePreferenceControllerSignatureInspector.java
+++ b/tests/robotests/src/com/android/settings/core/BasePreferenceControllerSignatureInspector.java
@@ -28,13 +28,13 @@
 
 public class BasePreferenceControllerSignatureInspector extends CodeInspector {
 
-    private final List<String> grandfather;
+    private final List<String> mExemptList;
 
     public BasePreferenceControllerSignatureInspector(List<Class<?>> classes) {
         super(classes);
-        grandfather = new ArrayList<>();
-        initializeGrandfatherList(grandfather,
-                "grandfather_invalid_base_preference_controller_constructor");
+        mExemptList = new ArrayList<>();
+        initializeExemptList(mExemptList,
+                "exempt_invalid_base_preference_controller_constructor");
     }
 
     @Override
@@ -51,7 +51,7 @@
                 continue;
             }
             final String className = c.getName();
-            if (grandfather.remove(className)) {
+            if (mExemptList.remove(className)) {
                 continue;
             }
             final Constructor[] constructors = c.getDeclaredConstructors();
@@ -76,10 +76,10 @@
                 .that(badClasses.toString())
                 .isEmpty();
 
-        assertWithMessage("Something in the grandfather list is no longer relevant. Please remove"
+        assertWithMessage("Something in the exempt list is no longer relevant. Please remove"
             + "it from packages/apps/Settings/tests/robotests/assets/"
-            + "grandfather_invalid_base_preference_controller_constructor")
-                .that(grandfather)
+            + "exempt_invalid_base_preference_controller_constructor")
+                .that(mExemptList)
                 .isEmpty();
     }
 
diff --git a/tests/robotests/src/com/android/settings/core/XmlControllerAttributeTest.java b/tests/robotests/src/com/android/settings/core/XmlControllerAttributeTest.java
index da234a1..5a62f74 100644
--- a/tests/robotests/src/com/android/settings/core/XmlControllerAttributeTest.java
+++ b/tests/robotests/src/com/android/settings/core/XmlControllerAttributeTest.java
@@ -35,7 +35,7 @@
 public class XmlControllerAttributeTest {
 
     // List of XML that could be retrieved from the illegalClasses list.
-    private final List<Integer> whitelistXml = Arrays.asList(R.xml.security_dashboard_settings);
+    private final List<Integer> mAllowlistXml = Arrays.asList(R.xml.security_dashboard_settings);
 
     private static final String NO_VALID_CONSTRUCTOR_ERROR =
             "Controllers added in XML need a constructor following either:"
@@ -62,7 +62,7 @@
     @Test
     public void testAllIndexableXML_onlyValidBasePreferenceControllersAdded() throws Exception {
         Set<Integer> xmlSet = getIndexableXml();
-        xmlSet.addAll(whitelistXml);
+        xmlSet.addAll(mAllowlistXml);
 
         List<String> xmlControllers = new ArrayList<>();
         Set<String> invalidConstructors = new HashSet<>();
diff --git a/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspector.java b/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspector.java
index d8869ea..48833c6 100644
--- a/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspector.java
+++ b/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspector.java
@@ -48,13 +48,13 @@
      */
     public abstract void run();
 
-    protected void assertNoObsoleteInGrandfatherList(String listName, List<String> list) {
-        final StringBuilder obsoleteGrandfatherItems = new StringBuilder(listName)
-            .append(" contains item that should not be grandfathered.\n");
+    protected void assertNoObsoleteInExemptList(String listName, List<String> list) {
+        final StringBuilder obsoleteExemptItems = new StringBuilder(listName).append(
+                " contains item that should not be exempted.\n");
         for (String c : list) {
-            obsoleteGrandfatherItems.append(c).append("\n");
+            obsoleteExemptItems.append(c).append("\n");
         }
-        assertWithMessage(obsoleteGrandfatherItems.toString()).that(list).isEmpty();
+        assertWithMessage(obsoleteExemptItems.toString()).that(list).isEmpty();
     }
 
     protected boolean isConcreteSettingsClass(Class clazz) {
@@ -78,16 +78,16 @@
         return true;
     }
 
-    public static void initializeGrandfatherList(List<String> grandfather, String filename) {
+    public static void initializeExemptList(List<String> exemptList, String filename) {
         try {
             final InputStream in = RuntimeEnvironment.application.getAssets().open(filename);
             BufferedReader reader = new BufferedReader(new InputStreamReader(in));
             String line;
             while ((line = reader.readLine()) != null) {
-                grandfather.add(line);
+                exemptList.add(line);
             }
         } catch (Exception e) {
-            throw new IllegalArgumentException("Error initializing grandfather " + filename, e);
+            throw new IllegalArgumentException("Error initializing exempt list " + filename, e);
         }
     }
 }
diff --git a/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java b/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java
index 9480e6d..8f650ea 100644
--- a/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java
+++ b/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java
@@ -34,13 +34,13 @@
  */
 public class InstrumentableFragmentCodeInspector extends CodeInspector {
 
-    private final List<String> grandfather_notImplementingInstrumentable;
+    private final List<String> mNotImplementingInstrumentableExemptList;
 
     public InstrumentableFragmentCodeInspector(List<Class<?>> classes) {
         super(classes);
-        grandfather_notImplementingInstrumentable = new ArrayList<>();
-        initializeGrandfatherList(grandfather_notImplementingInstrumentable,
-                "grandfather_not_implementing_instrumentable");
+        mNotImplementingInstrumentableExemptList = new ArrayList<>();
+        initializeExemptList(mNotImplementingInstrumentableExemptList,
+                "exempt_not_implementing_instrumentable");
     }
 
     @Override
@@ -53,11 +53,11 @@
             }
             final String className = clazz.getName();
             // If it's a fragment, it must also be instrumentable.
-            final boolean whitelisted =
-                    grandfather_notImplementingInstrumentable.remove(className);
+            final boolean allowlisted =
+                    mNotImplementingInstrumentableExemptList.remove(className);
             if (Fragment.class.isAssignableFrom(clazz)
                     && !Instrumentable.class.isAssignableFrom(clazz)
-                    && !whitelisted) {
+                    && !allowlisted) {
                 broken.add(className);
             }
         }
@@ -67,7 +67,7 @@
             sb.append(c).append("\n");
         }
         assertWithMessage(sb.toString()).that(broken.isEmpty()).isTrue();
-        assertNoObsoleteInGrandfatherList("grandfather_not_implementing_instrumentable",
-                grandfather_notImplementingInstrumentable);
+        assertNoObsoleteInExemptList("exempt_not_implementing_instrumentable",
+                mNotImplementingInstrumentableExemptList);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
index 3f2b7c3..b5b0f30 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
@@ -583,4 +583,28 @@
                 .startActivityForResultAsUser(any(Intent.class), anyInt(), any(UserHandle.class));
         verify(mActivity).getSupportFragmentManager();
     }
+
+    @Test
+    public void openTileIntent_profileSelectionDialog_unresolvableWorkProfileIntentShouldNotShow() {
+        final int userId = 10;
+        ShadowUserManager.getShadow().addUser(userId, "Someone", 0);
+        final UserHandle userHandle = new UserHandle(userId);
+        final Tile tile = new ActivityTile(mActivityInfo, CategoryKey.CATEGORY_HOMEPAGE);
+        final ArrayList<UserHandle> handles = new ArrayList<>();
+        handles.add(new UserHandle(0));
+        handles.add(userHandle);
+        tile.userHandle = handles;
+        when(mPackageManager.resolveActivityAsUser(any(Intent.class), anyInt(), eq(0)))
+                .thenReturn(new ResolveInfo());
+        when(mPackageManager.resolveActivityAsUser(any(Intent.class), anyInt(), eq(userId)))
+                .thenReturn(null);
+
+        mImpl.openTileIntent(mActivity, tile);
+
+        final ArgumentCaptor<UserHandle> argument = ArgumentCaptor.forClass(UserHandle.class);
+        verify(mActivity)
+                .startActivityForResultAsUser(any(Intent.class), anyInt(), argument.capture());
+        assertThat(argument.getValue().getIdentifier()).isEqualTo(0);
+        verify(mActivity, never()).getSupportFragmentManager();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
index e70578e..4b53ed1 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
@@ -50,7 +50,7 @@
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.slices.BlockingSlicePrefController;
 import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settings.widget.PrimarySwitchPreference;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin;
@@ -327,12 +327,12 @@
     }
 
     @Test
-    public void createPreference_isActivityTileAndHasSwitch_returnMasterSwitchPreference() {
+    public void createPreference_isActivityTileAndHasSwitch_returnPrimarySwitchPreference() {
         mActivityTile.getMetaData().putString(META_DATA_PREFERENCE_SWITCH_URI, "uri");
 
         final Preference pref = mTestFragment.createPreference(mActivityTile);
 
-        assertThat(pref).isInstanceOf(MasterSwitchPreference.class);
+        assertThat(pref).isInstanceOf(PrimarySwitchPreference.class);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/datausage/ChartDataUsagePreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/ChartDataUsagePreferenceTest.java
index 8881b49..aab67be 100644
--- a/tests/robotests/src/com/android/settings/datausage/ChartDataUsagePreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/ChartDataUsagePreferenceTest.java
@@ -124,7 +124,7 @@
             tonight - TimeUnit.DAYS.toMillis(2), tonight - TimeUnit.DAYS.toMillis(1), 83849690L));
         mNetworkCycleData.add(createNetworkCycleData(
             tonight - TimeUnit.DAYS.toMillis(1), tonight, 1883657L));
-        // add dummy usage data for next 5 days
+        // add test usage data for next 5 days
         mNetworkCycleData.add(createNetworkCycleData(
             tonight, tonight + TimeUnit.DAYS.toMillis(1), 0L));
         mNetworkCycleData.add(createNetworkCycleData(
@@ -149,7 +149,7 @@
 
         verify(usageView).addPath(pointsCaptor.capture());
         final SparseIntArray points = pointsCaptor.getValue();
-        // should only have 7 points: 1 dummy point indicating the start of data, starting point 0,
+        // should only have 7 points: 1 test point indicating the start of data, starting point 0,
         // and 5 actual data point for each day
         assertThat(points.size()).isEqualTo(7);
         assertThat(points.keyAt(0)).isEqualTo(-1);
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java
index 35e6b1d..5f40925 100644
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java
@@ -61,7 +61,7 @@
 
     private static final long CYCLE_DURATION_MILLIS = 1000000000L;
     private static final long UPDATE_LAG_MILLIS = 10000000L;
-    private static final String DUMMY_CARRIER = "z-mobile";
+    private static final String FAKE_CARRIER = "z-mobile";
 
     private Activity mActivity;
     private PreferenceViewHolder mHolder;
@@ -99,7 +99,7 @@
 
     @Test
     public void testSetUsageInfo_withLaunchIntent_launchButtonShown() {
-        mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, DUMMY_CARRIER, 0 /* numPlans */,
+        mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, FAKE_CARRIER, 0 /* numPlans */,
                 new Intent());
 
         bindViewHolder();
@@ -108,7 +108,7 @@
 
     @Test
     public void testSetUsageInfo_withoutLaunchIntent_launchButtonNotShown() {
-        mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, DUMMY_CARRIER, 0 /* numPlans */,
+        mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, FAKE_CARRIER, 0 /* numPlans */,
                 null /* launchIntent */);
 
         bindViewHolder();
@@ -117,7 +117,7 @@
 
     @Test
     public void testSetUsageInfo_withDataPlans_carrierInfoShown() {
-        mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, DUMMY_CARRIER, 1 /* numPlans */,
+        mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, FAKE_CARRIER, 1 /* numPlans */,
                 new Intent());
 
         bindViewHolder();
@@ -126,7 +126,7 @@
 
     @Test
     public void testSetUsageInfo_withNoDataPlans_carrierInfoNotShown() {
-        mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, DUMMY_CARRIER, 0 /* numPlans */,
+        mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, FAKE_CARRIER, 0 /* numPlans */,
                 new Intent());
 
         bindViewHolder();
@@ -140,12 +140,12 @@
         final long updateTime = System.currentTimeMillis()
                 - TimeUnit.DAYS.toMillis(baseUnit) - TimeUnit.HOURS.toMillis(smudge);
         mCarrierInfo = (TextView) mHolder.findViewById(R.id.carrier_and_update);
-        mSummaryPreference.setUsageInfo(mCycleEnd, updateTime, DUMMY_CARRIER, 1 /* numPlans */,
+        mSummaryPreference.setUsageInfo(mCycleEnd, updateTime, FAKE_CARRIER, 1 /* numPlans */,
                 new Intent());
 
         bindViewHolder();
         assertThat(mCarrierInfo.getText().toString())
-                .isEqualTo("Updated by " + DUMMY_CARRIER + " " + baseUnit + " days ago");
+                .isEqualTo("Updated by " + FAKE_CARRIER + " " + baseUnit + " days ago");
     }
 
     @Test
@@ -155,12 +155,12 @@
         final long updateTime = System.currentTimeMillis()
                 - TimeUnit.HOURS.toMillis(baseUnit) - TimeUnit.MINUTES.toMillis(smudge);
         mCarrierInfo = (TextView) mHolder.findViewById(R.id.carrier_and_update);
-        mSummaryPreference.setUsageInfo(mCycleEnd, updateTime, DUMMY_CARRIER, 1 /* numPlans */,
+        mSummaryPreference.setUsageInfo(mCycleEnd, updateTime, FAKE_CARRIER, 1 /* numPlans */,
                 new Intent());
 
         bindViewHolder();
         assertThat(mCarrierInfo.getText().toString())
-                .isEqualTo("Updated by " + DUMMY_CARRIER + " " + baseUnit + " hr ago");
+                .isEqualTo("Updated by " + FAKE_CARRIER + " " + baseUnit + " hr ago");
     }
 
     @Test
@@ -170,24 +170,24 @@
         final long updateTime = System.currentTimeMillis()
                 - TimeUnit.MINUTES.toMillis(baseUnit) - TimeUnit.SECONDS.toMillis(smudge);
         mCarrierInfo = (TextView) mHolder.findViewById(R.id.carrier_and_update);
-        mSummaryPreference.setUsageInfo(mCycleEnd, updateTime, DUMMY_CARRIER, 1 /* numPlans */,
+        mSummaryPreference.setUsageInfo(mCycleEnd, updateTime, FAKE_CARRIER, 1 /* numPlans */,
                 new Intent());
 
         bindViewHolder();
         assertThat(mCarrierInfo.getText().toString())
-                .isEqualTo("Updated by " + DUMMY_CARRIER + " " + baseUnit + " min ago");
+                .isEqualTo("Updated by " + FAKE_CARRIER + " " + baseUnit + " min ago");
     }
 
     @Test
     public void testCarrierUpdateTime_shouldFormatLessThanMinuteCorrectly() {
         final long updateTime = System.currentTimeMillis() - TimeUnit.SECONDS.toMillis(45);
         mCarrierInfo = (TextView) mHolder.findViewById(R.id.carrier_and_update);
-        mSummaryPreference.setUsageInfo(mCycleEnd, updateTime, DUMMY_CARRIER, 1 /* numPlans */,
+        mSummaryPreference.setUsageInfo(mCycleEnd, updateTime, FAKE_CARRIER, 1 /* numPlans */,
                 new Intent());
 
         bindViewHolder();
         assertThat(mCarrierInfo.getText().toString())
-                .isEqualTo("Updated by " + DUMMY_CARRIER + " just now");
+                .isEqualTo("Updated by " + FAKE_CARRIER + " just now");
     }
 
     @Test
@@ -218,7 +218,7 @@
     public void setUsageInfo_withRecentCarrierUpdate_doesNotSetCarrierInfoWarningColorAndFont() {
         final long updateTime = System.currentTimeMillis() - TimeUnit.HOURS.toMillis(1);
         mCarrierInfo = (TextView) mHolder.findViewById(R.id.carrier_and_update);
-        mSummaryPreference.setUsageInfo(mCycleEnd, updateTime, DUMMY_CARRIER, 1 /* numPlans */,
+        mSummaryPreference.setUsageInfo(mCycleEnd, updateTime, FAKE_CARRIER, 1 /* numPlans */,
                 new Intent());
 
         bindViewHolder();
@@ -231,7 +231,7 @@
     @Test
     public void testSetUsageInfo_withStaleCarrierUpdate_setsCarrierInfoWarningColorAndFont() {
         final long updateTime = System.currentTimeMillis() - TimeUnit.HOURS.toMillis(7);
-        mSummaryPreference.setUsageInfo(mCycleEnd, updateTime, DUMMY_CARRIER, 1 /* numPlans */,
+        mSummaryPreference.setUsageInfo(mCycleEnd, updateTime, FAKE_CARRIER, 1 /* numPlans */,
                 new Intent());
 
         bindViewHolder();
@@ -244,7 +244,7 @@
 
     @Test
     public void testSetUsageInfo_withNoDataPlans_usageTitleNotShown() {
-        mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, DUMMY_CARRIER, 0 /* numPlans */,
+        mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, FAKE_CARRIER, 0 /* numPlans */,
                 new Intent());
 
         bindViewHolder();
@@ -253,7 +253,7 @@
 
     @Test
     public void testSetUsageInfo_withMultipleDataPlans_usageTitleShown() {
-        mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, DUMMY_CARRIER, 2 /* numPlans */,
+        mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, FAKE_CARRIER, 2 /* numPlans */,
                 new Intent());
 
         bindViewHolder();
@@ -264,7 +264,7 @@
     public void testSetUsageInfo_cycleRemainingTimeIsLessOneDay() {
         // just under one day
         final long cycleEnd = System.currentTimeMillis() + TimeUnit.HOURS.toMillis(23);
-        mSummaryPreference.setUsageInfo(cycleEnd, mUpdateTime, DUMMY_CARRIER, 0 /* numPlans */,
+        mSummaryPreference.setUsageInfo(cycleEnd, mUpdateTime, FAKE_CARRIER, 0 /* numPlans */,
                 new Intent());
 
         bindViewHolder();
@@ -276,7 +276,7 @@
     @Test
     public void testSetUsageInfo_cycleRemainingTimeNegativeDaysLeft_shouldDisplayNoneLeft() {
         final long cycleEnd = System.currentTimeMillis() - 1L;
-        mSummaryPreference.setUsageInfo(cycleEnd, mUpdateTime, DUMMY_CARRIER, 0 /* numPlans */,
+        mSummaryPreference.setUsageInfo(cycleEnd, mUpdateTime, FAKE_CARRIER, 0 /* numPlans */,
                 new Intent());
 
         bindViewHolder();
@@ -290,7 +290,7 @@
         final int daysLeft = 3;
         final long cycleEnd = System.currentTimeMillis() + TimeUnit.DAYS.toMillis(daysLeft)
                 + TimeUnit.HOURS.toMillis(1);
-        mSummaryPreference.setUsageInfo(cycleEnd, mUpdateTime, DUMMY_CARRIER, 0 /* numPlans */,
+        mSummaryPreference.setUsageInfo(cycleEnd, mUpdateTime, FAKE_CARRIER, 0 /* numPlans */,
                 new Intent());
 
         bindViewHolder();
@@ -369,7 +369,7 @@
 
     @Test
     public void testSetUsageAndRemainingInfo_withUsageInfo_dataUsageAndRemainingShown() {
-        mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, DUMMY_CARRIER, 1 /* numPlans */,
+        mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, FAKE_CARRIER, 1 /* numPlans */,
                 new Intent());
         mSummaryPreference.setUsageNumbers(
                 BillingCycleSettings.MIB_IN_BYTES,
@@ -386,7 +386,7 @@
 
     @Test
     public void testSetUsageInfo_withDataOverusage() {
-        mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, DUMMY_CARRIER, 1 /* numPlans */,
+        mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, FAKE_CARRIER, 1 /* numPlans */,
                 new Intent());
         mSummaryPreference.setUsageNumbers(
                 11 * BillingCycleSettings.MIB_IN_BYTES,
@@ -402,7 +402,7 @@
 
     @Test
     public void testSetUsageInfo_withUsageInfo_dataUsageShown() {
-        mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, DUMMY_CARRIER, 0 /* numPlans */,
+        mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, FAKE_CARRIER, 0 /* numPlans */,
                 new Intent());
         mSummaryPreference.setUsageNumbers(
                 BillingCycleSettings.MIB_IN_BYTES, -1L, true /* hasMobileData */);
@@ -419,7 +419,7 @@
         intent.setPackage("test-owner.example.com");
         intent.putExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX, 42);
 
-        mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, DUMMY_CARRIER, 0 /* numPlans */,
+        mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, FAKE_CARRIER, 0 /* numPlans */,
                 intent);
 
         bindViewHolder();
@@ -448,7 +448,7 @@
         doReturn(dataUsed).when(mHolder).findViewById(R.id.data_usage_view);
         doReturn(dataRemaining).when(mHolder).findViewById(R.id.data_remaining_view);
 
-        mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, DUMMY_CARRIER, 1 /* numPlans */,
+        mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, FAKE_CARRIER, 1 /* numPlans */,
                 new Intent());
         mSummaryPreference.setUsageNumbers(
                 BillingCycleSettings.MIB_IN_BYTES,
@@ -484,7 +484,7 @@
                 + TimeUnit.HOURS.toMillis(1);
         final FragmentActivity activity = Robolectric.setupActivity(FragmentActivity.class);
         mSummaryPreference = spy(mSummaryPreference);
-        mSummaryPreference.setUsageInfo(cycleEnd, mUpdateTime, DUMMY_CARRIER, 0 /* numPlans */,
+        mSummaryPreference.setUsageInfo(cycleEnd, mUpdateTime, FAKE_CARRIER, 0 /* numPlans */,
                 new Intent());
         mSummaryPreference.setUsageNumbers(1000000L, -1L, true);
         final String cycleText = "The quick fox";
diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPickerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPickerTest.java
index 1207621..eef88f2 100644
--- a/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPickerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPickerTest.java
@@ -23,11 +23,10 @@
 
 import android.content.Context;
 
+import com.android.i18n.timezone.CountryZonesFinder;
 import com.android.settings.datetime.timezone.BaseTimeZoneAdapter.AdapterItem;
 import com.android.settings.datetime.timezone.model.TimeZoneData;
 
-import libcore.timezone.CountryZonesFinder;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/RegionSearchPickerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/RegionSearchPickerTest.java
index c0553a5..78055cf 100644
--- a/tests/robotests/src/com/android/settings/datetime/timezone/RegionSearchPickerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/timezone/RegionSearchPickerTest.java
@@ -28,13 +28,12 @@
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 
+import com.android.i18n.timezone.CountryZonesFinder;
 import com.android.settings.datetime.timezone.BaseTimeZoneAdapter.AdapterItem;
 import com.android.settings.datetime.timezone.BaseTimeZoneAdapter.ItemViewHolder;
 import com.android.settings.datetime.timezone.RegionSearchPicker.RegionItem;
 import com.android.settings.datetime.timezone.model.TimeZoneData;
 
-import libcore.timezone.CountryZonesFinder;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java
index 253b537..1acbcda 100644
--- a/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java
@@ -21,18 +21,20 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import libcore.timezone.CountryTimeZones;
-import libcore.timezone.CountryTimeZones.TimeZoneMapping;
-import libcore.timezone.CountryZonesFinder;
+import static java.util.Collections.emptyList;
+
+import com.android.i18n.timezone.CountryTimeZones;
+import com.android.i18n.timezone.CountryTimeZones.TimeZoneMapping;
+import com.android.i18n.timezone.CountryZonesFinder;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import org.robolectric.RobolectricTestRunner;
 
 @RunWith(RobolectricTestRunner.class)
 public class TimeZoneDataTest {
@@ -49,7 +51,7 @@
     public void testRegionsWithTimeZone() {
         TimeZoneData timeZoneData = new TimeZoneData(mCountryZonesFinder);
         CountryTimeZones countryTimeZones = mock(CountryTimeZones.class);
-        when(countryTimeZones.getTimeZoneMappings()).thenReturn(Collections.emptyList());
+        when(countryTimeZones.getTimeZoneMappings()).thenReturn(emptyList());
         when(mCountryZonesFinder.lookupCountryTimeZones("US")).thenReturn(countryTimeZones);
         assertThat(timeZoneData.lookupCountryTimeZones("US").getCountryTimeZones())
                 .isSameAs(countryTimeZones);
@@ -57,7 +59,7 @@
 
     @Test
     public void testGetRegionIds() {
-        when(mCountryZonesFinder.lookupAllCountryIsoCodes()).thenReturn(Collections.emptyList());
+        when(mCountryZonesFinder.lookupAllCountryIsoCodes()).thenReturn(emptyList());
         TimeZoneData timeZoneData = new TimeZoneData(mCountryZonesFinder);
         assertThat(timeZoneData.getRegionIds()).isEmpty();
 
@@ -73,13 +75,16 @@
         CountryTimeZones US = mock(CountryTimeZones.class);
         when(US.getCountryIso()).thenReturn("us");
         when(US.getTimeZoneMappings()).thenReturn(Arrays.asList(
-           TimeZoneMapping.createForTests("Unknown/Secret_City", true, null /* notUsedAfter */),
-           TimeZoneMapping.createForTests("Unknown/Secret_City2", false, null /* notUsedAfter */)
+                TimeZoneMapping.createForTests(
+                        "Unknown/Secret_City", true, null /* notUsedAfter */, emptyList()),
+                TimeZoneMapping.createForTests(
+                        "Unknown/Secret_City2", false, null /* notUsedAfter */, emptyList())
         ));
         CountryTimeZones GB = mock(CountryTimeZones.class);
         when(GB.getCountryIso()).thenReturn("gb");
         when(GB.getTimeZoneMappings()).thenReturn(Collections.singletonList(
-            TimeZoneMapping.createForTests("Unknown/Secret_City", true, null /* notUsedAfter */)
+                TimeZoneMapping.createForTests(
+                        "Unknown/Secret_City", true, null /* notUsedAfter */, emptyList())
         ));
         when(mCountryZonesFinder.lookupCountryTimeZonesForZoneId("Unknown/Secret_City"))
                 .thenReturn(Arrays.asList(US, GB));
diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java
index 101297b..1ebbb3d 100644
--- a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java
@@ -41,6 +41,7 @@
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.MockitoAnnotations;
@@ -130,6 +131,7 @@
     }
 
     @Test
+    @Ignore
     @Config(shadows = {
             ShadowPictureColorModePreferenceController.class,
             ShadowAdbPreferenceController.class,
diff --git a/tests/robotests/src/com/android/settings/development/EnhancedConnectivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/EnhancedConnectivityPreferenceControllerTest.java
deleted file mode 100644
index db0b0db..0000000
--- a/tests/robotests/src/com/android/settings/development/EnhancedConnectivityPreferenceControllerTest.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.development;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.provider.Settings;
-
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
-import com.android.settings.R;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-
-@RunWith(RobolectricTestRunner.class)
-public class EnhancedConnectivityPreferenceControllerTest {
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-
-    @Mock
-    private SwitchPreference mPreference;
-    @Mock
-    private PreferenceScreen mPreferenceScreen;
-
-    private EnhancedConnectivityPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mController = new EnhancedConnectivityPreferenceController(mContext);
-        when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
-                .thenReturn(mPreference);
-        mController.displayPreference(mPreferenceScreen);
-    }
-
-    @Test
-    public void onPreferenceChanged_enhanceConnectivity_shouldBeOn() {
-        mController.onPreferenceChange(mPreference, true /* new value */);
-
-        assertThat(isSettingEnabled()).isTrue();
-    }
-
-    @Test
-    public void onPreferenceChanged_enhanceConnectivity_shouldBeOff() {
-        mController.onPreferenceChange(mPreference, false /* new value */);
-
-        assertThat(isSettingEnabled()).isFalse();
-    }
-
-    @Test
-    public void updateState_preferenceShouldBeChecked() {
-        Settings.Global.putInt(mContext.getContentResolver(),
-                Settings.Global.ENHANCED_CONNECTIVITY_ENABLED, 1 /* enabled */);
-        mController.updateState(mPreference);
-
-        verify(mPreference).setChecked(true);
-    }
-
-    @Test
-    public void updateState_preferenceShouldNotBeChecked() {
-        Settings.Global.putInt(mContext.getContentResolver(),
-                Settings.Global.ENHANCED_CONNECTIVITY_ENABLED, 0 /* disabled */);
-        mController.updateState(mPreference);
-
-        verify(mPreference).setChecked(false);
-    }
-
-    @Test
-    public void onDeveloperOptionsDisabled_shouldEnablePreference() {
-        mController.onDeveloperOptionsSwitchDisabled();
-
-        verify(mPreference).setEnabled(false);
-        verify(mPreference).setChecked(true);
-
-        assertThat(isSettingEnabled()).isTrue();
-    }
-
-    @Test
-    public void isAvailable_enhancedConnectivityShown_shouldReturnTrue() {
-        enableEnhancedConnectivityPreference(true);
-
-        boolean availability = mController.isAvailable();
-
-        assertThat(availability).isTrue();
-    }
-
-    @Test
-    public void isAvailable_enhancedConnectivityNotShown_shouldReturnFalse() {
-        enableEnhancedConnectivityPreference(false);
-
-        boolean availability = mController.isAvailable();
-
-        assertThat(availability).isFalse();
-    }
-
-    private void enableEnhancedConnectivityPreference(boolean enable) {
-        when(mContext.getResources().getBoolean(R.bool.config_show_enhanced_connectivity))
-                .thenReturn(enable);
-    }
-
-    private boolean isSettingEnabled() {
-        return Settings.Global.getInt(mContext.getContentResolver(),
-                Settings.Global.ENHANCED_CONNECTIVITY_ENABLED,
-                EnhancedConnectivityPreferenceController.ENHANCED_CONNECTIVITY_ON
-                /* default on */)
-                == EnhancedConnectivityPreferenceController.ENHANCED_CONNECTIVITY_ON;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/development/WirelessDebuggingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WirelessDebuggingPreferenceControllerTest.java
index da689b7..54bd54b 100644
--- a/tests/robotests/src/com/android/settings/development/WirelessDebuggingPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/WirelessDebuggingPreferenceControllerTest.java
@@ -33,7 +33,7 @@
 
 import com.android.settings.testutils.shadow.ShadowUtils;
 import com.android.settings.testutils.shadow.ShadowWirelessDebuggingPreferenceController;
-import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settings.widget.PrimarySwitchPreference;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.After;
@@ -54,7 +54,7 @@
     @Mock
     private PreferenceScreen mScreen;
     @Mock
-    private MasterSwitchPreference mPreference;
+    private PrimarySwitchPreference mPreference;
     @Mock
     private IAdbManager mAdbManager;
     @Mock
diff --git a/tests/robotests/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceControllerTest.java
index afb1778..a12131d 100644
--- a/tests/robotests/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceControllerTest.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.development.bluetooth;
 
+import static android.bluetooth.BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST;
+
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.Mockito.never;
@@ -199,7 +201,7 @@
         verify(mBluetoothA2dpConfigStore).setSampleRate(mCodecConfigAAC.getSampleRate());
         verify(mBluetoothA2dpConfigStore).setBitsPerSample(mCodecConfigAAC.getBitsPerSample());
         verify(mBluetoothA2dpConfigStore).setChannelMode(mCodecConfigAAC.getChannelMode());
-        verify(mBluetoothA2dpConfigStore).setCodecPriority(mCodecConfigAAC.getCodecPriority());
+        verify(mBluetoothA2dpConfigStore).setCodecPriority(CODEC_PRIORITY_HIGHEST);
         verify(mBluetoothA2dpConfigStore).setCodecSpecific1Value(
                 mCodecConfigAAC.getCodecSpecific1());
     }
diff --git a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceControllerTest.java
index 372daf0..2266ed9 100644
--- a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceControllerTest.java
@@ -18,8 +18,8 @@
 
 import static com.android.settings.core.BasePreferenceController.AVAILABLE;
 import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT;
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_DEFAULT;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_OFF;
 import static com.android.settings.testutils.ApplicationTestUtils.buildInfo;
 
 import static com.google.common.truth.Truth.assertThat;
@@ -57,7 +57,7 @@
 
     private static final int DEFAULT = 0;
     private static final int PRERELEASE_DRIVER = 1;
-    private static final int GAME_DRIVER = 2;
+    private static final int PRODUCTION_DRIVER = 2;
     private static final int SYSTEM = 3;
     private static final String TEST_APP_NAME = "testApp";
     private static final String TEST_PKG_NAME = "testPkg";
@@ -99,11 +99,11 @@
     }
 
     @Test
-    public void getAvailability_developmentSettingsEnabledAndGameDriverOn_available() {
+    public void getAvailability_developmentSettingsEnabledAndProductionDriverOn_available() {
         loadDefaultConfig();
         Settings.Global.putInt(mResolver, Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1);
         Settings.Global.putInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT);
 
         assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
     }
@@ -119,7 +119,8 @@
     @Test
     public void getAvailability_graphicsDriverOff_conditionallyUnavailable() {
         loadDefaultConfig();
-        Settings.Global.putInt(mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_OFF);
+        Settings.Global.putInt(mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                UPDATABLE_DRIVER_OFF);
 
         assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
     }
@@ -157,7 +158,7 @@
     public void updateState_available_visible() {
         Settings.Global.putInt(mResolver, Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1);
         Settings.Global.putInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT);
         loadDefaultConfig();
 
         assertThat(mGroup.isVisible()).isTrue();
@@ -165,7 +166,8 @@
 
     @Test
     public void updateState_graphicsDriverOff_notVisible() {
-        Settings.Global.putInt(mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_OFF);
+        Settings.Global.putInt(mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                UPDATABLE_DRIVER_OFF);
         loadDefaultConfig();
 
         assertThat(mGroup.isVisible()).isFalse();
@@ -188,7 +190,7 @@
     }
 
     @Test
-    public void createPreference_configGAME_DRIVER_shouldSetGameDriverAttributes() {
+    public void createPreference_configProduction_DRIVER_shouldSetProductionDriverAttributes() {
         loadConfig(TEST_PKG_NAME, "", "");
         final ListPreference preference =
                 mController.createListPreference(mContext, TEST_PKG_NAME, TEST_APP_NAME);
@@ -198,9 +200,9 @@
         assertThat(preference.getDialogTitle()).isEqualTo(mDialogTitle);
         assertThat(preference.getEntries()).isEqualTo(mValueList);
         assertThat(preference.getEntryValues()).isEqualTo(mValueList);
-        assertThat(preference.getEntry()).isEqualTo(mValueList[GAME_DRIVER]);
-        assertThat(preference.getValue()).isEqualTo(mValueList[GAME_DRIVER]);
-        assertThat(preference.getSummary()).isEqualTo(mValueList[GAME_DRIVER]);
+        assertThat(preference.getEntry()).isEqualTo(mValueList[PRODUCTION_DRIVER]);
+        assertThat(preference.getValue()).isEqualTo(mValueList[PRODUCTION_DRIVER]);
+        assertThat(preference.getSummary()).isEqualTo(mValueList[PRODUCTION_DRIVER]);
     }
 
     @Test
@@ -245,9 +247,11 @@
         assertThat(preference.getEntry()).isEqualTo(mValueList[DEFAULT]);
         assertThat(preference.getValue()).isEqualTo(mValueList[DEFAULT]);
         assertThat(preference.getSummary()).isEqualTo(mValueList[DEFAULT]);
-        assertThat(Settings.Global.getString(mResolver, Settings.Global.GAME_DRIVER_OPT_IN_APPS))
+        assertThat(Settings.Global.getString(mResolver,
+                Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_IN_APPS))
                 .isEqualTo("");
-        assertThat(Settings.Global.getString(mResolver, Settings.Global.GAME_DRIVER_OPT_OUT_APPS))
+        assertThat(Settings.Global.getString(mResolver,
+                Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_OUT_APPS))
                 .isEqualTo("");
     }
 
@@ -262,25 +266,28 @@
         assertThat(preference.getValue()).isEqualTo(mValueList[PRERELEASE_DRIVER]);
         assertThat(preference.getSummary()).isEqualTo(mValueList[PRERELEASE_DRIVER]);
         assertThat(Settings.Global.getString(mResolver,
-                Settings.Global.GAME_DRIVER_PRERELEASE_OPT_IN_APPS))
+                Settings.Global.UPDATABLE_DRIVER_PRERELEASE_OPT_IN_APPS))
                 .isEqualTo(TEST_PKG_NAME);
-        assertThat(Settings.Global.getString(mResolver, Settings.Global.GAME_DRIVER_OPT_OUT_APPS))
+        assertThat(Settings.Global.getString(mResolver,
+                Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_OUT_APPS))
                 .isEqualTo("");
     }
 
     @Test
-    public void onPreferenceChange_selectGAME_DRIVER_shouldUpdateAttributesAndSettingsGlobal() {
+    public void onPreferenceChange_selectPRODUCTION_DRIVER_shouldUpdateAttrAndSettingsGlobal() {
         loadDefaultConfig();
         final ListPreference preference =
                 mController.createListPreference(mContext, TEST_PKG_NAME, TEST_APP_NAME);
-        mController.onPreferenceChange(preference, mValueList[GAME_DRIVER]);
+        mController.onPreferenceChange(preference, mValueList[PRODUCTION_DRIVER]);
 
-        assertThat(preference.getEntry()).isEqualTo(mValueList[GAME_DRIVER]);
-        assertThat(preference.getValue()).isEqualTo(mValueList[GAME_DRIVER]);
-        assertThat(preference.getSummary()).isEqualTo(mValueList[GAME_DRIVER]);
-        assertThat(Settings.Global.getString(mResolver, Settings.Global.GAME_DRIVER_OPT_IN_APPS))
+        assertThat(preference.getEntry()).isEqualTo(mValueList[PRODUCTION_DRIVER]);
+        assertThat(preference.getValue()).isEqualTo(mValueList[PRODUCTION_DRIVER]);
+        assertThat(preference.getSummary()).isEqualTo(mValueList[PRODUCTION_DRIVER]);
+        assertThat(Settings.Global.getString(mResolver,
+                Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_IN_APPS))
                 .isEqualTo(TEST_PKG_NAME);
-        assertThat(Settings.Global.getString(mResolver, Settings.Global.GAME_DRIVER_OPT_OUT_APPS))
+        assertThat(Settings.Global.getString(mResolver,
+                Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_OUT_APPS))
                 .isEqualTo("");
     }
 
@@ -294,9 +301,11 @@
         assertThat(preference.getEntry()).isEqualTo(mValueList[SYSTEM]);
         assertThat(preference.getValue()).isEqualTo(mValueList[SYSTEM]);
         assertThat(preference.getSummary()).isEqualTo(mValueList[SYSTEM]);
-        assertThat(Settings.Global.getString(mResolver, Settings.Global.GAME_DRIVER_OPT_IN_APPS))
+        assertThat(Settings.Global.getString(mResolver,
+                Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_IN_APPS))
                 .isEqualTo("");
-        assertThat(Settings.Global.getString(mResolver, Settings.Global.GAME_DRIVER_OPT_OUT_APPS))
+        assertThat(Settings.Global.getString(mResolver,
+                Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_OUT_APPS))
                 .isEqualTo(TEST_PKG_NAME);
     }
 
@@ -320,10 +329,13 @@
     }
 
     private void loadConfig(String optIn, String prereleaseOptIn, String optOut) {
-        Settings.Global.putString(mResolver, Settings.Global.GAME_DRIVER_OPT_IN_APPS, optIn);
+        Settings.Global.putString(mResolver,
+                Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_IN_APPS, optIn);
         Settings.Global.putString(
-                mResolver, Settings.Global.GAME_DRIVER_PRERELEASE_OPT_IN_APPS, prereleaseOptIn);
-        Settings.Global.putString(mResolver, Settings.Global.GAME_DRIVER_OPT_OUT_APPS, optOut);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_PRERELEASE_OPT_IN_APPS,
+                prereleaseOptIn);
+        Settings.Global.putString(
+                mResolver, Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_OUT_APPS, optOut);
 
         mController = new GraphicsDriverAppPreferenceController(mContext, "testKey");
         mController.mEntryList = mContext.getResources().getStringArray(
diff --git a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverContentObserverTest.java b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverContentObserverTest.java
index b6bf4a7..4beca0b 100644
--- a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverContentObserverTest.java
+++ b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverContentObserverTest.java
@@ -58,7 +58,7 @@
         mGraphicsDriverContentObserver.register(mResolver);
 
         verify(mResolver).registerContentObserver(
-                Settings.Global.getUriFor(Settings.Global.GAME_DRIVER_ALL_APPS), false,
+                Settings.Global.getUriFor(Settings.Global.UPDATABLE_DRIVER_ALL_APPS), false,
                 mGraphicsDriverContentObserver);
     }
 
diff --git a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverDashboardTest.java b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverDashboardTest.java
index 838f47b..df8a438 100644
--- a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverDashboardTest.java
+++ b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverDashboardTest.java
@@ -45,7 +45,7 @@
     @Test
     public void getMetricesCategory_shouldReturnGraphicsDriverDashboard() {
         assertThat(mDashboard.getMetricsCategory())
-                .isEqualTo(SettingsEnums.SETTINGS_GAME_DRIVER_DASHBOARD);
+                .isEqualTo(SettingsEnums.SETTINGS_GRAPHICS_DRIVER_DASHBOARD);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceControllerTest.java
index 920e9d1..e24b9e5 100644
--- a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceControllerTest.java
@@ -18,10 +18,10 @@
 
 import static com.android.settings.core.BasePreferenceController.AVAILABLE;
 import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_ALL_APPS;
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT;
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF;
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_PRERELEASE_ALL_APPS;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_DEFAULT;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_OFF;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_PRERELEASE_ALL_APPS;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_PRODUCTION_ALL_APPS;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -61,7 +61,7 @@
     private ContentResolver mResolver;
     private GraphicsDriverEnableForAllAppsPreferenceController mController;
     private String mPreferenceDefault;
-    private String mPreferenceGameDriver;
+    private String mPreferenceProductionDriver;
     private String mPreferencePrereleaseDriver;
 
     @Before
@@ -72,14 +72,14 @@
 
         final Resources resources = mContext.getResources();
         mPreferenceDefault = resources.getString(R.string.graphics_driver_app_preference_default);
-        mPreferenceGameDriver =
-                resources.getString(R.string.graphics_driver_app_preference_game_driver);
+        mPreferenceProductionDriver =
+                resources.getString(R.string.graphics_driver_app_preference_production_driver);
         mPreferencePrereleaseDriver =
                 resources.getString(R.string.graphics_driver_app_preference_prerelease_driver);
 
         Settings.Global.putInt(mResolver, Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1);
         Settings.Global.putInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT);
 
         mController = new GraphicsDriverEnableForAllAppsPreferenceController(mContext, "testKey");
         mController.mEntryList = mContext.getResources().getStringArray(
@@ -89,9 +89,9 @@
     }
 
     @Test
-    public void getAvailability_developmentSettingsEnabledAndGameDriverSettingsOn_available() {
+    public void getAvailability_developmentSettingsEnabledAndUpdatableDriverSettingsOn_available() {
         Settings.Global.putInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT);
 
         assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
     }
@@ -104,8 +104,9 @@
     }
 
     @Test
-    public void getAvailability_gameDriverOff_conditionallyUnavailable() {
-        Settings.Global.putInt(mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_OFF);
+    public void getAvailability_updatableDriverOff_conditionallyUnavailable() {
+        Settings.Global.putInt(mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                UPDATABLE_DRIVER_OFF);
 
         assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
     }
@@ -113,7 +114,7 @@
     @Test
     public void displayPreference_shouldAddListPreference() {
         Settings.Global.putInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT);
         mController.updateState(mPreference);
 
         verify(mPreference).setValue(mPreferenceDefault);
@@ -139,7 +140,7 @@
     @Test
     public void updateState_availableAndDefault_visibleAndDefault() {
         Settings.Global.putInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT);
         mController.updateState(mPreference);
 
         verify(mPreference, atLeastOnce()).setVisible(true);
@@ -148,20 +149,22 @@
     }
 
     @Test
-    public void updateState_availableAndGameDriver_visibleAndGameDriver() {
+    public void updateState_availableAndProductionDriver_visibleAndProductionDriver() {
         Settings.Global.putInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_ALL_APPS);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                UPDATABLE_DRIVER_PRODUCTION_ALL_APPS);
         mController.updateState(mPreference);
 
         verify(mPreference, atLeastOnce()).setVisible(true);
-        verify(mPreference).setValue(mPreferenceGameDriver);
-        verify(mPreference).setSummary(mPreferenceGameDriver);
+        verify(mPreference).setValue(mPreferenceProductionDriver);
+        verify(mPreference).setSummary(mPreferenceProductionDriver);
     }
 
     @Test
     public void updateState_availableAndPrereleaseDriver_visibleAndPrereleaseDriver() {
         Settings.Global.putInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_PRERELEASE_ALL_APPS);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                UPDATABLE_DRIVER_PRERELEASE_ALL_APPS);
         mController.updateState(mPreference);
 
         verify(mPreference, atLeastOnce()).setVisible(true);
@@ -170,8 +173,9 @@
     }
 
     @Test
-    public void updateState_gameDriverOff_notVisibleAndSystemDriver() {
-        Settings.Global.putInt(mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_OFF);
+    public void updateState_updatableDriverOff_notVisibleAndSystemDriver() {
+        Settings.Global.putInt(mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                UPDATABLE_DRIVER_OFF);
         mController.updateState(mPreference);
 
         verify(mPreference).setVisible(false);
@@ -182,33 +186,35 @@
     @Test
     public void onPreferenceChange_default_shouldUpdateSettingsGlobal() {
         Settings.Global.putInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_ALL_APPS);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                UPDATABLE_DRIVER_PRODUCTION_ALL_APPS);
         mController.onPreferenceChange(mPreference, mPreferenceDefault);
 
         assertThat(Settings.Global.getInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT))
-                .isEqualTo(GAME_DRIVER_DEFAULT);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                UPDATABLE_DRIVER_DEFAULT))
+                .isEqualTo(UPDATABLE_DRIVER_DEFAULT);
     }
 
     @Test
-    public void onPreferenceChange_gameDriver_shouldUpdateSettingsGlobal() {
+    public void onPreferenceChange_updatableDriver_shouldUpdateSettingsGlobal() {
         Settings.Global.putInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
-        mController.onPreferenceChange(mPreference, mPreferenceGameDriver);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT);
+        mController.onPreferenceChange(mPreference, mPreferenceProductionDriver);
 
         assertThat(Settings.Global.getInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT))
-                .isEqualTo(GAME_DRIVER_ALL_APPS);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT))
+                .isEqualTo(UPDATABLE_DRIVER_PRODUCTION_ALL_APPS);
     }
 
     @Test
     public void onPreferenceChange_prereleaseDriver_shouldUpdateSettingsGlobal() {
         Settings.Global.putInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT);
         mController.onPreferenceChange(mPreference, mPreferencePrereleaseDriver);
 
         assertThat(Settings.Global.getInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT))
-                .isEqualTo(GAME_DRIVER_PRERELEASE_ALL_APPS);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT))
+                .isEqualTo(UPDATABLE_DRIVER_PRERELEASE_ALL_APPS);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverFooterPreferenceControllerTest.java
index a2d23b6..1e4c496 100644
--- a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverFooterPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverFooterPreferenceControllerTest.java
@@ -18,9 +18,9 @@
 
 import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;
 import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_ALL_APPS;
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT;
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_DEFAULT;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_OFF;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_PRODUCTION_ALL_APPS;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -68,24 +68,26 @@
     }
 
     @Test
-    public void getAvailabilityStatus_gameDriverOff_availableUnsearchable() {
-        Settings.Global.putInt(mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_OFF);
+    public void getAvailabilityStatus_updatableDriverOff_availableUnsearchable() {
+        Settings.Global.putInt(mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                UPDATABLE_DRIVER_OFF);
 
         assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE_UNSEARCHABLE);
     }
 
     @Test
-    public void getAvailabilityStatus_gameDriverDefault_conditionallyUnavailable() {
+    public void getAvailabilityStatus_updatableDriverDefault_conditionallyUnavailable() {
         Settings.Global.putInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT);
 
         assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
     }
 
     @Test
-    public void getAvailabilityStatus_gameDriverAllApps_conditionallyUnavailable() {
+    public void getAvailabilityStatus_updatableProductionDriverAllApps_conditionallyUnavailable() {
         Settings.Global.putInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_ALL_APPS);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                UPDATABLE_DRIVER_PRODUCTION_ALL_APPS);
 
         assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
     }
diff --git a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverGlobalSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverGlobalSwitchBarControllerTest.java
index 7d4ee45..838703d 100644
--- a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverGlobalSwitchBarControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverGlobalSwitchBarControllerTest.java
@@ -16,8 +16,8 @@
 
 package com.android.settings.development.graphicsdriver;
 
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT;
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_DEFAULT;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_OFF;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -61,9 +61,9 @@
     }
 
     @Test
-    public void constructor_gameDriverOn_shouldCheckSwitchBar() {
+    public void constructor_updatableDriverOn_shouldCheckSwitchBar() {
         Settings.Global.putInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT);
         mController = new GraphicsDriverGlobalSwitchBarController(
                 mContext, new SwitchBarController(mSwitchBar));
 
@@ -71,8 +71,9 @@
     }
 
     @Test
-    public void constructor_gameDriverOff_shouldUncheckSwitchBar() {
-        Settings.Global.putInt(mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_OFF);
+    public void constructor_updatableDriverOff_shouldUncheckSwitchBar() {
+        Settings.Global.putInt(mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                UPDATABLE_DRIVER_OFF);
         mController = new GraphicsDriverGlobalSwitchBarController(
                 mContext, new SwitchBarController(mSwitchBar));
 
@@ -122,27 +123,30 @@
     }
 
     @Test
-    public void onSwitchToggled_checked_shouldTurnOnGameDriver() {
-        Settings.Global.putInt(mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_OFF);
+    public void onSwitchToggled_checked_shouldTurnOnUpdatableDriver() {
+        Settings.Global.putInt(mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                UPDATABLE_DRIVER_OFF);
         mController = new GraphicsDriverGlobalSwitchBarController(
                 mContext, new SwitchBarController(mSwitchBar));
         mController.onSwitchToggled(true);
 
         assertThat(Settings.Global.getInt(
-                           mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT))
-                .isEqualTo(GAME_DRIVER_DEFAULT);
+                           mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                           UPDATABLE_DRIVER_DEFAULT))
+                .isEqualTo(UPDATABLE_DRIVER_DEFAULT);
     }
 
     @Test
-    public void onSwitchToggled_unchecked_shouldTurnOffGameDriver() {
+    public void onSwitchToggled_unchecked_shouldTurnOffUpdatableDriver() {
         Settings.Global.putInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT);
         mController = new GraphicsDriverGlobalSwitchBarController(
                 mContext, new SwitchBarController(mSwitchBar));
         mController.onSwitchToggled(false);
 
         assertThat(Settings.Global.getInt(
-                           mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT))
-                .isEqualTo(GAME_DRIVER_OFF);
+                           mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                           UPDATABLE_DRIVER_DEFAULT))
+                .isEqualTo(UPDATABLE_DRIVER_OFF);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoPreferenceControllerTest.java
index 291f6e2..c7c7669 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoPreferenceControllerTest.java
@@ -24,7 +24,6 @@
 import androidx.preference.PreferenceManager;
 import androidx.preference.PreferenceScreen;
 
-import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.deviceinfo.HardwareInfoPreferenceController;
 
@@ -79,8 +78,6 @@
     }
 
     private boolean containBuildModel(CharSequence result) {
-        final String oracle = mContext.getResources().getString(R.string.model_summary,
-                Build.MODEL);
-        return result.toString().contains(oracle);
+        return result.toString().contains(Build.MODEL);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java
index 2fb2a3d..26444ea 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java
@@ -142,7 +142,6 @@
         verify(mDialog).removeViewFromScreen(ID_GSM_SETTINGS);
     }
 
-
     @Test
     public void populateImeiInfo_cdmaSimPresent_shouldSetImeiInfoAndSetAllCdmaSetting() {
         ReflectionHelpers.setField(mController, "mSubscriptionInfo", null);
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java
index 70620bc..d1371a2 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java
@@ -42,7 +42,7 @@
 import com.android.settings.deletionhelper.ActivationWarningFragment;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settings.widget.PrimarySwitchPreference;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -60,7 +60,7 @@
     @Mock
     private PreferenceScreen mScreen;
     @Mock
-    private MasterSwitchPreference mPreference;
+    private PrimarySwitchPreference mPreference;
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mMockContext;
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/display/AdaptiveSleepDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AdaptiveSleepDetailPreferenceControllerTest.java
index 981942d..fe0e812 100644
--- a/tests/robotests/src/com/android/settings/display/AdaptiveSleepDetailPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/AdaptiveSleepDetailPreferenceControllerTest.java
@@ -21,15 +21,26 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.pm.PackageManager;
+import android.os.UserHandle;
+import android.os.UserManager;
 
 import com.android.internal.R;
+import com.android.settings.bluetooth.RestrictionUtils;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
+import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedSwitchPreference;
 
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -42,17 +53,32 @@
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = {SettingsShadowResources.class})
 public class AdaptiveSleepDetailPreferenceControllerTest {
+    private static RestrictedLockUtils.EnforcedAdmin sFakeEnforcedAdmin;
+
+    @BeforeClass
+    public static void beforeClass() {
+        sFakeEnforcedAdmin = new RestrictedLockUtils.EnforcedAdmin(
+                new ComponentName("test.package", "test.Class"),
+                UserHandle.of(10));
+    }
 
     private AdaptiveSleepDetailPreferenceController mController;
     @Mock
     private PackageManager mPackageManager;
+    @Mock
+    private RestrictionUtils mRestrictionUtils;
+    @Mock
+    private RestrictedSwitchPreference mPreference;
+
+    private Context mContext;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        Context context = Mockito.spy(RuntimeEnvironment.application);
-        doReturn(mPackageManager).when(context).getPackageManager();
-        mController = new AdaptiveSleepDetailPreferenceController(context, "test_key");
+        mContext = Mockito.spy(RuntimeEnvironment.application);
+        doReturn(mPackageManager).when(mContext).getPackageManager();
+        mController = new AdaptiveSleepDetailPreferenceController(mContext, "test_key",
+                mRestrictionUtils);
     }
 
     @Test
@@ -77,4 +103,25 @@
         SettingsShadowResources.overrideResource(R.bool.config_adaptive_sleep_available, false);
         assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
     }
+
+    @Test
+    public void updateState_noRestriction_allowScreenAttentionSet() {
+        when(mRestrictionUtils.checkIfRestrictionEnforced(mContext,
+                UserManager.DISALLOW_CONFIG_SCREEN_TIMEOUT)).thenReturn(null);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference, never()).setDisabledByAdmin(
+                any(RestrictedLockUtils.EnforcedAdmin.class));
+    }
+
+    @Test
+    public void updateState_enforceRestrictions_disallowScreenAttentionSet() {
+        when(mRestrictionUtils.checkIfRestrictionEnforced(mContext,
+                UserManager.DISALLOW_CONFIG_SCREEN_TIMEOUT)).thenReturn(sFakeEnforcedAdmin);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setDisabledByAdmin(sFakeEnforcedAdmin);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java
index d6ad52d2..a8893ea 100644
--- a/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java
@@ -73,22 +73,63 @@
     }
 
     @Test
-    public void isAvailable_wallpaperPickerEnabled_shouldReturnTrue() {
+    public void isAvailable_wallpaperPickerEnabledAndStylePickerEnabled_returnsTrue() {
         mShadowPackageManager.setResolveInfosForIntent(
                 mWallpaperIntent, Lists.newArrayList(mock(ResolveInfo.class)));
+        mShadowPackageManager.setResolveInfosForIntent(
+                mStylesAndWallpaperIntent, Lists.newArrayList(mock(ResolveInfo.class)));
 
         assertThat(mController.isAvailable()).isTrue();
     }
 
     @Test
-    public void isAvailable_wallpaperPickerDisabled_shouldReturnFalse() {
+    public void isAvailable_wallpaperPickerEnabledAndStylePickerDisabled_returnsTrue() {
+        mShadowPackageManager.setResolveInfosForIntent(
+                mWallpaperIntent, Lists.newArrayList(mock(ResolveInfo.class)));
+        mShadowPackageManager.setResolveInfosForIntent(
+                mStylesAndWallpaperIntent, Lists.newArrayList());
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_wallpaperPickerDisabledAndStylePickerEnabled_returnsTrue() {
         mShadowPackageManager.setResolveInfosForIntent(
                 mWallpaperIntent, Lists.newArrayList());
+        mShadowPackageManager.setResolveInfosForIntent(
+                mStylesAndWallpaperIntent, Lists.newArrayList(mock(ResolveInfo.class)));
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_wallpaperPickerDisabledAndStylePickerDisabled_returnsFalse() {
+        mShadowPackageManager.setResolveInfosForIntent(
+                mWallpaperIntent, Lists.newArrayList());
+        mShadowPackageManager.setResolveInfosForIntent(
+                mStylesAndWallpaperIntent, Lists.newArrayList());
 
         assertThat(mController.isAvailable()).isFalse();
     }
 
     @Test
+    public void getComponentClassString_stylesAvailable_returnsStylePickerClassString() {
+        mShadowPackageManager.setResolveInfosForIntent(
+                mStylesAndWallpaperIntent,
+                Lists.newArrayList(mock(ResolveInfo.class)));
+        assertThat(mController.getComponentClassString())
+                .isEqualTo(mContext.getString(R.string.config_styles_and_wallpaper_picker_class));
+    }
+
+    @Test
+    public void getComponentClassString_stylesUnavailable_returnsWallpaperPickerClassString() {
+        mShadowPackageManager.setResolveInfosForIntent(
+                mStylesAndWallpaperIntent, Lists.newArrayList());
+        assertThat(mController.getComponentClassString())
+                .isEqualTo(mContext.getString(R.string.config_wallpaper_picker_class));
+    }
+
+    @Test
     public void areStylesAvailable_noComponentSpecified() {
         SettingsShadowResources.overrideResource(
                 R.string.config_styles_and_wallpaper_picker_class, "");
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
index f539350..b6b594c 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
@@ -66,24 +66,30 @@
 @RunWith(RobolectricTestRunner.class)
 public class EnterprisePrivacyFeatureProviderImplTest {
 
-    private final ComponentName OWNER = new ComponentName("dummy", "component");
-    private final ComponentName ADMIN_1 = new ComponentName("dummy", "admin1");
-    private final ComponentName ADMIN_2 = new ComponentName("dummy", "admin2");
-    private final String OWNER_ORGANIZATION = new String("ACME");
-    private final Date TIMESTAMP = new Date(2011, 11, 11);
-    private final int MY_USER_ID = UserHandle.myUserId();
-    private final int MANAGED_PROFILE_USER_ID = MY_USER_ID + 1;
-    private final String VPN_PACKAGE_ID = "com.example.vpn";
-    private final String IME_PACKAGE_ID = "com.example.ime";
-    private final String IME_PACKAGE_LABEL = "Test IME";
+    private static final String OWNER_ORGANIZATION = "ACME";
+    private static final String VPN_PACKAGE_ID = "com.example.vpn";
+    private static final String IME_PACKAGE_ID = "com.example.ime";
+    private static final String IME_PACKAGE_LABEL = "Test IME";
+
+    private final ComponentName mOwner = new ComponentName("mock", "component");
+    private final ComponentName mAdmin1 = new ComponentName("mock", "admin1");
+    private final ComponentName mAdmin2 = new ComponentName("mock", "admin2");
+    private final Date mDate = new Date(2011, 11, 11);
+    private final int mUserId = UserHandle.myUserId();
+    private final int mManagedProfileUserId = mUserId + 1;
 
     private List<UserInfo> mProfiles = new ArrayList<>();
 
-    private @Mock Context mContext;
-    private @Mock DevicePolicyManager mDevicePolicyManager;
-    private @Mock PackageManager mPackageManager;
-    private @Mock UserManager mUserManager;
-    private @Mock ConnectivityManager mConnectivityManger;
+    @Mock
+    private Context mContext;
+    @Mock
+    private DevicePolicyManager mDevicePolicyManager;
+    @Mock
+    private PackageManager mPackageManager;
+    @Mock
+    private UserManager mUserManager;
+    @Mock
+    private ConnectivityManager mConnectivityManger;
     private Resources mResources;
 
     private EnterprisePrivacyFeatureProvider mProvider;
@@ -94,8 +100,8 @@
 
         when(mContext.getApplicationContext()).thenReturn(mContext);
         resetAndInitializePackageManager();
-        when(mUserManager.getProfiles(MY_USER_ID)).thenReturn(mProfiles);
-        mProfiles.add(new UserInfo(MY_USER_ID, "", "", 0 /* flags */));
+        when(mUserManager.getProfiles(mUserId)).thenReturn(mProfiles);
+        mProfiles.add(new UserInfo(mUserId, "", "", 0 /* flags */));
         mResources = RuntimeEnvironment.application.getResources();
 
         mProvider = new EnterprisePrivacyFeatureProviderImpl(mContext, mDevicePolicyManager,
@@ -107,16 +113,16 @@
         when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(null);
         assertThat(mProvider.hasDeviceOwner()).isFalse();
 
-        when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(OWNER);
+        when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(mOwner);
         assertThat(mProvider.hasDeviceOwner()).isTrue();
     }
 
     @Test
     public void testIsInCompMode() {
-        when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(OWNER);
+        when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(mOwner);
         assertThat(mProvider.isInCompMode()).isFalse();
 
-        mProfiles.add(new UserInfo(MANAGED_PROFILE_USER_ID, "", "", UserInfo.FLAG_MANAGED_PROFILE));
+        mProfiles.add(new UserInfo(mManagedProfileUserId, "", "", UserInfo.FLAG_MANAGED_PROFILE));
         assertThat(mProvider.isInCompMode()).isTrue();
     }
 
@@ -139,7 +145,7 @@
         disclosure.append(mResources.getString(R.string.do_disclosure_learn_more_separator));
         disclosure.append(mResources.getString(R.string.learn_more),
                 new EnterprisePrivacyFeatureProviderImpl.EnterprisePrivacySpan(mContext), 0);
-        when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(OWNER);
+        when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(mOwner);
         when(mDevicePolicyManager.getDeviceOwnerOrganizationName()).thenReturn(null);
         assertThat(mProvider.getDeviceOwnerDisclosure()).isEqualTo(disclosure);
 
@@ -159,8 +165,8 @@
         assertThat(mProvider.getLastSecurityLogRetrievalTime()).isNull();
 
         when(mDevicePolicyManager.getLastSecurityLogRetrievalTime())
-                .thenReturn(TIMESTAMP.getTime());
-        assertThat(mProvider.getLastSecurityLogRetrievalTime()).isEqualTo(TIMESTAMP);
+                .thenReturn(mDate.getTime());
+        assertThat(mProvider.getLastSecurityLogRetrievalTime()).isEqualTo(mDate);
     }
 
     @Test
@@ -168,8 +174,8 @@
         when(mDevicePolicyManager.getLastBugReportRequestTime()).thenReturn(-1L);
         assertThat(mProvider.getLastBugReportRequestTime()).isNull();
 
-        when(mDevicePolicyManager.getLastBugReportRequestTime()).thenReturn(TIMESTAMP.getTime());
-        assertThat(mProvider.getLastBugReportRequestTime()).isEqualTo(TIMESTAMP);
+        when(mDevicePolicyManager.getLastBugReportRequestTime()).thenReturn(mDate.getTime());
+        assertThat(mProvider.getLastBugReportRequestTime()).isEqualTo(mDate);
     }
 
     @Test
@@ -177,8 +183,8 @@
         when(mDevicePolicyManager.getLastNetworkLogRetrievalTime()).thenReturn(-1L);
         assertThat(mProvider.getLastNetworkLogRetrievalTime()).isNull();
 
-        when(mDevicePolicyManager.getLastNetworkLogRetrievalTime()).thenReturn(TIMESTAMP.getTime());
-        assertThat(mProvider.getLastNetworkLogRetrievalTime()).isEqualTo(TIMESTAMP);
+        when(mDevicePolicyManager.getLastNetworkLogRetrievalTime()).thenReturn(mDate.getTime());
+        assertThat(mProvider.getLastNetworkLogRetrievalTime()).isEqualTo(mDate);
     }
 
     @Test
@@ -201,10 +207,10 @@
 
     @Test
     public void testIsAlwaysOnVpnSetInCurrentUser() {
-        when(mConnectivityManger.getAlwaysOnVpnPackageForUser(MY_USER_ID)).thenReturn(null);
+        when(mConnectivityManger.getAlwaysOnVpnPackageForUser(mUserId)).thenReturn(null);
         assertThat(mProvider.isAlwaysOnVpnSetInCurrentUser()).isFalse();
 
-        when(mConnectivityManger.getAlwaysOnVpnPackageForUser(MY_USER_ID))
+        when(mConnectivityManger.getAlwaysOnVpnPackageForUser(mUserId))
                 .thenReturn(VPN_PACKAGE_ID);
         assertThat(mProvider.isAlwaysOnVpnSetInCurrentUser()).isTrue();
     }
@@ -213,13 +219,13 @@
     public void testIsAlwaysOnVpnSetInManagedProfileProfile() {
         assertThat(mProvider.isAlwaysOnVpnSetInManagedProfile()).isFalse();
 
-        mProfiles.add(new UserInfo(MANAGED_PROFILE_USER_ID, "", "", UserInfo.FLAG_MANAGED_PROFILE));
+        mProfiles.add(new UserInfo(mManagedProfileUserId, "", "", UserInfo.FLAG_MANAGED_PROFILE));
 
-        when(mConnectivityManger.getAlwaysOnVpnPackageForUser(MANAGED_PROFILE_USER_ID))
+        when(mConnectivityManger.getAlwaysOnVpnPackageForUser(mManagedProfileUserId))
                 .thenReturn(null);
         assertThat(mProvider.isAlwaysOnVpnSetInManagedProfile()).isFalse();
 
-        when(mConnectivityManger.getAlwaysOnVpnPackageForUser(MANAGED_PROFILE_USER_ID))
+        when(mConnectivityManger.getAlwaysOnVpnPackageForUser(mManagedProfileUserId))
                 .thenReturn(VPN_PACKAGE_ID);
         assertThat(mProvider.isAlwaysOnVpnSetInManagedProfile()).isTrue();
     }
@@ -230,34 +236,34 @@
         assertThat(mProvider.isGlobalHttpProxySet()).isFalse();
 
         when(mConnectivityManger.getGlobalProxy())
-            .thenReturn(ProxyInfo.buildDirectProxy("localhost", 123));
+                .thenReturn(ProxyInfo.buildDirectProxy("localhost", 123));
         assertThat(mProvider.isGlobalHttpProxySet()).isTrue();
     }
 
     @Test
     public void testGetMaximumFailedPasswordsForWipeInCurrentUser() {
         when(mDevicePolicyManager.getDeviceOwnerComponentOnCallingUser()).thenReturn(null);
-        when(mDevicePolicyManager.getProfileOwnerAsUser(MY_USER_ID)).thenReturn(null);
-        when(mDevicePolicyManager.getMaximumFailedPasswordsForWipe(OWNER, MY_USER_ID))
+        when(mDevicePolicyManager.getProfileOwnerAsUser(mUserId)).thenReturn(null);
+        when(mDevicePolicyManager.getMaximumFailedPasswordsForWipe(mOwner, mUserId))
                 .thenReturn(10);
         assertThat(mProvider.getMaximumFailedPasswordsBeforeWipeInCurrentUser()).isEqualTo(0);
 
-        when(mDevicePolicyManager.getProfileOwnerAsUser(MY_USER_ID)).thenReturn(OWNER);
+        when(mDevicePolicyManager.getProfileOwnerAsUser(mUserId)).thenReturn(mOwner);
         assertThat(mProvider.getMaximumFailedPasswordsBeforeWipeInCurrentUser()).isEqualTo(10);
 
-        when(mDevicePolicyManager.getDeviceOwnerComponentOnCallingUser()).thenReturn(OWNER);
-        when(mDevicePolicyManager.getProfileOwnerAsUser(MY_USER_ID)).thenReturn(null);
+        when(mDevicePolicyManager.getDeviceOwnerComponentOnCallingUser()).thenReturn(mOwner);
+        when(mDevicePolicyManager.getProfileOwnerAsUser(mUserId)).thenReturn(null);
         assertThat(mProvider.getMaximumFailedPasswordsBeforeWipeInCurrentUser()).isEqualTo(10);
     }
 
     @Test
     public void testGetMaximumFailedPasswordsForWipeInManagedProfile() {
-        when(mDevicePolicyManager.getProfileOwnerAsUser(MANAGED_PROFILE_USER_ID)).thenReturn(OWNER);
-        when(mDevicePolicyManager.getMaximumFailedPasswordsForWipe(OWNER, MANAGED_PROFILE_USER_ID))
+        when(mDevicePolicyManager.getProfileOwnerAsUser(mManagedProfileUserId)).thenReturn(mOwner);
+        when(mDevicePolicyManager.getMaximumFailedPasswordsForWipe(mOwner, mManagedProfileUserId))
                 .thenReturn(10);
         assertThat(mProvider.getMaximumFailedPasswordsBeforeWipeInManagedProfile()).isEqualTo(0);
 
-        mProfiles.add(new UserInfo(MANAGED_PROFILE_USER_ID, "", "", UserInfo.FLAG_MANAGED_PROFILE));
+        mProfiles.add(new UserInfo(mManagedProfileUserId, "", "", UserInfo.FLAG_MANAGED_PROFILE));
         assertThat(mProvider.getMaximumFailedPasswordsBeforeWipeInManagedProfile()).isEqualTo(10);
     }
 
@@ -267,7 +273,7 @@
         when(applicationInfo.loadLabel(mPackageManager)).thenReturn(IME_PACKAGE_LABEL);
 
         Settings.Secure.putString(null, Settings.Secure.DEFAULT_INPUT_METHOD, IME_PACKAGE_ID);
-        when(mPackageManager.getApplicationInfoAsUser(IME_PACKAGE_ID, 0, MY_USER_ID))
+        when(mPackageManager.getApplicationInfoAsUser(IME_PACKAGE_ID, 0, mUserId))
                 .thenReturn(applicationInfo);
 
         // IME not set by Device Owner.
@@ -281,13 +287,13 @@
 
         // Device Owner set IME to nonexistent package.
         Settings.Secure.putString(null, Settings.Secure.DEFAULT_INPUT_METHOD, IME_PACKAGE_ID);
-        when(mPackageManager.getApplicationInfoAsUser(IME_PACKAGE_ID, 0, MY_USER_ID))
+        when(mPackageManager.getApplicationInfoAsUser(IME_PACKAGE_ID, 0, mUserId))
                 .thenThrow(new PackageManager.NameNotFoundException());
         assertThat(mProvider.getImeLabelIfOwnerSet()).isNull();
 
         // Device Owner set IME to existent package.
         resetAndInitializePackageManager();
-        when(mPackageManager.getApplicationInfoAsUser(IME_PACKAGE_ID, 0, MY_USER_ID))
+        when(mPackageManager.getApplicationInfoAsUser(IME_PACKAGE_ID, 0, mUserId))
                 .thenReturn(applicationInfo);
         assertThat(mProvider.getImeLabelIfOwnerSet()).isEqualTo(IME_PACKAGE_LABEL);
     }
@@ -295,7 +301,7 @@
     @Test
     public void testGetNumberOfOwnerInstalledCaCertsForCurrent() {
         final UserHandle userHandle = new UserHandle(UserHandle.USER_SYSTEM);
-        final UserHandle managedProfileUserHandle = new UserHandle(MANAGED_PROFILE_USER_ID);
+        final UserHandle managedProfileUserHandle = new UserHandle(mManagedProfileUserId);
 
         when(mDevicePolicyManager.getOwnerInstalledCaCerts(managedProfileUserHandle))
                 .thenReturn(Arrays.asList("ca1", "ca2"));
@@ -317,9 +323,9 @@
     @Test
     public void testGetNumberOfOwnerInstalledCaCertsForManagedProfile() {
         final UserHandle userHandle = new UserHandle(UserHandle.USER_SYSTEM);
-        final UserHandle managedProfileUserHandle = new UserHandle(MANAGED_PROFILE_USER_ID);
+        final UserHandle managedProfileUserHandle = new UserHandle(mManagedProfileUserId);
         final UserInfo managedProfile =
-                new UserInfo(MANAGED_PROFILE_USER_ID, "", "", UserInfo.FLAG_MANAGED_PROFILE);
+                new UserInfo(mManagedProfileUserId, "", "", UserInfo.FLAG_MANAGED_PROFILE);
 
         // Without a profile
         when(mDevicePolicyManager.getOwnerInstalledCaCerts(managedProfileUserHandle))
@@ -345,15 +351,15 @@
 
     @Test
     public void testGetNumberOfActiveDeviceAdminsForCurrentUserAndManagedProfile() {
-        when(mDevicePolicyManager.getActiveAdminsAsUser(MY_USER_ID))
-                .thenReturn(Arrays.asList(ADMIN_1, ADMIN_2));
-        when(mDevicePolicyManager.getActiveAdminsAsUser(MANAGED_PROFILE_USER_ID))
-                .thenReturn(Arrays.asList(ADMIN_1));
+        when(mDevicePolicyManager.getActiveAdminsAsUser(mUserId))
+                .thenReturn(Arrays.asList(mAdmin1, mAdmin2));
+        when(mDevicePolicyManager.getActiveAdminsAsUser(mManagedProfileUserId))
+                .thenReturn(Arrays.asList(mAdmin1));
 
         assertThat(mProvider.getNumberOfActiveDeviceAdminsForCurrentUserAndManagedProfile())
                 .isEqualTo(2);
 
-        mProfiles.add(new UserInfo(MANAGED_PROFILE_USER_ID, "", "", UserInfo.FLAG_MANAGED_PROFILE));
+        mProfiles.add(new UserInfo(mManagedProfileUserId, "", "", UserInfo.FLAG_MANAGED_PROFILE));
         assertThat(mProvider.getNumberOfActiveDeviceAdminsForCurrentUserAndManagedProfile())
                 .isEqualTo(3);
     }
@@ -362,7 +368,7 @@
     public void workPolicyInfo_unmanagedDevice_shouldDoNothing() {
         // Even if we have the intent resolved, don't show it if there's no DO or PO
         when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(null);
-        addWorkPolicyInfoIntent(OWNER.getPackageName(), true, false);
+        addWorkPolicyInfoIntent(mOwner.getPackageName(), true, false);
         assertThat(mProvider.hasWorkPolicyInfo()).isFalse();
 
         assertThat(mProvider.showWorkPolicyInfo()).isFalse();
@@ -372,12 +378,12 @@
     @Test
     public void workPolicyInfo_deviceOwner_shouldResolveIntent() {
         // If the intent is not resolved, then there's no info to show for DO
-        when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(OWNER);
+        when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(mOwner);
         assertThat(mProvider.hasWorkPolicyInfo()).isFalse();
         assertThat(mProvider.showWorkPolicyInfo()).isFalse();
 
         // If the intent is resolved, then we can use it to launch the activity
-        Intent intent = addWorkPolicyInfoIntent(OWNER.getPackageName(), true, false);
+        Intent intent = addWorkPolicyInfoIntent(mOwner.getPackageName(), true, false);
         assertThat(mProvider.hasWorkPolicyInfo()).isTrue();
         assertThat(mProvider.showWorkPolicyInfo()).isTrue();
         verify(mContext).startActivity(intentEquals(intent));
@@ -386,35 +392,35 @@
     @Test
     public void workPolicyInfo_profileOwner_shouldResolveIntent() {
         when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(null);
-        mProfiles.add(new UserInfo(MANAGED_PROFILE_USER_ID, "", "", UserInfo.FLAG_MANAGED_PROFILE));
-        when(mDevicePolicyManager.getProfileOwnerAsUser(MANAGED_PROFILE_USER_ID)).thenReturn(OWNER);
+        mProfiles.add(new UserInfo(mManagedProfileUserId, "", "", UserInfo.FLAG_MANAGED_PROFILE));
+        when(mDevicePolicyManager.getProfileOwnerAsUser(mManagedProfileUserId)).thenReturn(mOwner);
 
         // If the intent is not resolved, then there's no info to show for PO
         assertThat(mProvider.hasWorkPolicyInfo()).isFalse();
         assertThat(mProvider.showWorkPolicyInfo()).isFalse();
 
         // If the intent is resolved, then we can use it to launch the activity in managed profile
-        Intent intent = addWorkPolicyInfoIntent(OWNER.getPackageName(), false, true);
+        Intent intent = addWorkPolicyInfoIntent(mOwner.getPackageName(), false, true);
         assertThat(mProvider.hasWorkPolicyInfo()).isTrue();
         assertThat(mProvider.showWorkPolicyInfo()).isTrue();
         verify(mContext)
                 .startActivityAsUser(
                         intentEquals(intent),
-                        argThat(handle -> handle.getIdentifier() == MANAGED_PROFILE_USER_ID));
+                        argThat(handle -> handle.getIdentifier() == mManagedProfileUserId));
     }
 
     @Test
     public void workPolicyInfo_comp_shouldUseDeviceOwnerIntent() {
-        when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(OWNER);
-        mProfiles.add(new UserInfo(MANAGED_PROFILE_USER_ID, "", "", UserInfo.FLAG_MANAGED_PROFILE));
-        when(mDevicePolicyManager.getProfileOwnerAsUser(MY_USER_ID)).thenReturn(OWNER);
+        when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(mOwner);
+        mProfiles.add(new UserInfo(mManagedProfileUserId, "", "", UserInfo.FLAG_MANAGED_PROFILE));
+        when(mDevicePolicyManager.getProfileOwnerAsUser(mUserId)).thenReturn(mOwner);
 
         // If the intent is not resolved, then there's no info to show for COMP
         assertThat(mProvider.hasWorkPolicyInfo()).isFalse();
         assertThat(mProvider.showWorkPolicyInfo()).isFalse();
 
         // If the intent is resolved, then we can use it to launch the activity for device owner
-        Intent intent = addWorkPolicyInfoIntent(OWNER.getPackageName(), true, true);
+        Intent intent = addWorkPolicyInfoIntent(mOwner.getPackageName(), true, true);
         assertThat(mProvider.hasWorkPolicyInfo()).isTrue();
         assertThat(mProvider.showWorkPolicyInfo()).isTrue();
         verify(mContext).startActivity(intentEquals(intent));
@@ -437,7 +443,7 @@
         }
         if (profileOwner) {
             when(mPackageManager.queryIntentActivitiesAsUser(
-                            intentEquals(intent), anyInt(), eq(MANAGED_PROFILE_USER_ID)))
+                    intentEquals(intent), anyInt(), eq(mManagedProfileUserId)))
                     .thenReturn(activities);
         }
 
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java
index 75b38a0..de0cc05 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java
@@ -40,7 +40,7 @@
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.shadow.ShadowFragment;
 import com.android.settingslib.RestrictedPreference;
-import com.android.settingslib.fuelgauge.PowerWhitelistBackend;
+import com.android.settingslib.fuelgauge.PowerAllowlistBackend;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -79,7 +79,7 @@
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private AdvancedPowerUsageDetail mFragment;
     @Mock
-    private PowerWhitelistBackend mPowerWhitelistBackend;
+    private PowerAllowlistBackend mPowerAllowlistBackend;
     private BackgroundActivityPreferenceController mController;
     private RestrictedPreference mPreference;
     private Context mShadowContext;
@@ -103,7 +103,7 @@
         when(mPackageManager.getApplicationInfo(LOW_SDK_PACKAGE, PackageManager.GET_META_DATA))
                 .thenReturn(mLowApplicationInfo);
 
-        when(mPowerWhitelistBackend.isWhitelisted(LOW_SDK_PACKAGE)).thenReturn(false);
+        when(mPowerAllowlistBackend.isAllowlisted(LOW_SDK_PACKAGE)).thenReturn(false);
         mHighApplicationInfo.targetSdkVersion = Build.VERSION_CODES.O;
         mLowApplicationInfo.targetSdkVersion = Build.VERSION_CODES.L;
 
@@ -113,7 +113,7 @@
         mPreference = spy(new RestrictedPreference(mShadowContext, null /* attrs */));
         mPreference.setKey(BackgroundActivityPreferenceController.KEY_BACKGROUND_ACTIVITY);
         mController = spy(new BackgroundActivityPreferenceController(
-                mContext, mFragment, UID_LOW_SDK, LOW_SDK_PACKAGE, mPowerWhitelistBackend));
+                mContext, mFragment, UID_LOW_SDK, LOW_SDK_PACKAGE, mPowerAllowlistBackend));
         mController.mDpm = mDevicePolicyManagerWrapper;
         mController.mBatteryUtils = mBatteryUtils;
     }
@@ -150,12 +150,12 @@
     }
 
     @Test
-    public void updateState_whitelisted() {
-        when(mPowerWhitelistBackend.isWhitelisted(LOW_SDK_PACKAGE)).thenReturn(true);
+    public void updateState_allowlisted() {
+        when(mPowerAllowlistBackend.isAllowlisted(LOW_SDK_PACKAGE)).thenReturn(true);
         mController.updateState(mPreference);
         assertThat(mPreference.isEnabled()).isFalse();
         assertThat(mPreference.getSummary()).isEqualTo(
-                mShadowContext.getText(R.string.background_activity_summary_whitelisted));
+                mShadowContext.getText(R.string.background_activity_summary_allowlisted));
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
index 3cbc58a..e88295c 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
@@ -74,7 +74,7 @@
             "1 min left until charged";
     private static final String TEST_BATTERY_LEVEL_10 = "10%";
     private static final String FIFTEEN_MIN_FORMATTED = "15 min";
-    private static final Estimate DUMMY_ESTIMATE = new Estimate(
+    private static final Estimate MOCK_ESTIMATE = new Estimate(
             1000, /* estimateMillis */
             false, /* isBasedOnUsage */
             1000 /* averageDischargeTime */);
@@ -211,10 +211,10 @@
     @Test
     public void testGetBatteryInfo_basedOnUsageFalse_usesDefaultString() {
         BatteryInfo info = BatteryInfo.getBatteryInfo(mContext, mDisChargingBatteryBroadcast,
-                mBatteryStats, DUMMY_ESTIMATE, SystemClock.elapsedRealtime() * 1000,
+                mBatteryStats, MOCK_ESTIMATE, SystemClock.elapsedRealtime() * 1000,
                 false /* shortString */);
         BatteryInfo info2 = BatteryInfo.getBatteryInfo(mContext, mDisChargingBatteryBroadcast,
-                mBatteryStats, DUMMY_ESTIMATE, SystemClock.elapsedRealtime() * 1000,
+                mBatteryStats, MOCK_ESTIMATE, SystemClock.elapsedRealtime() * 1000,
                 true /* shortString */);
 
         assertThat(info.remainingLabel.toString()).doesNotContain(ENHANCED_STRING_SUFFIX);
@@ -228,7 +228,7 @@
                 .computeChargeTimeRemaining(anyLong());
 
         BatteryInfo info = BatteryInfo.getBatteryInfo(mContext, mChargingBatteryBroadcast,
-                mBatteryStats, DUMMY_ESTIMATE, SystemClock.elapsedRealtime() * 1000,
+                mBatteryStats, MOCK_ESTIMATE, SystemClock.elapsedRealtime() * 1000,
                 false /* shortString */);
         assertThat(info.remainingTimeUs).isEqualTo(TEST_CHARGE_TIME_REMAINING);
         assertThat(info.remainingLabel.toString())
@@ -240,7 +240,7 @@
         mChargingBatteryBroadcast.putExtra(BatteryManager.EXTRA_LEVEL, 100);
 
         BatteryInfo info = BatteryInfo.getBatteryInfo(mContext, mChargingBatteryBroadcast,
-                mBatteryStats, DUMMY_ESTIMATE, SystemClock.elapsedRealtime() * 1000,
+                mBatteryStats, MOCK_ESTIMATE, SystemClock.elapsedRealtime() * 1000,
                 false /* shortString */);
 
         assertThat(info.chargeLabel).isEqualTo("100%");
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java
index 329a70d..b9a87aa 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java
@@ -33,7 +33,7 @@
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.dashboard.DashboardFragment;
-import com.android.settingslib.fuelgauge.PowerWhitelistBackend;
+import com.android.settingslib.fuelgauge.PowerAllowlistBackend;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -46,8 +46,8 @@
 @RunWith(RobolectricTestRunner.class)
 public class BatteryOptimizationPreferenceControllerTest {
 
-    private static final String PKG_IN_WHITELIST = "com.pkg.in.whitelist";
-    private static final String PKG_NOT_IN_WHITELIST = "com.pkg.not.in.whitelist";
+    private static final String PKG_IN_ALLOWLIST = "com.pkg.in.allowlist";
+    private static final String PKG_NOT_IN_ALLOWLIST = "com.pkg.not.in.allowlist";
     private static final String KEY_OPTIMIZATION = "battery_optimization";
     private static final String KEY_OTHER = "other";
     @Mock
@@ -55,7 +55,7 @@
     @Mock
     private DashboardFragment mFragment;
     @Mock
-    private TestPowerWhitelistBackend mBackend;
+    private TestPowerAllowlistBackend mBackend;
 
     private BatteryOptimizationPreferenceController mController;
     private Preference mPreference;
@@ -66,12 +66,12 @@
         MockitoAnnotations.initMocks(this);
 
         mContext = RuntimeEnvironment.application;
-        doReturn(false).when(mBackend).isWhitelisted(PKG_NOT_IN_WHITELIST);
-        doReturn(true).when(mBackend).isWhitelisted(PKG_IN_WHITELIST);
+        doReturn(false).when(mBackend).isAllowlisted(PKG_NOT_IN_ALLOWLIST);
+        doReturn(true).when(mBackend).isAllowlisted(PKG_IN_ALLOWLIST);
 
         mPreference = new SwitchPreference(mContext);
         mController = spy(new BatteryOptimizationPreferenceController(mSettingsActivity, mFragment,
-                PKG_NOT_IN_WHITELIST, mBackend));
+                PKG_NOT_IN_ALLOWLIST, mBackend));
     }
 
     @Test
@@ -95,10 +95,10 @@
     }
 
     @Test
-    public void testUpdateState_appInWhitelist_showSummaryNotOptimized() {
+    public void testUpdateState_appInAllowlist_showSummaryNotOptimized() {
         BatteryOptimizationPreferenceController controller =
                 new BatteryOptimizationPreferenceController(mSettingsActivity, mFragment,
-                        PKG_IN_WHITELIST, mBackend);
+                        PKG_IN_ALLOWLIST, mBackend);
 
         controller.updateState(mPreference);
 
@@ -106,7 +106,7 @@
     }
 
     @Test
-    public void testUpdateState_appNotInWhitelist_showSummaryOptimized() {
+    public void testUpdateState_appNotInAllowlist_showSummaryOptimized() {
         mController.updateState(mPreference);
 
         assertThat(mPreference.getSummary()).isEqualTo(mContext.getString(R.string.high_power_off));
@@ -115,9 +115,9 @@
     /**
      * Create this test class so we could mock it
      */
-    public static class TestPowerWhitelistBackend extends PowerWhitelistBackend {
+    public static class TestPowerAllowlistBackend extends PowerAllowlistBackend {
 
-        public TestPowerWhitelistBackend(Context context) {
+        public TestPowerAllowlistBackend(Context context) {
             super(context);
         }
 
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
index 0faddc3..79a19b5 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
@@ -63,7 +63,7 @@
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.shadow.ShadowThreadUtils;
 import com.android.settingslib.fuelgauge.Estimate;
-import com.android.settingslib.fuelgauge.PowerWhitelistBackend;
+import com.android.settingslib.fuelgauge.PowerAllowlistBackend;
 
 import org.junit.Before;
 import org.junit.Ignore;
@@ -160,7 +160,7 @@
     @Mock
     private ApplicationInfo mLowApplicationInfo;
     @Mock
-    private PowerWhitelistBackend mPowerWhitelistBackend;
+    private PowerAllowlistBackend mPowerAllowlistBackend;
     @Mock
     private BatteryDatabaseManager mBatteryDatabaseManager;
     private AnomalyInfo mAnomalyInfo;
@@ -642,7 +642,7 @@
         doReturn(new String[]{HIGH_SDK_PACKAGE}).when(mPackageManager).getPackagesForUid(UID);
         mHighApplicationInfo.flags = ApplicationInfo.FLAG_SYSTEM;
 
-        assertThat(mBatteryUtils.shouldHideAnomaly(mPowerWhitelistBackend, UID,
+        assertThat(mBatteryUtils.shouldHideAnomaly(mPowerAllowlistBackend, UID,
                 mAnomalyInfo)).isTrue();
     }
 
@@ -652,7 +652,7 @@
         doReturn(new String[]{HIGH_SDK_PACKAGE}).when(mPackageManager).getPackagesForUid(UID);
         mHighApplicationInfo.flags = ApplicationInfo.FLAG_SYSTEM;
 
-        assertThat(mBatteryUtils.shouldHideAnomaly(mPowerWhitelistBackend, UID,
+        assertThat(mBatteryUtils.shouldHideAnomaly(mPowerAllowlistBackend, UID,
                 mAnomalyInfo)).isTrue();
     }
 
@@ -661,16 +661,16 @@
         final int systemUid = Process.ROOT_UID;
         doReturn(new String[]{HIGH_SDK_PACKAGE}).when(mPackageManager).getPackagesForUid(systemUid);
 
-        assertThat(mBatteryUtils.shouldHideAnomaly(mPowerWhitelistBackend, systemUid,
+        assertThat(mBatteryUtils.shouldHideAnomaly(mPowerAllowlistBackend, systemUid,
                 mAnomalyInfo)).isTrue();
     }
 
     @Test
     public void testShouldHideAnomaly_AppInDozeList_returnTrue() {
         doReturn(new String[]{HIGH_SDK_PACKAGE}).when(mPackageManager).getPackagesForUid(UID);
-        doReturn(true).when(mPowerWhitelistBackend).isWhitelisted(new String[]{HIGH_SDK_PACKAGE});
+        doReturn(true).when(mPowerAllowlistBackend).isAllowlisted(new String[]{HIGH_SDK_PACKAGE});
 
-        assertThat(mBatteryUtils.shouldHideAnomaly(mPowerWhitelistBackend, UID,
+        assertThat(mBatteryUtils.shouldHideAnomaly(mPowerAllowlistBackend, UID,
                 mAnomalyInfo)).isTrue();
     }
 
@@ -678,7 +678,7 @@
     public void testShouldHideAnomaly_normalApp_returnFalse() {
         doReturn(new String[]{HIGH_SDK_PACKAGE}).when(mPackageManager).getPackagesForUid(UID);
 
-        assertThat(mBatteryUtils.shouldHideAnomaly(mPowerWhitelistBackend, UID,
+        assertThat(mBatteryUtils.shouldHideAnomaly(mPowerAllowlistBackend, UID,
                 mAnomalyInfo)).isFalse();
     }
 
@@ -687,7 +687,7 @@
         doReturn(new String[]{LOW_SDK_PACKAGE}).when(mPackageManager).getPackagesForUid(UID);
         mAnomalyInfo = new AnomalyInfo(INFO_EXCESSIVE);
 
-        assertThat(mBatteryUtils.shouldHideAnomaly(mPowerWhitelistBackend, UID,
+        assertThat(mBatteryUtils.shouldHideAnomaly(mPowerAllowlistBackend, UID,
                 mAnomalyInfo)).isFalse();
     }
 
@@ -696,7 +696,7 @@
         doReturn(new String[]{HIGH_SDK_PACKAGE}).when(mPackageManager).getPackagesForUid(UID);
         mAnomalyInfo = new AnomalyInfo(INFO_EXCESSIVE);
 
-        assertThat(mBatteryUtils.shouldHideAnomaly(mPowerWhitelistBackend, UID,
+        assertThat(mBatteryUtils.shouldHideAnomaly(mPowerAllowlistBackend, UID,
                 mAnomalyInfo)).isTrue();
     }
 
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java
index e613684..4af741d 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java
@@ -32,7 +32,7 @@
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settingslib.fuelgauge.PowerWhitelistBackend;
+import com.android.settingslib.fuelgauge.PowerAllowlistBackend;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -52,7 +52,7 @@
 
     private Context mContext;
     @Mock
-    private PowerWhitelistBackend mPowerWhitelistBackend;
+    private PowerAllowlistBackend mPowerAllowlistBackend;
     @Mock
     private BatteryUtils mBatteryUtils;
 
@@ -63,7 +63,7 @@
         MockitoAnnotations.initMocks(this);
         mContext = RuntimeEnvironment.application;
         mFragment = spy(new HighPowerDetail());
-        mFragment.mBackend = mPowerWhitelistBackend;
+        mFragment.mBackend = mPowerAllowlistBackend;
         mFragment.mBatteryUtils = mBatteryUtils;
         mFragment.mPackageUid = TEST_UID;
         mFragment.mPackageName = TEST_PACKAGE;
@@ -71,21 +71,21 @@
 
     @Test
     public void logSpecialPermissionChange() {
-        // Deny means app is whitelisted to opt out of power save restrictions
+        // Deny means app is allowlisted to opt out of power save restrictions
         HighPowerDetail.logSpecialPermissionChange(true, "app", RuntimeEnvironment.application);
         verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
                 eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_BATTERY_DENY), eq("app"));
 
-        // Allow means app is NOT whitelisted to opt out of power save restrictions
+        // Allow means app is NOT allowlisted to opt out of power save restrictions
         HighPowerDetail.logSpecialPermissionChange(false, "app", RuntimeEnvironment.application);
         verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
                 eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_BATTERY_ALLOW), eq("app"));
     }
 
     @Test
-    public void onClick_appAddedToDozeWhitelist_getsUnrestricted() {
+    public void onClick_appAddedToDozeAllowlist_getsUnrestricted() {
         mFragment.mIsEnabled = true;
-        when(mPowerWhitelistBackend.isWhitelisted(TEST_PACKAGE)).thenReturn(false);
+        when(mPowerAllowlistBackend.isAllowlisted(TEST_PACKAGE)).thenReturn(false);
         mFragment.onClick(null, DialogInterface.BUTTON_POSITIVE);
         verify(mBatteryUtils).setForceAppStandby(TEST_UID, TEST_PACKAGE,
                 AppOpsManager.MODE_ALLOWED);
@@ -93,9 +93,9 @@
 
     @Test
     public void getSummary_defaultActivePackage_returnUnavailable() {
-        doReturn(true).when(mPowerWhitelistBackend).isDefaultActiveApp(TEST_PACKAGE);
+        doReturn(true).when(mPowerAllowlistBackend).isDefaultActiveApp(TEST_PACKAGE);
 
-        assertThat(HighPowerDetail.getSummary(mContext, mPowerWhitelistBackend, TEST_PACKAGE))
+        assertThat(HighPowerDetail.getSummary(mContext, mPowerAllowlistBackend, TEST_PACKAGE))
                 .isEqualTo(mContext.getString(R.string.high_power_system));
     }
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java
index e839717..dd90dc8 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java
@@ -36,7 +36,6 @@
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static org.robolectric.RuntimeEnvironment.application;
 
 import android.app.JobSchedulerImpl;
 import android.app.StatsManager;
@@ -59,8 +58,7 @@
 import com.android.settings.fuelgauge.BatteryUtils;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.shadow.ShadowConnectivityManager;
-import com.android.settings.testutils.shadow.ShadowPowerWhitelistBackend;
-import com.android.settingslib.fuelgauge.PowerWhitelistBackend;
+import com.android.settingslib.fuelgauge.PowerAllowlistBackend;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -78,7 +76,7 @@
 import java.util.concurrent.TimeUnit;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(shadows = {ShadowConnectivityManager.class, ShadowPowerWhitelistBackend.class})
+@Config(shadows = {ShadowConnectivityManager.class})
 public class AnomalyDetectionJobServiceTest {
     private static final int UID = 12345;
     private static final String SYSTEM_PACKAGE = "com.android.system";
@@ -95,7 +93,7 @@
     @Mock
     private BatteryUtils mBatteryUtils;
     @Mock
-    private PowerWhitelistBackend mPowerWhitelistBackend;
+    private PowerAllowlistBackend mPowerAllowlistBackend;
     @Mock
     private StatsDimensionsValue mStatsDimensionsValue;
     @Mock
@@ -145,13 +143,13 @@
     }
 
     @Test
-    public void saveAnomalyToDatabase_systemWhitelisted_doNotSave() {
+    public void saveAnomalyToDatabase_systemAllowlisted_doNotSave() {
         doReturn(UID).when(mAnomalyDetectionJobService).extractUidFromStatsDimensionsValue(any());
-        doReturn(true).when(mPowerWhitelistBackend).isWhitelisted(any(String[].class));
+        doReturn(true).when(mPowerAllowlistBackend).isAllowlisted(any(String[].class));
 
         mAnomalyDetectionJobService.saveAnomalyToDatabase(mContext,
                 mUserManager, mBatteryDatabaseManager, mBatteryUtils, mPolicy,
-                mPowerWhitelistBackend, mContext.getContentResolver(),
+                mPowerAllowlistBackend, mContext.getContentResolver(),
                 mFeatureFactory.powerUsageFeatureProvider,
                 mFeatureFactory.metricsFeatureProvider, mBundle);
 
@@ -165,14 +163,14 @@
         cookies.add(SUBSCRIBER_COOKIES_AUTO_RESTRICTION);
         mBundle.putStringArrayList(StatsManager.EXTRA_STATS_BROADCAST_SUBSCRIBER_COOKIES, cookies);
         doReturn(SYSTEM_PACKAGE).when(mBatteryUtils).getPackageName(anyInt());
-        doReturn(false).when(mPowerWhitelistBackend).isSysWhitelisted(SYSTEM_PACKAGE);
+        doReturn(false).when(mPowerAllowlistBackend).isSysAllowlisted(SYSTEM_PACKAGE);
         doReturn(Process.FIRST_APPLICATION_UID).when(
                 mAnomalyDetectionJobService).extractUidFromStatsDimensionsValue(any());
         doReturn(true).when(mBatteryUtils).shouldHideAnomaly(any(), anyInt(), any());
 
         mAnomalyDetectionJobService.saveAnomalyToDatabase(mContext,
                 mUserManager, mBatteryDatabaseManager, mBatteryUtils, mPolicy,
-                mPowerWhitelistBackend, mContext.getContentResolver(),
+                mPowerAllowlistBackend, mContext.getContentResolver(),
                 mFeatureFactory.powerUsageFeatureProvider,
                 mFeatureFactory.metricsFeatureProvider, mBundle);
 
@@ -192,7 +190,7 @@
 
         mAnomalyDetectionJobService.saveAnomalyToDatabase(mContext,
                 mUserManager, mBatteryDatabaseManager, mBatteryUtils, mPolicy,
-                mPowerWhitelistBackend, mContext.getContentResolver(),
+                mPowerAllowlistBackend, mContext.getContentResolver(),
                 mFeatureFactory.powerUsageFeatureProvider, mFeatureFactory.metricsFeatureProvider,
                 mBundle);
 
@@ -207,7 +205,7 @@
 
         mAnomalyDetectionJobService.saveAnomalyToDatabase(mContext,
                 mUserManager, mBatteryDatabaseManager, mBatteryUtils, mPolicy,
-                mPowerWhitelistBackend, mContext.getContentResolver(),
+                mPowerAllowlistBackend, mContext.getContentResolver(),
                 mFeatureFactory.powerUsageFeatureProvider, mFeatureFactory.metricsFeatureProvider,
                 mBundle);
 
@@ -221,13 +219,13 @@
         cookies.add(SUBSCRIBER_COOKIES_AUTO_RESTRICTION);
         mBundle.putStringArrayList(StatsManager.EXTRA_STATS_BROADCAST_SUBSCRIBER_COOKIES, cookies);
         doReturn(SYSTEM_PACKAGE).when(mBatteryUtils).getPackageName(anyInt());
-        doReturn(false).when(mPowerWhitelistBackend).isSysWhitelisted(SYSTEM_PACKAGE);
+        doReturn(false).when(mPowerAllowlistBackend).isSysAllowlisted(SYSTEM_PACKAGE);
         doReturn(Process.FIRST_APPLICATION_UID).when(
                 mAnomalyDetectionJobService).extractUidFromStatsDimensionsValue(any());
 
         mAnomalyDetectionJobService.saveAnomalyToDatabase(mContext,
                 mUserManager, mBatteryDatabaseManager, mBatteryUtils, mPolicy,
-                mPowerWhitelistBackend, mContext.getContentResolver(),
+                mPowerAllowlistBackend, mContext.getContentResolver(),
                 mFeatureFactory.powerUsageFeatureProvider, mFeatureFactory.metricsFeatureProvider,
                 mBundle);
 
@@ -246,13 +244,13 @@
         cookies.add(SUBSCRIBER_COOKIES_NOT_AUTO_RESTRICTION);
         mBundle.putStringArrayList(StatsManager.EXTRA_STATS_BROADCAST_SUBSCRIBER_COOKIES, cookies);
         doReturn(SYSTEM_PACKAGE).when(mBatteryUtils).getPackageName(anyInt());
-        doReturn(false).when(mPowerWhitelistBackend).isSysWhitelisted(SYSTEM_PACKAGE);
+        doReturn(false).when(mPowerAllowlistBackend).isSysAllowlisted(SYSTEM_PACKAGE);
         doReturn(Process.FIRST_APPLICATION_UID).when(
                 mAnomalyDetectionJobService).extractUidFromStatsDimensionsValue(any());
 
         mAnomalyDetectionJobService.saveAnomalyToDatabase(mContext,
                 mUserManager, mBatteryDatabaseManager, mBatteryUtils, mPolicy,
-                mPowerWhitelistBackend, mContext.getContentResolver(),
+                mPowerAllowlistBackend, mContext.getContentResolver(),
                 mFeatureFactory.powerUsageFeatureProvider, mFeatureFactory.metricsFeatureProvider,
                 mBundle);
 
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java
index b95040a..f02eec2 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java
@@ -34,7 +34,6 @@
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.fuelgauge.batterytip.AppInfo;
-import com.android.settings.testutils.BatteryTestUtils;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
 import org.junit.After;
@@ -45,10 +44,10 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
+import org.robolectric.util.ReflectionHelpers;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.robolectric.util.ReflectionHelpers;
 
 @RunWith(RobolectricTestRunner.class)
 public class RestrictAppTipTest {
@@ -198,7 +197,7 @@
         appInfos.add(mUninstallAppInfo);
         final BatteryTip batteryTip = new RestrictAppTip(BatteryTip.StateType.NEW, appInfos);
 
-        batteryTip.sanityCheck(mContext);
+        batteryTip.validateCheck(mContext);
 
         assertThat(batteryTip.getState()).isEqualTo(BatteryTip.StateType.INVISIBLE);
     }
@@ -210,7 +209,7 @@
         appInfos.add(mUninstallAppInfo);
         final BatteryTip batteryTip = new RestrictAppTip(BatteryTip.StateType.NEW, appInfos);
 
-        batteryTip.sanityCheck(mContext);
+        batteryTip.validateCheck(mContext);
 
         assertThat(batteryTip.getState()).isEqualTo(BatteryTip.StateType.NEW);
     }
diff --git a/tests/robotests/src/com/android/settings/gestures/OneHandedAppTapsExitPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/OneHandedAppTapsExitPreferenceControllerTest.java
new file mode 100644
index 0000000..28ce802
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/gestures/OneHandedAppTapsExitPreferenceControllerTest.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+
+import androidx.preference.SwitchPreference;
+
+import com.android.settings.core.TogglePreferenceController;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class OneHandedAppTapsExitPreferenceControllerTest {
+
+    private static final String KEY = "gesture_app_taps_to_exit";
+
+    private Context mContext;
+    private SwitchPreference mSwitchPreference;
+
+    private OneHandedAppTapsExitPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+        mController = new OneHandedAppTapsExitPreferenceController(mContext, KEY);
+        mSwitchPreference = new SwitchPreference(mContext);
+        mSwitchPreference.setKey(KEY);
+    }
+
+    @Test
+    public void setChecked_setBoolean_checkIsTrueOrFalse() {
+        mController.setChecked(false);
+        assertThat(mController.isChecked()).isFalse();
+
+        mController.setChecked(true);
+        assertThat(mController.isChecked()).isTrue();
+    }
+
+    @Test
+    public void getAvailabilityStatus_enabledOneHanded_shouldAvailable() {
+        OneHandedSettingsUtils.setSettingsOneHandedModeEnabled(mContext, true);
+
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(TogglePreferenceController.AVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_disabledOneHanded_shouldUnavailable() {
+        OneHandedSettingsUtils.setSettingsOneHandedModeEnabled(mContext, false);
+
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(TogglePreferenceController.DISABLED_DEPENDENT_SETTING);
+    }
+
+    @Test
+    public void updateState_enableOneHanded_switchShouldEnabled() {
+        OneHandedSettingsUtils.setSettingsOneHandedModeEnabled(mContext, true);
+
+        mController.updateState(mSwitchPreference);
+
+        assertThat(mSwitchPreference.isEnabled()).isTrue();
+    }
+
+    @Test
+    public void updateState_disableOneHanded_switchShouldDisabled() {
+        OneHandedSettingsUtils.setSettingsOneHandedModeEnabled(mContext, false);
+
+        mController.updateState(mSwitchPreference);
+
+        assertThat(mSwitchPreference.isEnabled()).isFalse();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/gestures/OneHandedEnablePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/OneHandedEnablePreferenceControllerTest.java
new file mode 100644
index 0000000..11128f3
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/gestures/OneHandedEnablePreferenceControllerTest.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.os.SystemProperties;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+
+@RunWith(RobolectricTestRunner.class)
+public class OneHandedEnablePreferenceControllerTest {
+
+    private static final String KEY = "gesture_one_handed_mode_enabled";
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    private OneHandedEnablePreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mController = new OneHandedEnablePreferenceController(mContext, KEY);
+    }
+
+    @Test
+    public void setChecked_setBoolean_checkIsTrueOrFalse() {
+        mController.setChecked(false);
+        assertThat(OneHandedSettingsUtils.isOneHandedModeEnabled(mContext)).isFalse();
+
+        mController.setChecked(true);
+        assertThat(OneHandedSettingsUtils.isOneHandedModeEnabled(mContext)).isTrue();
+    }
+
+    @Test
+    public void getAvailabilityStatus_setSupportOneHandedModeProperty_shouldAvailable() {
+        SystemProperties.set(OneHandedEnablePreferenceController.SUPPORT_ONE_HANDED_MODE, "true");
+
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.AVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_unsetSupportOneHandedModeProperty_shouldUnsupported() {
+        SystemProperties.set(OneHandedEnablePreferenceController.SUPPORT_ONE_HANDED_MODE, "false");
+
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
+    }
+
+    @Test
+    public void getSummary_enabledOneHanded_shouldDisplayOnSummary() {
+        OneHandedSettingsUtils.setSettingsOneHandedModeEnabled(mContext, true);
+
+        assertThat(mController.getSummary())
+                .isEqualTo(mContext.getText(R.string.switch_on_text));
+    }
+
+    @Test
+    public void getSummary_disabledOneHanded_shouldDisplayOffSummary() {
+        OneHandedSettingsUtils.setSettingsOneHandedModeEnabled(mContext, false);
+
+        assertThat(mController.getSummary())
+                .isEqualTo(mContext.getText(R.string.switch_off_text));
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/gestures/OneHandedSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/OneHandedSettingsTest.java
new file mode 100644
index 0000000..fcea919
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/gestures/OneHandedSettingsTest.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.provider.SearchIndexableResource;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.util.ReflectionHelpers;
+
+import java.util.List;
+
+@RunWith(RobolectricTestRunner.class)
+public class OneHandedSettingsTest {
+
+    private OneHandedSettings mSettings;
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        mSettings = new OneHandedSettings();
+        mContext = RuntimeEnvironment.application;
+    }
+
+    @Test
+    public void testSearchIndexProvider_shouldIndexResource() {
+        final List<SearchIndexableResource> indexRes =
+                OneHandedSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
+                        RuntimeEnvironment.application, true /* enabled */);
+
+        assertThat(indexRes).isNotNull();
+        assertThat(indexRes.get(0).xmlResId).isEqualTo(mSettings.getPreferenceScreenResId());
+    }
+
+    @Test
+    public void isPageSearchEnabled_setSupportOneHandedModeProperty_shouldReturnTrue() {
+        SystemProperties.set(OneHandedEnablePreferenceController.SUPPORT_ONE_HANDED_MODE, "true");
+
+        final Object obj = ReflectionHelpers.callInstanceMethod(
+                OneHandedSettings.SEARCH_INDEX_DATA_PROVIDER, "isPageSearchEnabled",
+                ReflectionHelpers.ClassParameter.from(Context.class, mContext));
+        final boolean isEnabled = (Boolean) obj;
+        assertThat(isEnabled).isTrue();
+    }
+
+    @Test
+    public void isPageSearchEnabled_unsetSupportOneHandedModeProperty_shouldReturnFalse() {
+        SystemProperties.set(OneHandedEnablePreferenceController.SUPPORT_ONE_HANDED_MODE, "false");
+
+        final Object obj = ReflectionHelpers.callInstanceMethod(
+                OneHandedSettings.SEARCH_INDEX_DATA_PROVIDER, "isPageSearchEnabled",
+                ReflectionHelpers.ClassParameter.from(Context.class, mContext));
+        final boolean isEnabled = (Boolean) obj;
+        assertThat(isEnabled).isFalse();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/gestures/OneHandedSettingsUtilsTest.java b/tests/robotests/src/com/android/settings/gestures/OneHandedSettingsUtilsTest.java
new file mode 100644
index 0000000..7afd12d
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/gestures/OneHandedSettingsUtilsTest.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import com.android.settings.R;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class OneHandedSettingsUtilsTest {
+
+    private static final int TIMEOUT_INDEX_NEVER = 0;
+    private static final int TIMEOUT_INDEX_SHORT = 1;
+    private static final int TIMEOUT_INDEX_MEDIUM = 2;
+    private static final int TIMEOUT_INDEX_LONG = 3;
+
+    private Context mContext;
+    private String[] mConfigTimeout;
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+        mConfigTimeout = mContext.getResources().getStringArray(R.array.one_handed_timeout_values);
+    }
+
+    @Test
+    public void setSettingsOneHandedModeEnabled_setEnable_shouldReturnEnabled() {
+        OneHandedSettingsUtils.setSettingsOneHandedModeEnabled(mContext, true);
+
+        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ONE_HANDED_MODE_ENABLED, 0)).isEqualTo(1);
+    }
+
+    @Test
+    public void setSettingsOneHandedModeEnabled_setDisable_shouldReturnDisabled() {
+        OneHandedSettingsUtils.setSettingsOneHandedModeEnabled(mContext, false);
+
+        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ONE_HANDED_MODE_ENABLED, 0)).isEqualTo(0);
+    }
+
+    @Test
+    public void setSettingsTapsAppToExitEnabled_setEnable_shouldReturnEnabled() {
+        OneHandedSettingsUtils.setSettingsTapsAppToExit(mContext, true);
+
+        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.TAPS_APP_TO_EXIT, 1)).isEqualTo(1);
+    }
+
+    @Test
+    public void setSettingsTapsAppToExitEnabled_setDisable_shouldReturnDisabled() {
+        OneHandedSettingsUtils.setSettingsTapsAppToExit(mContext, false);
+
+        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.TAPS_APP_TO_EXIT, 1)).isEqualTo(0);
+    }
+
+    @Test
+    public void setSettingsTimeout_setNever_shouldReturnNeverValue() {
+        OneHandedSettingsUtils.setSettingsOneHandedModeTimeout(mContext,
+                OneHandedSettingsUtils.OneHandedTimeout.NEVER.getValue());
+
+        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ONE_HANDED_MODE_TIMEOUT,
+                OneHandedSettingsUtils.OneHandedTimeout.NEVER.getValue()))
+                .isEqualTo(Integer.parseInt(mConfigTimeout[TIMEOUT_INDEX_NEVER]));
+    }
+
+    @Test
+    public void setSettingsTimeout_setShort_shouldReturnShortValue() {
+        OneHandedSettingsUtils.setSettingsOneHandedModeTimeout(mContext,
+                OneHandedSettingsUtils.OneHandedTimeout.SHORT.getValue());
+
+        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ONE_HANDED_MODE_TIMEOUT,
+                OneHandedSettingsUtils.OneHandedTimeout.SHORT.getValue()))
+                .isEqualTo(Integer.parseInt(mConfigTimeout[TIMEOUT_INDEX_SHORT]));
+    }
+
+    @Test
+    public void setSettingsTimeout_setMedium_shouldReturnMediumValue() {
+        OneHandedSettingsUtils.setSettingsOneHandedModeTimeout(mContext,
+                OneHandedSettingsUtils.OneHandedTimeout.MEDIUM.getValue());
+
+        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ONE_HANDED_MODE_TIMEOUT,
+                OneHandedSettingsUtils.OneHandedTimeout.MEDIUM.getValue()))
+                .isEqualTo(Integer.parseInt(mConfigTimeout[TIMEOUT_INDEX_MEDIUM]));
+    }
+
+    @Test
+    public void setSettingsTimeout_setLong_shouldReturnLongValue() {
+        OneHandedSettingsUtils.setSettingsOneHandedModeTimeout(mContext,
+                OneHandedSettingsUtils.OneHandedTimeout.LONG.getValue());
+
+        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ONE_HANDED_MODE_TIMEOUT,
+                OneHandedSettingsUtils.OneHandedTimeout.LONG.getValue()))
+                .isEqualTo(Integer.parseInt(mConfigTimeout[TIMEOUT_INDEX_LONG]));
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/gestures/OneHandedTimeoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/OneHandedTimeoutPreferenceControllerTest.java
new file mode 100644
index 0000000..baf8347
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/gestures/OneHandedTimeoutPreferenceControllerTest.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+
+import androidx.preference.ListPreference;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class OneHandedTimeoutPreferenceControllerTest {
+
+    private static final String KEY = "one_handed_timeout_preference";
+
+    private Context mContext;
+    private OneHandedTimeoutPreferenceController mController;
+    private ListPreference mPreference;
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+        mController = new OneHandedTimeoutPreferenceController(mContext, KEY);
+        mPreference = new ListPreference(mContext);
+        mPreference.setKey(KEY);
+    }
+
+    @Test
+    public void getAvailabilityStatus_enabledOneHanded_shouldAvailable() {
+        OneHandedSettingsUtils.setSettingsOneHandedModeEnabled(mContext, true);
+
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.AVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_disableOneHanded_shouldUnavailable() {
+        OneHandedSettingsUtils.setSettingsOneHandedModeEnabled(mContext, false);
+
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.DISABLED_DEPENDENT_SETTING);
+    }
+
+    @Test
+    public void updateState_enableOneHanded_switchShouldEnabled() {
+        OneHandedSettingsUtils.setSettingsOneHandedModeEnabled(mContext, true);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.isEnabled()).isTrue();
+    }
+
+    @Test
+    public void updateState_disableOneHanded_switchShouldDisabled() {
+        OneHandedSettingsUtils.setSettingsOneHandedModeEnabled(mContext, false);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.isEnabled()).isFalse();
+    }
+
+    @Test
+    public void getSummary_setTimeoutNever_shouldReturnNeverSummary() {
+        final String[] timeoutTitles = mContext.getResources().getStringArray(
+                R.array.one_handed_timeout_title);
+
+        OneHandedSettingsUtils.setSettingsOneHandedModeTimeout(mContext,
+                OneHandedSettingsUtils.OneHandedTimeout.NEVER.getValue());
+
+        assertThat(mController.getSummary()).isEqualTo(
+                timeoutTitles[OneHandedSettingsUtils.OneHandedTimeout.NEVER.ordinal()]);
+    }
+
+    @Test
+    public void getSummary_setTimeoutShort_shouldReturnShortSummary() {
+        final String[] timeoutTitles = mContext.getResources().getStringArray(
+                R.array.one_handed_timeout_title);
+
+        OneHandedSettingsUtils.setSettingsOneHandedModeTimeout(mContext,
+                OneHandedSettingsUtils.OneHandedTimeout.SHORT.getValue());
+
+        assertThat(mController.getSummary()).isEqualTo(String.format(
+                mContext.getResources().getString(R.string.screen_timeout_summary),
+                timeoutTitles[OneHandedSettingsUtils.OneHandedTimeout.SHORT.ordinal()]));
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/gestures/PanicGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/PanicGesturePreferenceControllerTest.java
new file mode 100644
index 0000000..d071681
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/gestures/PanicGesturePreferenceControllerTest.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import static com.android.settings.gestures.PanicGesturePreferenceController.OFF;
+import static com.android.settings.gestures.PanicGesturePreferenceController.ON;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.R;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = SettingsShadowResources.class)
+public class PanicGesturePreferenceControllerTest {
+
+
+    private Context mContext;
+    private ContentResolver mContentResolver;
+    private PanicGesturePreferenceController mController;
+    private static final String PREF_KEY = "gesture_panic_button";
+
+    @Before
+    public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+        mContentResolver = mContext.getContentResolver();
+        mController = new PanicGesturePreferenceController(mContext, PREF_KEY);
+    }
+
+    @After
+    public void tearDown() {
+        SettingsShadowResources.reset();
+    }
+
+    @Test
+    public void isAvailable_configIsTrue_shouldReturnTrue() {
+        SettingsShadowResources.overrideResource(
+                R.bool.config_show_panic_gesture_settings,
+                Boolean.TRUE);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_configIsTrue_shouldReturnFalse() {
+        SettingsShadowResources.overrideResource(
+                R.bool.config_show_panic_gesture_settings,
+                Boolean.FALSE);
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isChecked_configIsNotSet_shouldReturnTrue() {
+        // Set the setting to be enabled.
+        Settings.Secure.putInt(mContentResolver, Settings.Secure.PANIC_GESTURE_ENABLED, ON);
+        mController = new PanicGesturePreferenceController(mContext, PREF_KEY);
+
+        assertThat(mController.isChecked()).isTrue();
+    }
+
+    @Test
+    public void isChecked_configIsSet_shouldReturnFalse() {
+        // Set the setting to be disabled.
+        Settings.Secure.putInt(mContentResolver, Settings.Secure.PANIC_GESTURE_ENABLED, OFF);
+        mController = new PanicGesturePreferenceController(mContext, PREF_KEY);
+
+        assertThat(mController.isChecked()).isFalse();
+    }
+
+    @Test
+    public void isSliceableCorrectKey_returnsTrue() {
+        final PanicGesturePreferenceController controller =
+                new PanicGesturePreferenceController(mContext, PREF_KEY);
+        assertThat(controller.isSliceable()).isTrue();
+    }
+
+    @Test
+    public void isSliceableIncorrectKey_returnsFalse() {
+        final DoubleTapPowerPreferenceController controller =
+                new DoubleTapPowerPreferenceController(mContext, "bad_key");
+        assertThat(controller.isSliceable()).isFalse();
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/gestures/PanicGestureSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/PanicGestureSoundPreferenceControllerTest.java
new file mode 100644
index 0000000..4967d7c
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/gestures/PanicGestureSoundPreferenceControllerTest.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import static com.android.settings.gestures.PanicGesturePreferenceController.OFF;
+import static com.android.settings.gestures.PanicGesturePreferenceController.ON;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.R;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = SettingsShadowResources.class)
+public class PanicGestureSoundPreferenceControllerTest {
+
+    private Context mContext;
+    private ContentResolver mContentResolver;
+    private PanicGestureSoundPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+        mContentResolver = mContext.getContentResolver();
+        mController = new PanicGestureSoundPreferenceController(mContext, "test_key");
+    }
+
+    @After
+    public void tearDown() {
+        SettingsShadowResources.reset();
+    }
+
+    @Test
+    public void isAvailable_configIsTrue_shouldReturnTrue() {
+        SettingsShadowResources.overrideResource(
+                R.bool.config_show_panic_gesture_settings,
+                Boolean.TRUE);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_configIsTrue_shouldReturnFalse() {
+        SettingsShadowResources.overrideResource(
+                R.bool.config_show_panic_gesture_settings,
+                Boolean.FALSE);
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isChecked_configIsSet_shouldReturnTrue() {
+        // Set the setting to be enabled.
+        Settings.Secure.putInt(mContentResolver, Settings.Secure.PANIC_SOUND_ENABLED, ON);
+
+        assertThat(mController.isChecked()).isTrue();
+    }
+
+    @Test
+    public void isChecked_configIsSetToFalse_shouldReturnFalse() {
+        // Set the setting to be disabled.
+        Settings.Secure.putInt(mContentResolver, Settings.Secure.PANIC_SOUND_ENABLED, OFF);
+
+        assertThat(mController.isChecked()).isFalse();
+    }
+
+    @Test
+    public void isSliceable_returnsFalse() {
+        assertThat(mController.isSliceable()).isFalse();
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/gestures/SwipeBottomToNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/SwipeBottomToNotificationPreferenceControllerTest.java
new file mode 100644
index 0000000..db51dff
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/gestures/SwipeBottomToNotificationPreferenceControllerTest.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import static android.provider.Settings.Secure.SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.DISABLED_DEPENDENT_SETTING;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.provider.Settings;
+
+import com.android.settings.R;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+
+@RunWith(RobolectricTestRunner.class)
+public class SwipeBottomToNotificationPreferenceControllerTest {
+
+    private static final String KEY = "gesture_swipe_bottom_to_notification";
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+
+    private SwipeBottomToNotificationPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mController = new SwipeBottomToNotificationPreferenceController(mContext, KEY);
+    }
+
+    @Test
+    public void setChecked_toggledOn_enablesSwipeBottomToNotification() {
+        mController.setChecked(true);
+
+        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+                SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED, 0)).isEqualTo(1);
+    }
+
+    @Test
+    public void setChecked_toggledOff_disablesSwipeBottomToNotification() {
+        mController.setChecked(false);
+
+        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+                SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED, 0)).isEqualTo(0);
+    }
+
+    @Test
+    public void getAvailabilityStatus_oneHandedUnsupported_returnsAvailable() {
+        SystemProperties.set(OneHandedEnablePreferenceController.SUPPORT_ONE_HANDED_MODE, "false");
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_oneHandedDisabled_returnsAvailable() {
+        SystemProperties.set(OneHandedEnablePreferenceController.SUPPORT_ONE_HANDED_MODE, "true");
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ONE_HANDED_MODE_ENABLED, 0);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_oneHandedEnabled_returnsDisabled() {
+        SystemProperties.set(OneHandedEnablePreferenceController.SUPPORT_ONE_HANDED_MODE, "true");
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ONE_HANDED_MODE_ENABLED, 1);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(DISABLED_DEPENDENT_SETTING);
+    }
+
+    @Test
+    public void getSummary_gestureEnabled_returnsOnSummary() {
+        mController.setChecked(true);
+
+        assertThat(mController.getSummary()).isEqualTo(
+                mContext.getText(R.string.gesture_setting_on));
+    }
+
+    @Test
+    public void getSummary_gestureDisabled_returnsOffSummary() {
+        mController.setChecked(false);
+
+        assertThat(mController.getSummary()).isEqualTo(
+                mContext.getText(R.string.gesture_setting_off));
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/gestures/SwipeBottomToNotificationSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/SwipeBottomToNotificationSettingsTest.java
new file mode 100644
index 0000000..ad8104c
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/gestures/SwipeBottomToNotificationSettingsTest.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.provider.SearchIndexableResource;
+import android.provider.Settings;
+
+import com.android.settings.R;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.util.ReflectionHelpers;
+
+import java.util.List;
+
+@RunWith(RobolectricTestRunner.class)
+public class SwipeBottomToNotificationSettingsTest {
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+
+    private SwipeBottomToNotificationSettings mSettings = new SwipeBottomToNotificationSettings();
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+    }
+
+    @Test
+    public void getPreferenceScreenResId_shouldReturnsXml() {
+        assertThat(mSettings.getPreferenceScreenResId())
+                .isEqualTo(R.xml.swipe_bottom_to_notification_settings);
+    }
+
+    @Test
+    public void searchIndexProvider_shouldIndexResource() {
+        final List<SearchIndexableResource> indexRes =
+                SwipeBottomToNotificationSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
+                        mContext, true /* enabled */);
+
+        assertThat(indexRes.get(0).xmlResId).isEqualTo(mSettings.getPreferenceScreenResId());
+    }
+
+    @Test
+    public void isPageSearchEnabled_oneHandedUnsupported_shouldReturnTrue() {
+        SystemProperties.set(OneHandedEnablePreferenceController.SUPPORT_ONE_HANDED_MODE, "false");
+
+        final Object obj = ReflectionHelpers.callInstanceMethod(
+                SwipeBottomToNotificationSettings.SEARCH_INDEX_DATA_PROVIDER, "isPageSearchEnabled",
+                ReflectionHelpers.ClassParameter.from(Context.class, mContext));
+
+        final boolean isEnabled = (Boolean) obj;
+        assertThat(isEnabled).isTrue();
+    }
+
+    @Test
+    public void isPageSearchEnabled_oneHandedDisabled_shouldReturnTrue() {
+        SystemProperties.set(OneHandedEnablePreferenceController.SUPPORT_ONE_HANDED_MODE, "true");
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ONE_HANDED_MODE_ENABLED, 0);
+
+        final Object obj = ReflectionHelpers.callInstanceMethod(
+                SwipeBottomToNotificationSettings.SEARCH_INDEX_DATA_PROVIDER, "isPageSearchEnabled",
+                ReflectionHelpers.ClassParameter.from(Context.class, mContext));
+
+        final boolean isEnabled = (Boolean) obj;
+        assertThat(isEnabled).isTrue();
+    }
+
+    @Test
+    public void isPageSearchEnabled_oneHandedEnabled_shouldReturnFalse() {
+        SystemProperties.set(OneHandedEnablePreferenceController.SUPPORT_ONE_HANDED_MODE, "true");
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ONE_HANDED_MODE_ENABLED, 1);
+
+        final Object obj = ReflectionHelpers.callInstanceMethod(
+                SwipeBottomToNotificationSettings.SEARCH_INDEX_DATA_PROVIDER, "isPageSearchEnabled",
+                ReflectionHelpers.ClassParameter.from(Context.class, mContext));
+
+        final boolean isEnabled = (Boolean) obj;
+        assertThat(isEnabled).isFalse();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorWorkerTest.java b/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorWorkerTest.java
index d9b2247..c6d3c5e 100644
--- a/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorWorkerTest.java
+++ b/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorWorkerTest.java
@@ -22,7 +22,6 @@
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -94,9 +93,9 @@
         ShadowBluetoothUtils.sLocalBluetoothManager = mLocalBluetoothManager;
         when(mLocalBluetoothManager.getEventManager()).thenReturn(mBluetoothEventManager);
         mMediaOutputIndicatorWorker = new MediaOutputIndicatorWorker(mContext, URI);
-        when(mContext.getSystemService(MediaSessionManager.class)).thenReturn(mMediaSessionManager);
+        doReturn(mMediaSessionManager).when(mContext).getSystemService(MediaSessionManager.class);
         mMediaControllers.add(mMediaController);
-        when(mMediaSessionManager.getActiveSessions(any())).thenReturn(mMediaControllers);
+        doReturn(mMediaControllers).when(mMediaSessionManager).getActiveSessions(any());
 
         mResolver = mock(ContentResolver.class);
         doReturn(mResolver).when(mContext).getContentResolver();
@@ -144,6 +143,7 @@
 
     @Test
     public void onSlicePinned_noActiveController_noPackageName() {
+        mMediaOutputIndicatorWorker.mLocalMediaManager = mLocalMediaManager;
         mMediaControllers.clear();
 
         mMediaOutputIndicatorWorker.onSlicePinned();
@@ -186,18 +186,16 @@
 
     @Test
     public void onReceive_shouldNotifyChange() {
+        mMediaOutputIndicatorWorker.mLocalMediaManager = mLocalMediaManager;
         mMediaOutputIndicatorWorker.onSlicePinned();
         waitForLocalMediaManagerInit();
-        // onSlicePinned will registerCallback() and get first callback. Callback triggers this at
-        // the first time.
-        verify(mResolver, times(1)).notifyChange(URI, null);
 
         final Intent intent = new Intent(AudioManager.STREAM_DEVICES_CHANGED_ACTION);
         for (BroadcastReceiver receiver : mShadowApplication.getReceiversForIntent(intent)) {
             receiver.onReceive(mContext, intent);
         }
         // Intent receiver triggers notifyChange() again
-        verify(mResolver, times(2)).notifyChange(URI, null /* observer */);
+        verify(mResolver).notifyChange(URI, null /* observer */);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/network/AdaptiveConnectivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/AdaptiveConnectivityPreferenceControllerTest.java
new file mode 100644
index 0000000..9ba6238
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/network/AdaptiveConnectivityPreferenceControllerTest.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.provider.Settings;
+
+import com.android.settings.R;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class AdaptiveConnectivityPreferenceControllerTest {
+
+    private static final String PREF_KEY = "adaptive_connectivity";
+
+    private Context mContext;
+    @Mock private Resources mResources;
+    private AdaptiveConnectivityPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
+        doReturn(mResources).when(mContext).getResources();
+        mController = new AdaptiveConnectivityPreferenceController(mContext, PREF_KEY);
+    }
+
+    @Test
+    public void isAvailable_supportAdaptiveConnectivity_shouldReturnTrue() {
+        when(mResources.getBoolean(R.bool.config_show_adaptive_connectivity))
+                .thenReturn(true);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_notSupportAdaptiveConnectivity_shouldReturnFalse() {
+        when(mResources.getBoolean(R.bool.config_show_adaptive_connectivity))
+                .thenReturn(false);
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void getSummary_adaptiveConnectivityEnabled_shouldShowOn() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ADAPTIVE_CONNECTIVITY_ENABLED, 1);
+
+        assertThat(mController.getSummary()).isEqualTo(mContext.getString(R.string.switch_on_text));
+    }
+
+    @Test
+    public void getSummary_adaptiveConnectivityEnabled_shouldShowOff() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ADAPTIVE_CONNECTIVITY_ENABLED, 0);
+
+        assertThat(mController.getSummary())
+                .isEqualTo(mContext.getString(R.string.switch_off_text));
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceControllerTest.java
new file mode 100644
index 0000000..dfb9a8f
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceControllerTest.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Answers.RETURNS_DEEP_STUBS;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+
+@RunWith(RobolectricTestRunner.class)
+public class AdaptiveConnectivityTogglePreferenceControllerTest {
+
+    private static final String PREF_KEY = "adaptive_connectivity";
+
+    @Mock(answer = RETURNS_DEEP_STUBS)
+    private Context mContext;
+
+    private AdaptiveConnectivityTogglePreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mController = new AdaptiveConnectivityTogglePreferenceController(mContext, PREF_KEY);
+    }
+
+    @Test
+    public void isAvailable_shouldReturnTrue() {
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void setChecked_withTrue_shouldUpdateSetting() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ADAPTIVE_CONNECTIVITY_ENABLED, 0);
+
+        mController.setChecked(true);
+
+        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ADAPTIVE_CONNECTIVITY_ENABLED, 1))
+                .isEqualTo(1);
+    }
+
+    @Test
+    public void setChecked_withFalse_shouldUpdateSetting() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ADAPTIVE_CONNECTIVITY_ENABLED, 1);
+
+        mController.setChecked(false);
+
+        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ADAPTIVE_CONNECTIVITY_ENABLED, 1))
+                .isEqualTo(0);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/network/AllInOneTetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/AllInOneTetherPreferenceControllerTest.java
index f37b0e4..7dcd6d4 100644
--- a/tests/robotests/src/com/android/settings/network/AllInOneTetherPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/AllInOneTetherPreferenceControllerTest.java
@@ -40,7 +40,7 @@
 import androidx.test.core.app.ApplicationProvider;
 
 import com.android.settings.R;
-import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settings.widget.PrimarySwitchPreference;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -117,7 +117,7 @@
     @Mock
     private BluetoothAdapter mBluetoothAdapter;
     @Mock
-    private MasterSwitchPreference mPreference;
+    private PrimarySwitchPreference mPreference;
 
     private static final String PREF_KEY = "tether";
     private AllInOneTetherPreferenceController mController;
diff --git a/tests/robotests/src/com/android/settings/network/TopLevelNetworkEntryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/TopLevelNetworkEntryPreferenceControllerTest.java
index e04262f..a3f0c90 100644
--- a/tests/robotests/src/com/android/settings/network/TopLevelNetworkEntryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/TopLevelNetworkEntryPreferenceControllerTest.java
@@ -27,7 +27,7 @@
 
 import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal;
 import com.android.settings.testutils.shadow.ShadowUtils;
-import com.android.settings.wifi.WifiMasterSwitchPreferenceController;
+import com.android.settings.wifi.WifiPrimarySwitchPreferenceController;
 
 import org.junit.After;
 import org.junit.Before;
@@ -47,7 +47,7 @@
 public class TopLevelNetworkEntryPreferenceControllerTest {
 
     @Mock
-    private WifiMasterSwitchPreferenceController mWifiPreferenceController;
+    private WifiPrimarySwitchPreferenceController mWifiPreferenceController;
     @Mock
     private MobileNetworkPreferenceController mMobileNetworkPreferenceController;
     @Mock
diff --git a/tests/robotests/src/com/android/settings/network/telephony/CarrierSettingsVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/CarrierSettingsVersionPreferenceControllerTest.java
index 268c581..c8ce6c1 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/CarrierSettingsVersionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/CarrierSettingsVersionPreferenceControllerTest.java
@@ -44,7 +44,7 @@
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         final Context context = RuntimeEnvironment.application;
-        mController = new CarrierSettingsVersionPreferenceController(context, "dummy_key");
+        mController = new CarrierSettingsVersionPreferenceController(context, "mock_key");
         mController.init(mSubscriptionId);
         mCarrierConfigManager = Shadows.shadowOf(
                 context.getSystemService(CarrierConfigManager.class));
diff --git a/tests/robotests/src/com/android/settings/notification/AssistantFeedbackPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AssistantFeedbackPreferenceControllerTest.java
new file mode 100644
index 0000000..8cfb0e0
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/AssistantFeedbackPreferenceControllerTest.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.notification;
+
+import static android.provider.Settings.Global.NOTIFICATION_FEEDBACK_ENABLED;
+
+import static com.android.settings.notification.AssistantFeedbackPreferenceController.OFF;
+import static com.android.settings.notification.AssistantFeedbackPreferenceController.ON;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.TwoStatePreference;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class AssistantFeedbackPreferenceControllerTest {
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private PreferenceScreen mScreen;
+
+    private AssistantFeedbackPreferenceController mController;
+    private Preference mPreference;
+
+    private static final String KEY = "asst_feedback_indicator";
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mController = new AssistantFeedbackPreferenceController(mContext, KEY);
+        mPreference = new Preference(RuntimeEnvironment.application);
+        mPreference.setKey(mController.getPreferenceKey());
+        when(mScreen.findPreference(mPreference.getKey())).thenReturn(mPreference);
+    }
+
+    @Test
+    public void testIsVisible() {
+        mController.displayPreference(mScreen);
+
+        assertThat(mPreference.isVisible()).isTrue();
+    }
+
+    @Test
+    public void updateState_preferenceSetCheckedWhenSettingIsOn() {
+        final TwoStatePreference preference = mock(TwoStatePreference.class);
+        final Context context = RuntimeEnvironment.application;
+        Settings.Global.putInt(context.getContentResolver(), NOTIFICATION_FEEDBACK_ENABLED, ON);
+
+        mController = new AssistantFeedbackPreferenceController(context, KEY);
+        mController.updateState(preference);
+
+        verify(preference).setChecked(true);
+    }
+
+    @Test
+    public void updateState_preferenceSetUncheckedWhenSettingIsOff() {
+        final TwoStatePreference preference = mock(TwoStatePreference.class);
+        final Context context = RuntimeEnvironment.application;
+        Settings.Global.putInt(context.getContentResolver(), NOTIFICATION_FEEDBACK_ENABLED, OFF);
+
+        mController = new AssistantFeedbackPreferenceController(context, KEY);
+        mController.updateState(preference);
+
+        verify(preference).setChecked(false);
+    }
+
+    @Test
+    public void isChecked_settingIsOff_shouldReturnFalse() {
+        Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_FEEDBACK_ENABLED, OFF);
+
+        assertThat(mController.isChecked()).isFalse();
+    }
+
+    @Test
+    public void isChecked_settingIsOn_shouldReturnTrue() {
+        Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_FEEDBACK_ENABLED, ON);
+
+        assertThat(mController.isChecked()).isTrue();
+    }
+
+    @Test
+    public void setChecked_setFalse_disablesSetting() {
+        Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_FEEDBACK_ENABLED, ON);
+
+        mController.setChecked(false);
+        int updatedValue = Settings.Global.getInt(mContext.getContentResolver(),
+                NOTIFICATION_FEEDBACK_ENABLED, -1);
+
+        assertThat(updatedValue).isEqualTo(OFF);
+    }
+
+    @Test
+    public void setChecked_setTrue_enablesSetting() {
+        Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_FEEDBACK_ENABLED, OFF);
+
+        mController.setChecked(true);
+        int updatedValue = Settings.Global.getInt(mContext.getContentResolver(),
+                NOTIFICATION_FEEDBACK_ENABLED, -1);
+
+        assertThat(updatedValue).isEqualTo(ON);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/notification/RemoteVolumeGroupControllerTest.java b/tests/robotests/src/com/android/settings/notification/RemoteVolumeGroupControllerTest.java
index e824505..6dae2a6 100644
--- a/tests/robotests/src/com/android/settings/notification/RemoteVolumeGroupControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/RemoteVolumeGroupControllerTest.java
@@ -21,6 +21,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
@@ -31,6 +32,7 @@
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageStats;
 import android.media.RoutingSessionInfo;
+import android.media.session.MediaSessionManager;
 
 import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
@@ -77,6 +79,8 @@
     private PreferenceManager mPreferenceManager;
     @Mock
     private SharedPreferences mSharedPreferences;
+    @Mock
+    private MediaSessionManager mMediaSessionManager;
 
     private final List<RoutingSessionInfo> mRoutingSessionInfos = new ArrayList<>();
 
@@ -91,7 +95,9 @@
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
+        mContext = spy(RuntimeEnvironment.application);
+        doReturn(mMediaSessionManager).when(mContext).getSystemService(
+                Context.MEDIA_SESSION_SERVICE);
         mController = new RemoteVolumeGroupController(mContext, KEY_REMOTE_VOLUME_GROUP);
         mController.mLocalMediaManager = mLocalMediaManager;
         mPreferenceCategory = spy(new PreferenceCategory(mContext));
diff --git a/tests/robotests/src/com/android/settings/notification/app/BlockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/BlockPreferenceControllerTest.java
index d203c47..2ea240e 100644
--- a/tests/robotests/src/com/android/settings/notification/app/BlockPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/app/BlockPreferenceControllerTest.java
@@ -368,6 +368,7 @@
     public void testOnSwitchChanged_channel_nonDefault() {
         NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
         NotificationChannel channel = new NotificationChannel("a", "a", IMPORTANCE_HIGH);
+        channel.setOriginalImportance(IMPORTANCE_HIGH);
         mController.onResume(appRow, channel, null, null, null, null);
         mController.updateState(mPreference);
 
@@ -375,7 +376,7 @@
         assertEquals(IMPORTANCE_NONE, channel.getImportance());
 
         mController.onSwitchChanged(null, true);
-        assertEquals(IMPORTANCE_DEFAULT, channel.getImportance());
+        assertEquals(IMPORTANCE_HIGH, channel.getImportance());
 
         verify(mBackend, times(2)).updateChannel(any(), anyInt(), any());
     }
diff --git a/tests/robotests/src/com/android/settings/notification/app/BubblePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/BubblePreferenceControllerTest.java
index 6fec525..afb3d1b 100644
--- a/tests/robotests/src/com/android/settings/notification/app/BubblePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/app/BubblePreferenceControllerTest.java
@@ -137,7 +137,7 @@
     }
 
     @Test
-    public void isAvailable_channel_yesIfAppOff() {
+    public void isAvailable_channel_notIfAppOff() {
         Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
         NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
         appRow.bubblePreference = BUBBLE_PREFERENCE_NONE;
@@ -145,7 +145,7 @@
         when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH);
         mController.onResume(appRow, channel, null, null, null, null);
 
-        assertTrue(mController.isAvailable());
+        assertFalse(mController.isAvailable());
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/notification/app/ConversationPriorityPreferenceTest.java b/tests/robotests/src/com/android/settings/notification/app/ConversationPriorityPreferenceTest.java
index 12e1f35..2d2fcc8 100644
--- a/tests/robotests/src/com/android/settings/notification/app/ConversationPriorityPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/notification/app/ConversationPriorityPreferenceTest.java
@@ -68,10 +68,6 @@
         final LayoutInflater inflater = LayoutInflater.from(mContext);
         PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
                 inflater.inflate(preference.getLayoutResource(), null));
-        Drawable unselected = mock(Drawable.class);
-        Drawable selected = mock(Drawable.class);
-        preference.selectedBackground = selected;
-        preference.unselectedBackground = unselected;
 
         preference.setConfigurable(false);
         preference.setImportance(IMPORTANCE_DEFAULT);
@@ -81,35 +77,6 @@
         assertThat(holder.itemView.findViewById(R.id.silence).isEnabled()).isFalse();
         assertThat(holder.itemView.findViewById(R.id.priority_group).isEnabled()).isFalse();
         assertThat(holder.itemView.findViewById(R.id.alert).isEnabled()).isFalse();
-
-        assertThat(holder.itemView.findViewById(R.id.priority_group).getBackground())
-                .isEqualTo(selected);
-        assertThat(holder.itemView.findViewById(R.id.alert).getBackground()).isEqualTo(unselected);
-        assertThat(holder.itemView.findViewById(R.id.silence).getBackground())
-                .isEqualTo(unselected);
-
-        // other button
-        preference.setPriorityConversation(false);
-        holder = PreferenceViewHolder.createInstanceForTests(
-                inflater.inflate(preference.getLayoutResource(), null));
-        preference.onBindViewHolder(holder);
-
-        assertThat(holder.itemView.findViewById(R.id.alert).getBackground()).isEqualTo(selected);
-        assertThat(holder.itemView.findViewById(R.id.silence).getBackground())
-                .isEqualTo(unselected);
-        assertThat(holder.itemView.findViewById(R.id.priority_group).getBackground())
-                .isEqualTo(unselected);
-
-        // other other button
-        preference.setImportance(IMPORTANCE_LOW);
-        holder = PreferenceViewHolder.createInstanceForTests(
-                inflater.inflate(preference.getLayoutResource(), null));
-        preference.onBindViewHolder(holder);
-
-        assertThat(holder.itemView.findViewById(R.id.priority_group).getBackground())
-                .isEqualTo(unselected);
-        assertThat(holder.itemView.findViewById(R.id.alert).getBackground()).isEqualTo(unselected);
-        assertThat(holder.itemView.findViewById(R.id.silence).getBackground()).isEqualTo(selected);
     }
 
     @Test
@@ -119,10 +86,6 @@
         final LayoutInflater inflater = LayoutInflater.from(mContext);
         final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
                 inflater.inflate(preference.getLayoutResource(), null));
-        Drawable unselected = mock(Drawable.class);
-        Drawable selected = mock(Drawable.class);
-        preference.selectedBackground = selected;
-        preference.unselectedBackground = unselected;
 
         preference.setConfigurable(true);
         preference.setImportance(IMPORTANCE_LOW);
@@ -130,12 +93,8 @@
 
         preference.onBindViewHolder(holder);
 
-        assertThat(holder.itemView.findViewById(R.id.priority_group).getBackground())
-                .isEqualTo(unselected);
-        assertThat(holder.itemView.findViewById(R.id.alert).getBackground()).isEqualTo(unselected);
-        assertThat(holder.itemView.findViewById(R.id.silence).getBackground())
-                .isEqualTo(selected);
-        assertThat(holder.itemView.findViewById(R.id.silence_summary).getVisibility())
+        assertThat(holder.itemView.findViewById(R.id.silence)
+                .findViewById(R.id.summary).getVisibility())
                 .isEqualTo(View.VISIBLE);
     }
 
@@ -146,10 +105,6 @@
         final LayoutInflater inflater = LayoutInflater.from(mContext);
         final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
                 inflater.inflate(preference.getLayoutResource(), null));
-        Drawable unselected = mock(Drawable.class);
-        Drawable selected = mock(Drawable.class);
-        preference.selectedBackground = selected;
-        preference.unselectedBackground = unselected;
 
         preference.setConfigurable(true);
         preference.setImportance(IMPORTANCE_DEFAULT);
@@ -161,12 +116,6 @@
 
         silenceButton.callOnClick();
 
-        assertThat(holder.itemView.findViewById(R.id.alert).getBackground()).isEqualTo(unselected);
-        assertThat(holder.itemView.findViewById(R.id.priority_group).getBackground())
-                .isEqualTo(unselected);
-        assertThat(holder.itemView.findViewById(R.id.silence).getBackground())
-                .isEqualTo(selected);
-
         verify(preference, times(1)).callChangeListener(new Pair(IMPORTANCE_LOW, false));
     }
 }
diff --git a/tests/robotests/src/com/android/settings/notification/app/NotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/NotificationPreferenceControllerTest.java
index 259f40e..a9e4361 100644
--- a/tests/robotests/src/com/android/settings/notification/app/NotificationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/app/NotificationPreferenceControllerTest.java
@@ -206,7 +206,7 @@
     }
 
     @Test
-    public void testIsBlockable_oemWhitelist() {
+    public void testIsBlockable_oemAllowlist() {
         NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
         NotificationChannel channel = mock(NotificationChannel.class);
         when(channel.isImportanceLockedByOEM()).thenReturn(true);
diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenModeBypassingAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeBypassingAppsPreferenceControllerTest.java
index a9b82eb..460ae2d 100644
--- a/tests/robotests/src/com/android/settings/notification/zen/ZenModeBypassingAppsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeBypassingAppsPreferenceControllerTest.java
@@ -36,6 +36,7 @@
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenModeDurationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeDurationPreferenceControllerTest.java
index a8e583f..11e8548 100644
--- a/tests/robotests/src/com/android/settings/notification/zen/ZenModeDurationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeDurationPreferenceControllerTest.java
@@ -90,7 +90,6 @@
         Settings.Secure.putInt(mContentResolver, Settings.Secure.ZEN_DURATION,
                 zenDuration);
 
-        assertEquals(mContext.getString(R.string.zen_mode_duration_summary_time_minutes,
-                zenDuration), mController.getSummary());
+        assertEquals("45 minutes", mController.getSummary());
     }
 }
diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModePreferenceControllerTest.java
index ef20406..c2abbcd 100644
--- a/tests/robotests/src/com/android/settings/notification/zen/ZenModePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModePreferenceControllerTest.java
@@ -33,10 +33,6 @@
 
 import androidx.preference.Preference;
 
-import com.android.settings.R;
-import com.android.settings.notification.zen.ZenModePreferenceController;
-import com.android.settings.notification.zen.ZenModeSettings;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -85,7 +81,7 @@
         when(mPreference.isEnabled()).thenReturn(true);
 
         mController.updateState(mPreference);
-        verify(mPreference).setSummary(mContext.getString(R.string.zen_mode_sound_summary_off));
+        verify(mPreference).setSummary("Off");
 
         doReturn(1).when(mSummaryBuilder).getEnabledAutomaticRulesCount();
         mController.updateState(mPreference);
diff --git a/tests/robotests/src/com/android/settings/panel/MediaOutputPanelTest.java b/tests/robotests/src/com/android/settings/panel/MediaOutputPanelTest.java
index 2ab428d..4befa8b 100644
--- a/tests/robotests/src/com/android/settings/panel/MediaOutputPanelTest.java
+++ b/tests/robotests/src/com/android/settings/panel/MediaOutputPanelTest.java
@@ -21,6 +21,7 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
@@ -92,7 +93,7 @@
         when(mMediaController.getPackageName()).thenReturn(TEST_PACKAGENAME);
         when(mMediaSessionManager.getActiveSessions(any())).thenReturn(mMediaControllers);
         when(mContext.getApplicationContext()).thenReturn(mContext);
-        when(mContext.getSystemService(MediaSessionManager.class)).thenReturn(mMediaSessionManager);
+        doReturn(mMediaSessionManager).when(mContext).getSystemService(MediaSessionManager.class);
         MediaDescription.Builder builder = new MediaDescription.Builder();
         builder.setTitle(TEST_SONG);
         builder.setSubtitle(TEST_ARTIST);
diff --git a/tests/robotests/src/com/android/settings/panel/SettingsPanelActivityTest.java b/tests/robotests/src/com/android/settings/panel/SettingsPanelActivityTest.java
index 833d510..4a14798 100644
--- a/tests/robotests/src/com/android/settings/panel/SettingsPanelActivityTest.java
+++ b/tests/robotests/src/com/android/settings/panel/SettingsPanelActivityTest.java
@@ -26,6 +26,7 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -36,6 +37,9 @@
 import android.view.Window;
 import android.view.WindowManager;
 
+import androidx.fragment.app.FragmentManager;
+
+import com.android.settings.R;
 import com.android.settings.core.HideNonSystemOverlayMixin;
 import com.android.settings.testutils.FakeFeatureFactory;
 
@@ -43,6 +47,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
@@ -56,6 +61,10 @@
     private FakeSettingsPanelActivity mSettingsPanelActivity;
     private PanelFeatureProvider mPanelFeatureProvider;
     private FakePanelContent mFakePanelContent;
+    @Mock
+    private PanelFragment mPanelFragment;
+    @Mock
+    private FragmentManager mFragmentManager;
 
     @Before
     public void setUp() {
@@ -67,6 +76,10 @@
         mFakeFeatureFactory.panelFeatureProvider = mPanelFeatureProvider;
         mFakePanelContent = new FakePanelContent();
         doReturn(mFakePanelContent).when(mPanelFeatureProvider).getPanel(any(), any());
+
+        mSettingsPanelActivity.mPanelFragment = mPanelFragment;
+        when(mFragmentManager.findFragmentById(R.id.main_content)).thenReturn(mPanelFragment);
+        when(mSettingsPanelActivity.getSupportFragmentManager()).thenReturn(mFragmentManager);
     }
 
     @Test
@@ -142,10 +155,61 @@
     }
 
     @Test
+    public void onStop_panelIsNotCreating_shouldForceUpdate() {
+        mSettingsPanelActivity.mForceCreation = false;
+        when(mPanelFragment.isPanelCreating()).thenReturn(false);
+        mSettingsPanelActivity.mPanelFragment = mPanelFragment;
+
+        mSettingsPanelActivity.onStop();
+
+        assertThat(mSettingsPanelActivity.mForceCreation).isTrue();
+    }
+
+    @Test
+    public void onStop_panelIsCreating_shouldNotForceUpdate() {
+        mSettingsPanelActivity.mForceCreation = false;
+        when(mPanelFragment.isPanelCreating()).thenReturn(true);
+        mSettingsPanelActivity.mPanelFragment = mPanelFragment;
+
+        mSettingsPanelActivity.onStop();
+
+        assertThat(mSettingsPanelActivity.mForceCreation).isFalse();
+    }
+
+    @Test
     public void onConfigurationChanged_shouldForceUpdate() {
         mSettingsPanelActivity.mForceCreation = false;
+
         mSettingsPanelActivity.onConfigurationChanged(new Configuration());
 
         assertThat(mSettingsPanelActivity.mForceCreation).isTrue();
     }
+
+    @Test
+    public void onNewIntent_panelIsNotCreating_shouldUpdatePanel() {
+        when(mPanelFragment.isPanelCreating()).thenReturn(false);
+
+        mSettingsPanelActivity.onNewIntent(mSettingsPanelActivity.getIntent());
+
+        verify(mPanelFragment).updatePanelWithAnimation();
+    }
+
+    @Test
+    public void onNewIntent_panelIsCreating_shouldNotUpdatePanel() {
+        when(mPanelFragment.isPanelCreating()).thenReturn(true);
+
+        mSettingsPanelActivity.onNewIntent(mSettingsPanelActivity.getIntent());
+
+        verify(mPanelFragment, never()).updatePanelWithAnimation();
+    }
+
+    @Test
+    public void onNewIntent_panelIsShowingTheSameAction_shouldNotUpdatePanel() {
+        when(mPanelFragment.isPanelCreating()).thenReturn(false);
+        when(mPanelFragment.getArguments()).thenReturn(mSettingsPanelActivity.mBundle);
+
+        mSettingsPanelActivity.onNewIntent(mSettingsPanelActivity.getIntent());
+
+        verify(mPanelFragment, never()).updatePanelWithAnimation();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java
index 5ec6f41..a9bb8ce 100644
--- a/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java
@@ -92,8 +92,8 @@
                 .setUserId(123)
                 .build();
 
-        assertThat(intent.getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, true))
-                .named("EXTRA_KEY_HAS_CHALLENGE")
+        assertThat(intent.getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_FORCE_VERIFY, false))
+                .named("EXTRA_KEY_FORCE_VERIFY")
                 .isFalse();
         assertThat((LockscreenCredential) intent.getParcelableExtra(
                 ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD))
@@ -108,19 +108,17 @@
     }
 
     @Test
-    public void intentBuilder_setChallenge_shouldAddExtras() {
+    public void intentBuilder_setRequestGatekeeperPassword_shouldAddExtras() {
         Intent intent = new IntentBuilder(application)
-                .setChallenge(12345L)
+                .setRequestGatekeeperPasswordHandle(true)
                 .setPasswordQuality(PASSWORD_QUALITY_ALPHANUMERIC)
                 .setUserId(123)
                 .build();
 
-        assertThat(intent.getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false))
-                .named("EXTRA_KEY_HAS_CHALLENGE")
+        assertThat(intent.getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE,
+                false))
+                .named("EXTRA_KEY_REQUEST_GK_PW")
                 .isTrue();
-        assertThat(intent.getLongExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0L))
-                .named("EXTRA_KEY_CHALLENGE")
-                .isEqualTo(12345L);
         assertThat(intent.getIntExtra(PASSWORD_TYPE_KEY, 0))
                 .named("PASSWORD_TYPE_KEY")
                 .isEqualTo(PASSWORD_QUALITY_ALPHANUMERIC);
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java
index 557e7c1..f95fda4 100644
--- a/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java
@@ -46,7 +46,7 @@
 
     @Test
     public void activityCreationTest() {
-        // Basic sanity test for activity created without crashing
+        // Basic test for activity created without crashing
         Robolectric.buildActivity(ChooseLockPattern.class, new IntentBuilder(application).build())
                 .setup().get();
     }
@@ -59,8 +59,8 @@
                 .build();
 
         assertThat(intent
-                .getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, true))
-                .named("EXTRA_KEY_HAS_CHALLENGE")
+                .getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_FORCE_VERIFY, false))
+                .named("EXTRA_KEY_FORCE_VERIFY")
                 .isFalse();
         assertThat((LockscreenCredential) intent
                 .getParcelableExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD))
@@ -72,21 +72,17 @@
     }
 
     @Test
-    public void intentBuilder_setChallenge_shouldAddExtras() {
+    public void intentBuilder_setRequestGatekeeperPassword_shouldAddExtras() {
         Intent intent = new IntentBuilder(application)
-                .setChallenge(12345L)
+                .setRequestGatekeeperPasswordHandle(true)
                 .setUserId(123)
                 .build();
 
         assertThat(intent
-                .getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false))
-                .named("EXTRA_KEY_HAS_CHALLENGE")
+                .getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE, false))
+                .named("EXTRA_KEY_REQUEST_GK_PW")
                 .isTrue();
         assertThat(intent
-                .getLongExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0L))
-                .named("EXTRA_KEY_CHALLENGE")
-                .isEqualTo(12345L);
-        assertThat(intent
                 .getIntExtra(Intent.EXTRA_USER_ID, 0))
                 .named("EXTRA_USER_ID")
                 .isEqualTo(123);
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java
index 64e1915..d082bde 100644
--- a/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java
@@ -36,31 +36,26 @@
 public class ChooseLockSettingsHelperTest {
 
     @Test
-    public void testLaunchConfirmationActivityWithExternalAndChallenge() {
+    public void testLaunchConfirmationActivityWithExternal() {
         final Activity activity = Robolectric.setupActivity(Activity.class);
-        ChooseLockSettingsHelper helper = getChooseLockSettingsHelper(activity);
-        helper.launchConfirmationActivityWithExternalAndChallenge(
-            100, // request
-            "title",
-            "header",
-            "description",
-            true, // external
-            10000L,
-            UserHandle.myUserId()
-        );
+
+        ChooseLockSettingsHelper.Builder builder = new ChooseLockSettingsHelper.Builder(activity);
+        builder.setRequestCode(100)
+                .setTitle("title")
+                .setHeader("header")
+                .setDescription("description")
+                .setExternal(true)
+                .setUserId(UserHandle.myUserId());
+        ChooseLockSettingsHelper helper = getChooseLockSettingsHelper(builder);
+        helper.launch();
 
         ShadowActivity shadowActivity = Shadows.shadowOf(activity);
         Intent startedIntent = shadowActivity.getNextStartedActivity();
 
-        assertEquals(new ComponentName("com.android.settings",
-                        ConfirmLockPattern.InternalActivity.class.getName()),
+        assertEquals(new ComponentName("com.android.settings", ConfirmLockPattern.class.getName()),
                 startedIntent.getComponent());
         assertFalse(startedIntent.getBooleanExtra(
                 ChooseLockSettingsHelper.EXTRA_KEY_RETURN_CREDENTIALS, false));
-        assertTrue(startedIntent.getBooleanExtra(
-                ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false));
-        assertEquals(10000L, startedIntent.getLongExtra(
-                ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0L));
         assertTrue((startedIntent.getFlags() & Intent.FLAG_ACTIVITY_FORWARD_RESULT) != 0);
         assertFalse(startedIntent.getBooleanExtra(
                 ConfirmDeviceCredentialBaseFragment.DARK_THEME, false));
@@ -71,30 +66,30 @@
     }
 
     @Test
-    public void testLaunchConfirmationActivityInternalAndChallenge() {
+    public void testLaunchConfirmationActivityInternal() {
         final Activity activity = Robolectric.setupActivity(Activity.class);
-        ChooseLockSettingsHelper helper = getChooseLockSettingsHelper(activity);
-        helper.launchConfirmationActivityWithExternalAndChallenge(
-            100,
-            "title",
-            "header",
-            "description",
-            false, // external
-            10000L,
-            UserHandle.myUserId()
-        );
+
+        ChooseLockSettingsHelper.Builder builder = new ChooseLockSettingsHelper.Builder(activity);
+        builder.setRequestCode(100)
+                .setTitle("title")
+                .setHeader("header")
+                .setDescription("description")
+                .setForceVerifyPath(true)
+                .setReturnCredentials(true)
+                .setUserId(UserHandle.myUserId());
+        ChooseLockSettingsHelper helper = getChooseLockSettingsHelper(builder);
+        helper.launch();
+
         ShadowActivity shadowActivity = Shadows.shadowOf(activity);
         Intent startedIntent = shadowActivity.getNextStartedActivity();
 
         assertEquals(new ComponentName("com.android.settings",
                         ConfirmLockPattern.InternalActivity.class.getName()),
                 startedIntent.getComponent());
-        assertFalse(startedIntent.getBooleanExtra(
-                ChooseLockSettingsHelper.EXTRA_KEY_RETURN_CREDENTIALS, false));
         assertTrue(startedIntent.getBooleanExtra(
-                ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false));
-        assertEquals(10000L, startedIntent.getLongExtra(
-                ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0L));
+                ChooseLockSettingsHelper.EXTRA_KEY_RETURN_CREDENTIALS, true));
+        assertTrue(startedIntent.getBooleanExtra(
+                ChooseLockSettingsHelper.EXTRA_KEY_FORCE_VERIFY, true));
         assertFalse((startedIntent.getFlags() & Intent.FLAG_ACTIVITY_FORWARD_RESULT) != 0);
         assertFalse(startedIntent.getBooleanExtra(
                 ConfirmDeviceCredentialBaseFragment.DARK_THEME, false));
@@ -109,8 +104,14 @@
         Intent intent = new Intent()
                 .putExtra(WizardManagerHelper.EXTRA_THEME, ThemeHelper.THEME_GLIF_V2);
         Activity activity = Robolectric.buildActivity(Activity.class, intent).get();
-        ChooseLockSettingsHelper helper = getChooseLockSettingsHelper(activity);
-        helper.launchConfirmationActivity(123, "test title", true, 0 /* userId */);
+
+        ChooseLockSettingsHelper.Builder builder = new ChooseLockSettingsHelper.Builder(activity);
+        builder.setRequestCode(123)
+                .setTitle("test title")
+                .setReturnCredentials(true)
+                .setUserId(0);
+        ChooseLockSettingsHelper helper = getChooseLockSettingsHelper(builder);
+        helper.launch();
 
         ShadowActivity shadowActivity = Shadows.shadowOf(activity);
         IntentForResult startedActivity = shadowActivity.getNextStartedActivityForResult();
@@ -119,12 +120,13 @@
                 .isEqualTo(ThemeHelper.THEME_GLIF_V2);
     }
 
-    private ChooseLockSettingsHelper getChooseLockSettingsHelper(Activity activity) {
+    private ChooseLockSettingsHelper getChooseLockSettingsHelper(
+            ChooseLockSettingsHelper.Builder builder) {
         LockPatternUtils mockLockPatternUtils = mock(LockPatternUtils.class);
         when(mockLockPatternUtils.getKeyguardStoredPasswordQuality(anyInt()))
                 .thenReturn(DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);
 
-        ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(activity);
+        ChooseLockSettingsHelper helper = builder.build();
         helper.mLockPatternUtils = mockLockPatternUtils;
         return helper;
     }
diff --git a/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java b/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java
index b579347..3034807 100644
--- a/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java
+++ b/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java
@@ -19,14 +19,11 @@
 import static android.content.pm.PackageManager.FEATURE_FACE;
 import static android.content.pm.PackageManager.FEATURE_FINGERPRINT;
 
-import static com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment
-        .HIDE_DISABLED_PREFS;
-import static com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment
-        .MINIMUM_QUALITY_KEY;
-import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE;
+import static com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment.HIDE_DISABLED_PREFS;
+import static com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY;
 import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_FOR_FACE;
 import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT;
-import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE;
+import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -57,8 +54,6 @@
 public final class SetNewPasswordControllerTest {
 
     private static final int CURRENT_USER_ID = 101;
-    private static final long FINGERPRINT_CHALLENGE = -9876512313131L;
-    private static final long FACE_CHALLENGE = 1352057789L;
 
     @Mock
     private PackageManager mPackageManager;
@@ -79,11 +74,7 @@
         mSetNewPasswordController = new SetNewPasswordController(
                 CURRENT_USER_ID, mPackageManager, mFingerprintManager, mFaceManager,
                 mDevicePolicyManager, mUi);
-
-        when(mFingerprintManager.preEnroll()).thenReturn(FINGERPRINT_CHALLENGE);
         when(mPackageManager.hasSystemFeature(eq(FEATURE_FINGERPRINT))).thenReturn(true);
-
-        when(mFaceManager.generateChallenge()).thenReturn(FACE_CHALLENGE);
         when(mPackageManager.hasSystemFeature(eq(FEATURE_FACE))).thenReturn(true);
     }
 
@@ -278,12 +269,8 @@
                 "All disabled preference should be removed.",
                 actualBundle.getBoolean(HIDE_DISABLED_PREFS));
         assertTrue(
-                "There must be a fingerprint challenge.",
-                actualBundle.getBoolean(EXTRA_KEY_HAS_CHALLENGE));
-        assertEquals(
-                "The fingerprint challenge must come from the FingerprintManager",
-                FINGERPRINT_CHALLENGE,
-                actualBundle.getLong(EXTRA_KEY_CHALLENGE));
+                "Fingerprint enroll must request Gatekeeper Password.",
+                actualBundle.getBoolean(EXTRA_KEY_REQUEST_GK_PW_HANDLE));
         assertTrue(
                 "The request must be a fingerprint set up request.",
                 actualBundle.getBoolean(EXTRA_KEY_FOR_FINGERPRINT));
@@ -302,12 +289,8 @@
                 "All disabled preference should be removed.",
                 actualBundle.getBoolean(HIDE_DISABLED_PREFS));
         assertTrue(
-                "There must be a face challenge.",
-                actualBundle.getBoolean(EXTRA_KEY_HAS_CHALLENGE));
-        assertEquals(
-                "The face challenge must come from the FaceManager",
-                FACE_CHALLENGE,
-                actualBundle.getLong(EXTRA_KEY_CHALLENGE));
+                "Face enroll must request Gatekeeper Password",
+                actualBundle.getBoolean(EXTRA_KEY_REQUEST_GK_PW_HANDLE));
         assertTrue(
                 "The request must be a face set up request.",
                 actualBundle.getBoolean(EXTRA_KEY_FOR_FACE));
diff --git a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java
index 77058c0..1a76799 100644
--- a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java
+++ b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java
@@ -82,7 +82,7 @@
 
     @Test
     public void createActivity_shouldNotCrash() {
-        // Basic sanity test for activity created without crashing
+        // Basic test for activity created without crashing
         final Intent intent =
                 SetupChooseLockPassword.modifyIntentForSetup(
                         application,
diff --git a/tests/robotests/src/com/android/settings/search/CustomSiteMapRegistryTest.java b/tests/robotests/src/com/android/settings/search/CustomSiteMapRegistryTest.java
index 20f0716..181821b 100644
--- a/tests/robotests/src/com/android/settings/search/CustomSiteMapRegistryTest.java
+++ b/tests/robotests/src/com/android/settings/search/CustomSiteMapRegistryTest.java
@@ -35,7 +35,7 @@
 import com.android.settings.security.screenlock.ScreenLockSettings;
 import com.android.settings.system.SystemDashboardFragment;
 import com.android.settings.wallpaper.WallpaperSuggestionActivity;
-import com.android.settings.wifi.WifiSettings2;
+import com.android.settings.wifi.WifiSettings;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -58,8 +58,8 @@
     }
 
     @Test
-    public void shouldContainWifiSettings2Pairs() {
-        assertThat(CustomSiteMapRegistry.CUSTOM_SITE_MAP.get(WifiSettings2.class.getName()))
+    public void shouldContainWifiSettingsPairs() {
+        assertThat(CustomSiteMapRegistry.CUSTOM_SITE_MAP.get(WifiSettings.class.getName()))
                 .isEqualTo(NetworkDashboardFragment.class.getName());
     }
 
diff --git a/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java b/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java
index 9daac80..5fc293e 100644
--- a/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java
+++ b/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java
@@ -57,21 +57,21 @@
             "SearchIndexableProvider must either provide no resource to index, or valid ones. "
                     + "But the followings contain resource with xml id = 0\n";
 
-    private final List<String> notImplementingIndexProviderGrandfatherList;
-    private final List<String> notInSearchIndexableRegistryGrandfatherList;
-    private final List<String> notSharingPrefControllersGrandfatherList;
+    private final List<String> mNotImplementingIndexProviderExemptList;
+    private final List<String> mNotInSearchIndexableRegistryExemptList;
+    private final List<String> mNotSharingPrefControllersExemptList;
 
     public SearchIndexProviderCodeInspector(List<Class<?>> classes) {
         super(classes);
-        notImplementingIndexProviderGrandfatherList = new ArrayList<>();
-        notInSearchIndexableRegistryGrandfatherList = new ArrayList<>();
-        notSharingPrefControllersGrandfatherList = new ArrayList<>();
-        initializeGrandfatherList(notImplementingIndexProviderGrandfatherList,
-                "grandfather_not_implementing_index_provider");
-        initializeGrandfatherList(notInSearchIndexableRegistryGrandfatherList,
-                "grandfather_not_in_search_index_provider_registry");
-        initializeGrandfatherList(notSharingPrefControllersGrandfatherList,
-                "grandfather_not_sharing_pref_controllers_with_search_provider");
+        mNotImplementingIndexProviderExemptList = new ArrayList<>();
+        mNotInSearchIndexableRegistryExemptList = new ArrayList<>();
+        mNotSharingPrefControllersExemptList = new ArrayList<>();
+        initializeExemptList(mNotImplementingIndexProviderExemptList,
+                "exempt_not_implementing_index_provider");
+        initializeExemptList(mNotInSearchIndexableRegistryExemptList,
+                "exempt_not_in_search_index_provider_registry");
+        initializeExemptList(mNotSharingPrefControllersExemptList,
+                "exempt_not_sharing_pref_controllers_with_search_provider");
     }
 
     @Override
@@ -100,7 +100,7 @@
             final boolean hasSearchIndexProvider = hasSearchIndexProvider(clazz);
             // If it implements Indexable, it must also implement the index provider field.
             if (!hasSearchIndexProvider) {
-                if (!notImplementingIndexProviderGrandfatherList.remove(className)) {
+                if (!mNotImplementingIndexProviderExemptList.remove(className)) {
                     notImplementingIndexProvider.add(className);
                 }
                 continue;
@@ -110,14 +110,14 @@
             final boolean isSharingPrefControllers = DashboardFragmentSearchIndexProviderInspector
                     .isSharingPreferenceControllers(clazz);
             if (!isSharingPrefControllers) {
-                if (!notSharingPrefControllersGrandfatherList.remove(className)) {
+                if (!mNotSharingPrefControllersExemptList.remove(className)) {
                     notSharingPreferenceControllers.add(className);
                 }
                 continue;
             }
             // Must be in SearchProviderRegistry
             if (!providerClasses.contains(clazz)) {
-                if (!notInSearchIndexableRegistryGrandfatherList.remove(className)) {
+                if (!mNotInSearchIndexableRegistryExemptList.remove(className)) {
                     notInSearchProviderRegistry.add(className);
                 }
             }
@@ -149,13 +149,13 @@
         assertWithMessage(notProvidingValidResourceError)
                 .that(notProvidingValidResource)
                 .isEmpty();
-        assertNoObsoleteInGrandfatherList("grandfather_not_implementing_index_provider",
-                notImplementingIndexProviderGrandfatherList);
-        assertNoObsoleteInGrandfatherList("grandfather_not_in_search_index_provider_registry",
-                notInSearchIndexableRegistryGrandfatherList);
-        assertNoObsoleteInGrandfatherList(
-                "grandfather_not_sharing_pref_controllers_with_search_provider",
-                notSharingPrefControllersGrandfatherList);
+        assertNoObsoleteInExemptList("exempt_not_implementing_index_provider",
+                mNotImplementingIndexProviderExemptList);
+        assertNoObsoleteInExemptList("exempt_not_in_search_index_provider_registry",
+                mNotInSearchIndexableRegistryExemptList);
+        assertNoObsoleteInExemptList(
+                "exempt_not_sharing_pref_controllers_with_search_provider",
+                mNotSharingPrefControllersExemptList);
     }
 
     private boolean hasSearchIndexProvider(Class clazz) {
diff --git a/tests/robotests/src/com/android/settings/security/CredentialStoragePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/CredentialStoragePreferenceControllerTest.java
deleted file mode 100644
index 3eb21cf..0000000
--- a/tests/robotests/src/com/android/settings/security/CredentialStoragePreferenceControllerTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.security;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-
-import androidx.preference.Preference;
-
-import com.android.settings.R;
-import com.android.settings.testutils.shadow.ShadowKeyStore;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(shadows = ShadowKeyStore.class)
-public class CredentialStoragePreferenceControllerTest {
-
-    private Context mContext;
-    private CredentialStoragePreferenceController mController;
-    private Preference mPreference;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-        mController = new CredentialStoragePreferenceController(mContext);
-        mPreference = new Preference(mContext);
-    }
-
-    @Test
-    public void updateState_hardwareBacked_showHardwareSummary() {
-        ShadowKeyStore.setHardwareBacked(true);
-
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.getSummary())
-                .isEqualTo(mContext.getText(R.string.credential_storage_type_hardware));
-    }
-
-    @Test
-    public void updateState_hardwareBacked_showSoftwareSummary() {
-        ShadowKeyStore.setHardwareBacked(false);
-
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.getSummary())
-                .isEqualTo(mContext.getText(R.string.credential_storage_type_software));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java
index 78ad5e5..c25700c 100644
--- a/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java
@@ -39,7 +39,6 @@
 
     private Context mContext;
     private ShadowUserManager mUserManager;
-    private CredentialStoragePreferenceController mCredentialStoragePreferenceController;
     private InstallCertificatePreferenceController mInstallCertificatePreferenceController;
     private ResetCredentialsPreferenceController mResetCredentialsPreferenceController;
     private UserCredentialsPreferenceController mUserCredentialsPreferenceController;
@@ -54,8 +53,6 @@
         mContext = RuntimeEnvironment.application;
         mLifecycleOwner = () -> mLifecycle;
         mLifecycle = new Lifecycle(mLifecycleOwner);
-        mCredentialStoragePreferenceController =
-                new CredentialStoragePreferenceController(mContext);
         mInstallCertificatePreferenceController =
                 new InstallCertificatePreferenceController(mContext);
         mResetCredentialsPreferenceController =
@@ -73,7 +70,6 @@
 
     @Test
     public void isAvailable_noRestriction_shouldReturnTrue() {
-        assertThat(mCredentialStoragePreferenceController.isAvailable()).isTrue();
         assertThat(mInstallCertificatePreferenceController.isAvailable()).isTrue();
         assertThat(mResetCredentialsPreferenceController.isAvailable()).isTrue();
         assertThat(mUserCredentialsPreferenceController.isAvailable()).isTrue();
@@ -86,7 +82,6 @@
     public void isAvailable_hasRestriction_shouldReturnFalse() {
         mUserManager.addBaseUserRestriction(UserManager.DISALLOW_CONFIG_CREDENTIALS);
 
-        assertThat(mCredentialStoragePreferenceController.isAvailable()).isFalse();
         assertThat(mInstallCertificatePreferenceController.isAvailable()).isFalse();
         assertThat(mResetCredentialsPreferenceController.isAvailable()).isFalse();
         assertThat(mUserCredentialsPreferenceController.isAvailable()).isFalse();
diff --git a/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java
index 7c44561..8884ab8 100644
--- a/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java
@@ -119,7 +119,7 @@
         mController.updateState(mPreference);
         assertThat(mPreference.isChecked()).isFalse();
         assertThat(mPreference.getSummary()).isEqualTo(mContext.getString(
-                R.string.summary_placeholder));
+                R.string.summary_empty));
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/shortcut/CreateShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/shortcut/CreateShortcutPreferenceControllerTest.java
index f9cedb3..cfc9f90 100644
--- a/tests/robotests/src/com/android/settings/shortcut/CreateShortcutPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/shortcut/CreateShortcutPreferenceControllerTest.java
@@ -93,7 +93,7 @@
         final Intent intent = new Intent(CreateShortcutPreferenceController.SHORTCUT_PROBE)
                 .setClass(mContext, Settings.ManageApplicationsActivity.class);
         final ResolveInfo ri = mContext.getPackageManager().resolveActivity(intent, 0);
-        final Intent result = mController.createResultIntent(intent, ri, "dummy");
+        final Intent result = mController.createResultIntent(intent, ri, "mock");
 
         assertThat(result.getStringExtra("d1")).isEqualTo("d2");
         assertThat((Object) result.getParcelableExtra(Intent.EXTRA_SHORTCUT_INTENT)).isNotNull();
diff --git a/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java b/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java
index 2f0d60a..b5c6c44 100644
--- a/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java
@@ -215,7 +215,7 @@
 
     @Test
     public void testLoadSlice_cachedEntryRemovedOnBuild() {
-        SliceData data = getDummyData();
+        SliceData data = getMockData();
         mProvider.mSliceWeakDataCache.put(data.getUri(), data);
         mProvider.onBindSlice(data.getUri());
         SliceTestUtils.insertSliceToDb(mContext, data.getKey());
@@ -229,7 +229,7 @@
     public void onBindSlice_mainThread_shouldNotOverrideStrictMode() {
         ShadowThreadUtils.setIsMainThread(true);
         final StrictMode.ThreadPolicy oldThreadPolicy = StrictMode.getThreadPolicy();
-        SliceData data = getDummyData();
+        SliceData data = getMockData();
         mProvider.mSliceWeakDataCache.put(data.getUri(), data);
         mProvider.onBindSlice(data.getUri());
 
@@ -243,7 +243,7 @@
     public void onBindSlice_backgroundThread_shouldOverrideStrictMode() {
         ShadowThreadUtils.setIsMainThread(false);
 
-        SliceData data = getDummyData();
+        SliceData data = getMockData();
         mProvider.mSliceWeakDataCache.put(data.getUri(), data);
         mProvider.onBindSlice(data.getUri());
 
@@ -271,7 +271,7 @@
     @Test
     public void onBindSlice_nightModeChanged_shouldReloadTheme() {
         mContext.getResources().getConfiguration().uiMode = UI_MODE_NIGHT_NO;
-        final SliceData data = getDummyData();
+        final SliceData data = getMockData();
         mProvider.mSliceWeakDataCache.put(data.getUri(), data);
         mProvider.onBindSlice(data.getUri());
 
@@ -284,7 +284,7 @@
     @Test
     public void onBindSlice_nightModeNotChanged_shouldNotReloadTheme() {
         mContext.getResources().getConfiguration().uiMode = UI_MODE_NIGHT_NO;
-        SliceData data = getDummyData();
+        SliceData data = getMockData();
         mProvider.mSliceWeakDataCache.put(data.getUri(), data);
         mProvider.onBindSlice(data.getUri());
 
@@ -625,25 +625,25 @@
 
     @Test
     @Config(qualifiers = "mcc998")
-    public void grantWhitelistedPackagePermissions_noWhitelist_shouldNotGrant() {
+    public void grantAllowlistedPackagePermissions_noAllowlist_shouldNotGrant() {
         final List<Uri> uris = new ArrayList<>();
         uris.add(Uri.parse("content://settings/slice"));
 
-        SettingsSliceProvider.grantWhitelistedPackagePermissions(mContext, uris);
+        SettingsSliceProvider.grantAllowlistedPackagePermissions(mContext, uris);
 
         verify(mManager, never()).grantSlicePermission(anyString(), any(Uri.class));
     }
 
     @Test
     @Config(qualifiers = "mcc999")
-    public void grantWhitelistedPackagePermissions_hasPackageWhitelist_shouldGrant() {
+    public void grantAllowlistedPackagePermissions_hasPackageAllowlist_shouldGrant() {
         final List<Uri> uris = new ArrayList<>();
         uris.add(Uri.parse("content://settings/slice"));
 
-        SettingsSliceProvider.grantWhitelistedPackagePermissions(mContext, uris);
+        SettingsSliceProvider.grantAllowlistedPackagePermissions(mContext, uris);
 
         verify(mManager)
-                .grantSlicePermission("com.android.settings.slice_whitelist_package", uris.get(0));
+                .grantSlicePermission("com.android.settings.slice_allowlist_package", uris.get(0));
     }
 
     @Test
@@ -696,7 +696,7 @@
         assertThat(mProvider.isPrivateSlicesNeeded(uri)).isFalse();
     }
 
-    private static SliceData getDummyData() {
+    private static SliceData getMockData() {
         return new SliceData.Builder()
                 .setKey(KEY)
                 .setUri(URI)
diff --git a/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java b/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java
index 33bdc61..6789718 100644
--- a/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java
@@ -87,7 +87,7 @@
 
     @Test
     public void buildIntentSlice_returnsMatchingSlice() {
-        final SliceData sliceData = getDummyData(CONTEXT_CONTROLLER, SliceData.SliceType.INTENT);
+        final SliceData sliceData = getMockData(CONTEXT_CONTROLLER, SliceData.SliceType.INTENT);
         final Slice slice = SliceBuilderUtils.buildSlice(mContext, sliceData);
 
         SliceTester.testSettingsIntentSlice(mContext, slice, sliceData);
@@ -95,21 +95,21 @@
 
     @Test
     public void buildToggleSlice_returnsMatchingSlice() {
-        final SliceData dummyData = getDummyData(TOGGLE_CONTROLLER, SliceData.SliceType.SWITCH);
+        final SliceData mockData = getMockData(TOGGLE_CONTROLLER, SliceData.SliceType.SWITCH);
 
-        final Slice slice = SliceBuilderUtils.buildSlice(mContext, dummyData);
+        final Slice slice = SliceBuilderUtils.buildSlice(mContext, mockData);
         verify(mFeatureFactory.metricsFeatureProvider)
                 .action(SettingsEnums.PAGE_UNKNOWN,
                         MetricsEvent.ACTION_SETTINGS_SLICE_REQUESTED,
                         SettingsEnums.PAGE_UNKNOWN,
-                        dummyData.getKey(),
+                        mockData.getKey(),
                         0);
-        SliceTester.testSettingsToggleSlice(mContext, slice, dummyData);
+        SliceTester.testSettingsToggleSlice(mContext, slice, mockData);
     }
 
     @Test
     public void buildSliderSlice_returnsMatchingSlice() {
-        final SliceData data = getDummyData(SLIDER_CONTROLLER, SliceData.SliceType.SLIDER);
+        final SliceData data = getMockData(SLIDER_CONTROLLER, SliceData.SliceType.SLIDER);
 
         final Slice slice = SliceBuilderUtils.buildSlice(mContext, data);
         verify(mFeatureFactory.metricsFeatureProvider)
@@ -123,22 +123,22 @@
 
     @Test
     public void buildCopyableSlice_returnsMatchingSlice() {
-        final SliceData dummyData = getDummyData(COPYABLE_CONTROLLER, -1);
+        final SliceData mockData = getMockData(COPYABLE_CONTROLLER, -1);
 
-        final Slice slice = SliceBuilderUtils.buildSlice(mContext, dummyData);
+        final Slice slice = SliceBuilderUtils.buildSlice(mContext, mockData);
         verify(mFeatureFactory.metricsFeatureProvider)
                 .action(SettingsEnums.PAGE_UNKNOWN,
                         MetricsEvent.ACTION_SETTINGS_SLICE_REQUESTED,
                         SettingsEnums.PAGE_UNKNOWN,
-                        dummyData.getKey(),
+                        mockData.getKey(),
                         0);
-        SliceTester.testSettingsCopyableSlice(mContext, slice, dummyData);
+        SliceTester.testSettingsCopyableSlice(mContext, slice, mockData);
     }
 
     @Test
     public void testGetPreferenceController_buildsMatchingController() {
         final BasePreferenceController controller =
-                SliceBuilderUtils.getPreferenceController(mContext, getDummyData());
+                SliceBuilderUtils.getPreferenceController(mContext, getMockData());
 
         assertThat(controller).isInstanceOf(FakeToggleController.class);
     }
@@ -147,14 +147,14 @@
     public void testGetPreferenceController_contextOnly_buildsMatchingController() {
         final BasePreferenceController controller =
                 SliceBuilderUtils.getPreferenceController(mContext,
-                        getDummyData(CONTEXT_CONTROLLER, 0));
+                        getMockData(CONTEXT_CONTROLLER, 0));
 
         assertThat(controller).isInstanceOf(FakeContextOnlyPreferenceController.class);
     }
 
     @Test
     public void getDynamicSummary_allowDynamicSummary_returnsControllerSummary() {
-        final SliceData data = getDummyData();
+        final SliceData data = getMockData();
         final FakePreferenceController controller = spy(
                 new FakePreferenceController(mContext, KEY));
         final String controllerSummary = "new_Summary";
@@ -167,7 +167,7 @@
 
     @Test
     public void getDynamicSummary_allowDynamicSummary_nullSummary_returnsNull() {
-        final SliceData data = getDummyData();
+        final SliceData data = getMockData();
         final FakePreferenceController controller = spy(
                 new FakePreferenceController(mContext, KEY));
 
@@ -180,7 +180,7 @@
 
     @Test
     public void getDynamicSummary_noScreenTitle_returnsPrefControllerSummary() {
-        final SliceData data = getDummyData("", "");
+        final SliceData data = getMockData("", "");
         final FakePreferenceController controller = spy(
                 new FakePreferenceController(mContext, KEY));
         final String controllerSummary = "new_Summary";
@@ -193,7 +193,7 @@
 
     @Test
     public void getDynamicSummary_screenTitleMatchesTitle_returnsPrefControllerSummary() {
-        final SliceData data = getDummyData("", TITLE);
+        final SliceData data = getMockData("", TITLE);
         final FakePreferenceController controller = spy(
                 new FakePreferenceController(mContext, KEY));
         final String controllerSummary = "new_Summary";
@@ -206,7 +206,7 @@
 
     @Test
     public void getDynamicSummary_emptyScreenTitle_emptyControllerSummary_returnsEmptyString() {
-        final SliceData data = getDummyData(null, null);
+        final SliceData data = getMockData(null, null);
         final FakePreferenceController controller = new FakePreferenceController(mContext, KEY);
         final CharSequence summary = SliceBuilderUtils.getSubtitleText(mContext, controller, data);
 
@@ -216,7 +216,7 @@
     @Test
     public void getDynamicSummary_screenTitleAndControllerPlaceholder_returnsSliceEmptyString() {
         final String summaryPlaceholder = mContext.getString(R.string.summary_placeholder);
-        final SliceData data = getDummyData(summaryPlaceholder, summaryPlaceholder);
+        final SliceData data = getMockData(summaryPlaceholder, summaryPlaceholder);
         final FakePreferenceController controller = spy(
                 new FakePreferenceController(mContext, KEY));
         doReturn(summaryPlaceholder).when(controller).getSummary();
@@ -283,7 +283,7 @@
 
     @Test
     public void testUnsupportedSlice_validTitleSummary() {
-        final SliceData data = getDummyData(FakeUnavailablePreferenceController.class,
+        final SliceData data = getMockData(FakeUnavailablePreferenceController.class,
                 SliceData.SliceType.SWITCH);
         Settings.Global.putInt(mContext.getContentResolver(),
                 FakeUnavailablePreferenceController.AVAILABILITY_KEY,
@@ -296,7 +296,7 @@
 
     @Test
     public void testDisabledForUserSlice_validTitleSummary() {
-        final SliceData data = getDummyData(FakeUnavailablePreferenceController.class,
+        final SliceData data = getMockData(FakeUnavailablePreferenceController.class,
                 SliceData.SliceType.SWITCH);
         Settings.Global.putInt(mContext.getContentResolver(),
                 FakeUnavailablePreferenceController.AVAILABILITY_KEY,
@@ -309,7 +309,7 @@
 
     @Test
     public void testDisabledDependentSettingSlice_validTitleSummary() {
-        final SliceData data = getDummyData(FakeUnavailablePreferenceController.class,
+        final SliceData data = getMockData(FakeUnavailablePreferenceController.class,
                 SliceData.SliceType.INTENT);
         Settings.Global.putInt(mContext.getContentResolver(),
                 FakeUnavailablePreferenceController.AVAILABILITY_KEY,
@@ -329,7 +329,7 @@
 
     @Test
     public void testConditionallyUnavailableSlice_validTitleSummary() {
-        final SliceData data = getDummyData(FakeUnavailablePreferenceController.class,
+        final SliceData data = getMockData(FakeUnavailablePreferenceController.class,
                 SliceData.SliceType.SWITCH);
         Settings.Global.putInt(mContext.getContentResolver(),
                 FakeUnavailablePreferenceController.AVAILABILITY_KEY,
@@ -347,7 +347,7 @@
 
     @Test
     public void testContentIntent_includesUniqueData() {
-        final SliceData sliceData = getDummyData();
+        final SliceData sliceData = getMockData();
         final Uri expectedUri = new Uri.Builder().appendPath(sliceData.getKey()).build();
 
         final Intent intent = SliceBuilderUtils.getContentIntent(mContext, sliceData);
@@ -360,7 +360,7 @@
     public void buildIntentSlice_noIconPassed_returnsSliceWithIcon() {
         final int expectedIconResource = IconCompat.createWithResource(mContext,
                 R.drawable.ic_settings_accent).toIcon().getResId();
-        final SliceData sliceData = getDummyData(CONTEXT_CONTROLLER, SliceData.SliceType.INTENT,
+        final SliceData sliceData = getMockData(CONTEXT_CONTROLLER, SliceData.SliceType.INTENT,
                 0x0);
 
         final Slice slice = SliceBuilderUtils.buildSlice(mContext, sliceData);
@@ -375,7 +375,7 @@
     public void buildDisabledDependentSlice_noIconPassed_returnsSliceWithIcon() {
         final int expectedIconResource = IconCompat.createWithResource(mContext,
                 R.drawable.ic_settings_accent).toIcon().getResId();
-        final SliceData data = getDummyData(FakeUnavailablePreferenceController.class,
+        final SliceData data = getMockData(FakeUnavailablePreferenceController.class,
                 SUMMARY, SliceData.SliceType.SWITCH, SCREEN_TITLE, 0 /* icon */,
                 null /* unavailableSliceSubtitle */);
         Settings.Global.putInt(mContext.getContentResolver(),
@@ -394,10 +394,10 @@
     public void buildToggleSlice_noIconPassed_returnsSliceWithIcon() {
         final int expectedIconResource = IconCompat.createWithResource(mContext,
                 R.drawable.ic_settings_accent).toIcon().getResId();
-        final SliceData dummyData = getDummyData(TOGGLE_CONTROLLER, SliceData.SliceType.SWITCH,
+        final SliceData mockData = getMockData(TOGGLE_CONTROLLER, SliceData.SliceType.SWITCH,
                 0x0);
 
-        final Slice slice = SliceBuilderUtils.buildSlice(mContext, dummyData);
+        final Slice slice = SliceBuilderUtils.buildSlice(mContext, mockData);
 
         final SliceMetadata metadata = SliceMetadata.from(mContext, slice);
         final SliceAction primaryAction = metadata.getPrimaryAction();
@@ -409,7 +409,7 @@
     public void buildSliderSlice_noIconPassed_returnsSliceWithIcon() {
         final int expectedIconResource = IconCompat.createWithResource(mContext,
                 R.drawable.ic_settings_accent).toIcon().getResId();
-        final SliceData data = getDummyData(SLIDER_CONTROLLER, SliceData.SliceType.SLIDER, 0x0);
+        final SliceData data = getMockData(SLIDER_CONTROLLER, SliceData.SliceType.SLIDER, 0x0);
 
         final Slice slice = SliceBuilderUtils.buildSlice(mContext, data);
 
@@ -421,7 +421,7 @@
 
     @Test
     public void buildSliderSlice_invalidSlider_returnNull() {
-        final SliceData data = getDummyData(INVALID_SLIDER_CONTROLLER, SliceData.SliceType.SLIDER,
+        final SliceData data = getMockData(INVALID_SLIDER_CONTROLLER, SliceData.SliceType.SLIDER,
                 0x0 /* icon */);
 
         assertThat(SliceBuilderUtils.buildSlice(mContext, data)).isNull();
@@ -431,7 +431,7 @@
     public void getSafeIcon_replacesEmptyIconWithSettingsIcon() {
         final int settingsIcon = R.drawable.ic_settings_accent;
         final int zeroIcon = 0x0;
-        final SliceData data = getDummyData(TOGGLE_CONTROLLER, SliceData.SliceType.SWITCH,
+        final SliceData data = getMockData(TOGGLE_CONTROLLER, SliceData.SliceType.SWITCH,
                 zeroIcon);
 
         final IconCompat actualIcon = SliceBuilderUtils.getSafeIcon(mContext, data);
@@ -445,7 +445,7 @@
     public void getSafeIcon_invalidResource_shouldFallbackToSettingsIcon() {
         final int settingsIcon = R.drawable.ic_settings_accent;
         final int badIcon = 0x12345678;
-        final SliceData data = getDummyData(TOGGLE_CONTROLLER, SliceData.SliceType.SWITCH,
+        final SliceData data = getMockData(TOGGLE_CONTROLLER, SliceData.SliceType.SWITCH,
                 badIcon);
 
         final IconCompat actualIcon = SliceBuilderUtils.getSafeIcon(mContext, data);
@@ -454,27 +454,27 @@
         assertThat(actualIconResource).isEqualTo(settingsIcon);
     }
 
-    private SliceData getDummyData() {
-        return getDummyData(TOGGLE_CONTROLLER, SUMMARY, SliceData.SliceType.SWITCH, SCREEN_TITLE,
+    private SliceData getMockData() {
+        return getMockData(TOGGLE_CONTROLLER, SUMMARY, SliceData.SliceType.SWITCH, SCREEN_TITLE,
                 ICON, null /* unavailableSliceSubtitle */);
     }
 
-    private SliceData getDummyData(Class prefController, int sliceType, int icon) {
-        return getDummyData(prefController, SUMMARY, sliceType, SCREEN_TITLE,
+    private SliceData getMockData(Class prefController, int sliceType, int icon) {
+        return getMockData(prefController, SUMMARY, sliceType, SCREEN_TITLE,
                 icon, null /* unavailableSliceSubtitle */);
     }
 
-    private SliceData getDummyData(String summary, String screenTitle) {
-        return getDummyData(TOGGLE_CONTROLLER, summary, SliceData.SliceType.SWITCH, screenTitle,
+    private SliceData getMockData(String summary, String screenTitle) {
+        return getMockData(TOGGLE_CONTROLLER, summary, SliceData.SliceType.SWITCH, screenTitle,
                 ICON, null /* unavailableSliceSubtitle */);
     }
 
-    private SliceData getDummyData(Class prefController, int sliceType) {
-        return getDummyData(prefController, SUMMARY, sliceType, SCREEN_TITLE, ICON,
+    private SliceData getMockData(Class prefController, int sliceType) {
+        return getMockData(prefController, SUMMARY, sliceType, SCREEN_TITLE, ICON,
                 null /* unavailableSliceSubtitle */);
     }
 
-    private SliceData getDummyData(Class prefController, String summary, int sliceType,
+    private SliceData getMockData(Class prefController, String summary, int sliceType,
             String screenTitle, int icon, String unavailableSliceSubtitle) {
         return new SliceData.Builder()
                 .setKey(KEY)
diff --git a/tests/robotests/src/com/android/settings/slices/SliceControllerInXmlCodeInspector.java b/tests/robotests/src/com/android/settings/slices/SliceControllerInXmlCodeInspector.java
index 72eae7d..93fb25f 100644
--- a/tests/robotests/src/com/android/settings/slices/SliceControllerInXmlCodeInspector.java
+++ b/tests/robotests/src/com/android/settings/slices/SliceControllerInXmlCodeInspector.java
@@ -54,13 +54,13 @@
     );
 
     private final List<String> mXmlDeclaredControllers = new ArrayList<>();
-    private final List<String> mGrandfatheredClasses = new ArrayList<>();
+    private final List<String> mExemptedClasses = new ArrayList<>();
 
     private final String ERROR_MISSING_CONTROLLER =
             "The following controllers were expected to be declared by "
                     + "'settings:controller=Controller_Class_Name' in their corresponding Xml. "
                     + "If it should not appear in XML, add the controller's classname to "
-                    + "grandfather_slice_controller_not_in_xml. Controllers:\n";
+                    + "exempt_slice_controller_not_in_xml. Controllers:\n";
 
     private final Context mContext;
     private final SearchFeatureProvider mSearchProvider;
@@ -73,8 +73,8 @@
         mFakeFeatureFactory = FakeFeatureFactory.setupForTest();
         mFakeFeatureFactory.searchFeatureProvider = mSearchProvider;
 
-        CodeInspector.initializeGrandfatherList(mGrandfatheredClasses,
-                "grandfather_slice_controller_not_in_xml");
+        CodeInspector.initializeExemptList(mExemptedClasses,
+                "exempt_slice_controller_not_in_xml");
         initDeclaredControllers();
     }
 
@@ -111,13 +111,13 @@
             }
 
             if (!mXmlDeclaredControllers.contains(clazz.getName())) {
-                // Class clazz should have been declared in XML (unless whitelisted).
+                // Class clazz should have been declared in XML (unless allowlisted).
                 missingControllersInXml.add(clazz.getName());
             }
         }
 
-        // Removed whitelisted classes
-        missingControllersInXml.removeAll(mGrandfatheredClasses);
+        // Removed allowlisted classes
+        missingControllersInXml.removeAll(mExemptedClasses);
 
         final String missingControllerError =
                 buildErrorMessage(ERROR_MISSING_CONTROLLER, missingControllersInXml);
diff --git a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseHelperTest.java b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseHelperTest.java
index 65214fc..70b26dd 100644
--- a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseHelperTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseHelperTest.java
@@ -83,9 +83,9 @@
 
     @Test
     public void testUpgrade_dropsOldData() {
-        ContentValues dummyValues = getDummyRow();
+        ContentValues mockValues = getMockRow();
 
-        mDatabase.replaceOrThrow(SlicesDatabaseHelper.Tables.TABLE_SLICES_INDEX, null, dummyValues);
+        mDatabase.replaceOrThrow(SlicesDatabaseHelper.Tables.TABLE_SLICES_INDEX, null, mockValues);
         Cursor baseline = mDatabase.rawQuery("SELECT * FROM slices_index", null);
         assertThat(baseline.getCount()).isEqualTo(1);
 
@@ -126,7 +126,7 @@
         assertThat(mSlicesDatabaseHelper.isSliceDataIndexed()).isFalse();
     }
 
-    private ContentValues getDummyRow() {
+    private ContentValues getMockRow() {
         final ContentValues values = new ContentValues();
         values.put(IndexColumns.KEY, "key");
         values.put(IndexColumns.TITLE, "title");
diff --git a/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java b/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java
index 3cb68c0..a943ac0 100644
--- a/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java
@@ -106,7 +106,7 @@
 
     @Test
     public void testInsertSliceData_nonPublicSlice_mockDataInserted() {
-        final List<SliceData> sliceData = getDummyIndexableData(false);
+        final List<SliceData> sliceData = getMockIndexableData(false);
         doReturn(sliceData).when(mManager).getSliceData();
 
         mManager.run();
@@ -151,7 +151,7 @@
 
     @Test
     public void insertSliceData_publicSlice_mockDataInserted() {
-        final List<SliceData> sliceData = getDummyIndexableData(true);
+        final List<SliceData> sliceData = getMockIndexableData(true);
         doReturn(sliceData).when(mManager).getSliceData();
 
         mManager.run();
@@ -209,7 +209,7 @@
         db.close();
     }
 
-    private List<SliceData> getDummyIndexableData(boolean isPublicSlice) {
+    private List<SliceData> getMockIndexableData(boolean isPublicSlice) {
         final List<SliceData> sliceData = new ArrayList<>();
         final SliceData.Builder builder = new SliceData.Builder()
                 .setSummary(SUMMARY)
diff --git a/tests/robotests/src/com/android/settings/sound/MediaControlsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/MediaControlsPreferenceControllerTest.java
index b8cc709..f281e25 100644
--- a/tests/robotests/src/com/android/settings/sound/MediaControlsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/sound/MediaControlsPreferenceControllerTest.java
@@ -69,26 +69,26 @@
     }
 
     @Test
-    public void setChecked_enable_shouldTurnOff() {
+    public void setChecked_enable_shouldTurnOn() {
         Settings.Global.putInt(mContentResolver, Settings.Global.SHOW_MEDIA_ON_QUICK_SETTINGS, 1);
         Settings.Secure.putInt(mContentResolver, Settings.Secure.MEDIA_CONTROLS_RESUME, 1);
 
-        assertThat(mController.isChecked()).isFalse();
+        assertThat(mController.isChecked()).isTrue();
 
-        mController.setChecked(true);
+        mController.setChecked(false);
 
         assertThat(Settings.Secure.getInt(mContentResolver,
                 Settings.Secure.MEDIA_CONTROLS_RESUME, -1)).isEqualTo(0);
     }
 
     @Test
-    public void setChecked_disable_shouldTurnOn() {
+    public void setChecked_disable_shouldTurnOff() {
         Settings.Global.putInt(mContentResolver, Settings.Global.SHOW_MEDIA_ON_QUICK_SETTINGS, 1);
         Settings.Secure.putInt(mContentResolver, Settings.Secure.MEDIA_CONTROLS_RESUME, 0);
 
-        assertThat(mController.isChecked()).isTrue();
+        assertThat(mController.isChecked()).isFalse();
 
-        mController.setChecked(false);
+        mController.setChecked(true);
 
         assertThat(Settings.Secure.getInt(mContentResolver,
                 Settings.Secure.MEDIA_CONTROLS_RESUME, -1)).isEqualTo(1);
diff --git a/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java
index 49928db..8225c69 100644
--- a/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java
@@ -23,6 +23,7 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
@@ -147,7 +148,7 @@
         ShadowBluetoothUtils.sLocalBluetoothManager = mLocalManager;
         mLocalBluetoothManager = Utils.getLocalBtManager(mContext);
 
-        when(mContext.getSystemService(MediaSessionManager.class)).thenReturn(mMediaSessionManager);
+        doReturn(mMediaSessionManager).when(mContext).getSystemService(MediaSessionManager.class);
         when(mMediaSessionManager.getActiveSessions(any())).thenReturn(mMediaControllers);
         when(mMediaController.getPackageName()).thenReturn(TEST_PACKAGE_NAME);
         mPlaybackInfo = new MediaController.PlaybackInfo(
diff --git a/tests/robotests/src/com/android/settings/sound/ResumableMediaAppsControllerTest.java b/tests/robotests/src/com/android/settings/sound/ResumableMediaAppsControllerTest.java
new file mode 100644
index 0000000..797560a
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/sound/ResumableMediaAppsControllerTest.java
@@ -0,0 +1,168 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.sound;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.provider.Settings;
+
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.testutils.ResolveInfoBuilder;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(RobolectricTestRunner.class)
+public class ResumableMediaAppsControllerTest {
+
+    private static final String KEY = "media_controls_resumable_apps";
+
+    private static final String FAKE_APP = "com.test.fakeapp1";
+
+    private Context mContext;
+    private int mOriginalQs;
+    private int mOriginalResume;
+    private String mOriginalBlocked;
+    private ContentResolver mContentResolver;
+    private ResumableMediaAppsController mController;
+    @Mock
+    private PackageManager mPackageManager;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+    @Mock
+    private PreferenceGroup mPreferenceGroup;
+
+    @Before
+    public void setUp() {
+        mContext = spy(RuntimeEnvironment.application);
+        mContentResolver = mContext.getContentResolver();
+        mOriginalQs = Settings.Global.getInt(mContentResolver,
+                Settings.Global.SHOW_MEDIA_ON_QUICK_SETTINGS, 1);
+        mOriginalResume = Settings.Secure.getInt(mContentResolver,
+                Settings.Secure.MEDIA_CONTROLS_RESUME, 1);
+        mOriginalBlocked = Settings.Secure.getString(mContentResolver,
+                Settings.Secure.MEDIA_CONTROLS_RESUME_BLOCKED);
+
+        // Start all tests with feature enabled, nothing blocked
+        Settings.Global.putInt(mContentResolver, Settings.Global.SHOW_MEDIA_ON_QUICK_SETTINGS, 1);
+        Settings.Secure.putInt(mContentResolver, Settings.Secure.MEDIA_CONTROLS_RESUME, 1);
+        Settings.Secure.putString(mContentResolver, Settings.Secure.MEDIA_CONTROLS_RESUME_BLOCKED,
+                mOriginalBlocked);
+
+        mPreferenceScreen = mock(PreferenceScreen.class);
+        mPreferenceGroup = mock(PreferenceGroup.class);
+        mPackageManager = mock(PackageManager.class);
+
+        List<ResolveInfo> fakeInfo = new ArrayList<>();
+        fakeInfo.add(createResolveInfo(FAKE_APP));
+        when(mPackageManager.queryIntentServices(any(), anyInt())).thenReturn(fakeInfo);
+
+        when(mContext.getPackageManager()).thenReturn(mPackageManager);
+        when(mPreferenceScreen.findPreference(KEY)).thenReturn(mPreferenceGroup);
+
+        mController = new ResumableMediaAppsController(mContext, KEY);
+    }
+
+    @After
+    public void tearDown() {
+        Settings.Global.putInt(mContentResolver, Settings.Global.SHOW_MEDIA_ON_QUICK_SETTINGS,
+                mOriginalQs);
+        Settings.Secure.putInt(mContentResolver, Settings.Secure.MEDIA_CONTROLS_RESUME,
+                mOriginalResume);
+        Settings.Secure.putString(mContentResolver, Settings.Secure.MEDIA_CONTROLS_RESUME_BLOCKED,
+                mOriginalBlocked);
+    }
+
+    @Test
+    public void getAvailability_hasEligibleApps_isAvailable() {
+        // The package manager already has an eligible app from setUp()
+        assertEquals(AVAILABLE, mController.getAvailabilityStatus());
+    }
+
+    @Test
+    public void getAvailability_noEligibleApps_isConditionallyUnavailable() {
+        Context context = mock(Context.class);
+        PackageManager packageManager = mock(PackageManager.class);
+        List<ResolveInfo> fakeInfo = new ArrayList<>();
+        when(packageManager.queryIntentServices(any(), anyInt())).thenReturn(fakeInfo);
+        when(context.getPackageManager()).thenReturn(packageManager);
+        ResumableMediaAppsController controller = new ResumableMediaAppsController(context, KEY);
+
+        assertEquals(CONDITIONALLY_UNAVAILABLE, controller.getAvailabilityStatus());
+    }
+
+    @Test
+    public void displayPreference_addsApps() {
+        mController.displayPreference(mPreferenceScreen);
+        verify(mPreferenceGroup, times(1)).addPreference(any());
+    }
+
+    @Test
+    public void unblockedApp_isChecked() {
+        ArgumentCaptor<ResumableMediaAppsController.MediaSwitchPreference> argument =
+                ArgumentCaptor.forClass(ResumableMediaAppsController.MediaSwitchPreference.class);
+        mController.displayPreference(mPreferenceScreen);
+        verify(mPreferenceGroup).addPreference(argument.capture());
+        assertTrue(argument.getValue().isChecked());
+    }
+
+    @Test
+    public void blockedApp_isNotChecked() {
+        Settings.Secure.putString(mContentResolver, Settings.Secure.MEDIA_CONTROLS_RESUME_BLOCKED,
+                FAKE_APP);
+
+        ArgumentCaptor<ResumableMediaAppsController.MediaSwitchPreference> argument =
+                ArgumentCaptor.forClass(ResumableMediaAppsController.MediaSwitchPreference.class);
+        mController.displayPreference(mPreferenceScreen);
+        verify(mPreferenceGroup).addPreference(argument.capture());
+
+        assertFalse(argument.getValue().isChecked());
+    }
+
+    private ResolveInfo createResolveInfo(String name) {
+        ResolveInfoBuilder builder = new ResolveInfoBuilder(name);
+        builder.setActivity(name, name);
+        return builder.build();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
index b6c4fb7..2c68269 100644
--- a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
+++ b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
@@ -29,6 +29,7 @@
 import com.android.settings.dashboard.DashboardFeatureProvider;
 import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
 import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;
+import com.android.settings.fuelgauge.BatteryStatusFeatureProvider;
 import com.android.settings.fuelgauge.PowerUsageFeatureProvider;
 import com.android.settings.gestures.AssistGestureFeatureProvider;
 import com.android.settings.homepage.contextualcards.ContextualCardFeatureProvider;
@@ -54,6 +55,7 @@
 
     public final SupportFeatureProvider supportFeatureProvider;
     public final MetricsFeatureProvider metricsFeatureProvider;
+    public final BatteryStatusFeatureProvider batteryStatusFeatureProvider;
     public final PowerUsageFeatureProvider powerUsageFeatureProvider;
     public final DashboardFeatureProvider dashboardFeatureProvider;
     public final DockUpdaterFeatureProvider dockUpdaterFeatureProvider;
@@ -98,6 +100,7 @@
     public FakeFeatureFactory() {
         supportFeatureProvider = mock(SupportFeatureProvider.class);
         metricsFeatureProvider = mock(MetricsFeatureProvider.class);
+        batteryStatusFeatureProvider = mock(BatteryStatusFeatureProvider.class);
         powerUsageFeatureProvider = mock(PowerUsageFeatureProvider.class);
         dashboardFeatureProvider = mock(DashboardFeatureProvider.class);
         dockUpdaterFeatureProvider = mock(DockUpdaterFeatureProvider.class);
@@ -135,6 +138,11 @@
     }
 
     @Override
+    public BatteryStatusFeatureProvider getBatteryStatusFeatureProvider(Context context) {
+        return batteryStatusFeatureProvider;
+    }
+
+    @Override
     public PowerUsageFeatureProvider getPowerUsageFeatureProvider(Context context) {
         return powerUsageFeatureProvider;
     }
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothAdapter.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothAdapter.java
index f657293..9de5c7f 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothAdapter.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothAdapter.java
@@ -17,6 +17,7 @@
 package com.android.settings.testutils.shadow;
 
 import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothDevice;
 
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
@@ -29,6 +30,7 @@
 
     private int mState;
     private List<Integer> mSupportedProfiles = new ArrayList<>();
+    private List<BluetoothDevice> mMostRecentlyConnectedDevices = new ArrayList<>();
 
     @Implementation
     protected List<Integer> getSupportedProfiles() {
@@ -56,4 +58,13 @@
     protected boolean factoryReset() {
         return true;
     }
+
+    @Implementation
+    protected List<BluetoothDevice> getMostRecentlyConnectedDevices() {
+        return mMostRecentlyConnectedDevices;
+    }
+
+    public void setMostRecentlyConnectedDevices(List<BluetoothDevice> list) {
+        mMostRecentlyConnectedDevices = list;
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java
index 90c5910..2da7a3f 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java
@@ -31,4 +31,9 @@
     protected List<Fingerprint> getEnrolledFingerprints(int userId) {
         return getEnrolledFingerprints();
     }
+
+    @Implementation
+    protected long generateChallengeBlocking() {
+        return 0L;
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowNetworkDetailsTracker.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowNetworkDetailsTracker.java
new file mode 100644
index 0000000..5df9ba5
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowNetworkDetailsTracker.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.testutils.shadow;
+
+import static org.mockito.Mockito.mock;
+
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.net.NetworkScoreManager;
+import android.net.wifi.WifiManager;
+import android.os.Handler;
+
+import androidx.annotation.NonNull;
+import androidx.lifecycle.Lifecycle;
+
+import com.android.wifitrackerlib.NetworkDetailsTracker;
+import com.android.wifitrackerlib.WifiEntry;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+import java.time.Clock;
+
+@Implements(NetworkDetailsTracker.class)
+public class ShadowNetworkDetailsTracker {
+
+    @Implementation
+    public static NetworkDetailsTracker createNetworkDetailsTracker(@NonNull Lifecycle lifecycle,
+            @NonNull Context context,
+            @NonNull WifiManager wifiManager,
+            @NonNull ConnectivityManager connectivityManager,
+            @NonNull NetworkScoreManager networkScoreManager,
+            @NonNull Handler mainHandler,
+            @NonNull Handler workerHandler,
+            @NonNull Clock clock,
+            long maxScanAgeMillis,
+            long scanIntervalMillis,
+            String key) {
+        return mock(NetworkDetailsTracker.class);
+    }
+
+    @Implementation
+    public WifiEntry getWifiEntry() {
+        return mock(WifiEntry.class);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPowerWhitelistBackend.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPowerWhitelistBackend.java
deleted file mode 100644
index c40e9c9..0000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPowerWhitelistBackend.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.testutils.shadow;
-
-import com.android.settingslib.fuelgauge.PowerWhitelistBackend;
-
-import org.robolectric.annotation.Implements;
-
-@Implements(PowerWhitelistBackend.class)
-public class ShadowPowerWhitelistBackend {
-    protected void __constructor__() {
-        // Do nothing
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowWifiManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowWifiManager.java
index 80db53e..ea57bf7 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowWifiManager.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowWifiManager.java
@@ -18,6 +18,7 @@
 
 import static org.robolectric.RuntimeEnvironment.application;
 
+import android.net.wifi.ScanResult;
 import android.net.wifi.SoftApConfiguration;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiManager;
@@ -81,6 +82,11 @@
         return false;
     }
 
+    @Implementation
+    protected List<ScanResult> getScanResults() {
+        return new ArrayList<ScanResult>();
+    }
+
     public static ShadowWifiManager get() {
         return Shadow.extract(application.getSystemService(WifiManager.class));
     }
diff --git a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java b/tests/robotests/src/com/android/settings/users/UserSettingsTest.java
index 2057788..27c90b0 100644
--- a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/users/UserSettingsTest.java
@@ -23,7 +23,6 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.notNull;
@@ -575,7 +574,7 @@
 
         verify(mUserManager, never()).getUserIcon(anyInt());
         // updateUserList should be called only once
-        verify(mUserManager).getUsers(true);
+        verify(mUserManager).getAliveUsers();
     }
 
     @Test
@@ -592,7 +591,7 @@
 
         verify(mUserManager).getUserIcon(ACTIVE_USER_ID);
         // updateUserList should be called another time after loading the icons
-        verify(mUserManager, times(2)).getUsers(true);
+        verify(mUserManager, times(2)).getAliveUsers();
     }
 
     @Test
@@ -672,7 +671,7 @@
     private void givenUsers(UserInfo... userInfo) {
         List<UserInfo> users = Arrays.asList(userInfo);
         doReturn(users).when(mUserManager).getUsers();
-        doReturn(users).when(mUserManager).getUsers(anyBoolean());
+        doReturn(users).when(mUserManager).getAliveUsers();
     }
 
     private static void removeFlag(UserInfo userInfo, int flag) {
diff --git a/tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/PrimaryCheckBoxPreferenceTest.java
similarity index 89%
rename from tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java
rename to tests/robotests/src/com/android/settings/widget/PrimaryCheckBoxPreferenceTest.java
index 16818b4..a1d74e3 100644
--- a/tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/widget/PrimaryCheckBoxPreferenceTest.java
@@ -39,28 +39,28 @@
 import org.robolectric.RuntimeEnvironment;
 
 @RunWith(RobolectricTestRunner.class)
-public class MasterCheckBoxPreferenceTest {
+public class PrimaryCheckBoxPreferenceTest {
 
     private Context mContext;
-    private MasterCheckBoxPreference mPreference;
+    private PrimaryCheckBoxPreference mPreference;
 
     @Before
     public void setUp() {
         mContext = RuntimeEnvironment.application;
-        mPreference = new MasterCheckBoxPreference(mContext);
+        mPreference = new PrimaryCheckBoxPreference(mContext);
     }
 
     @Test
     public void createNewPreference_shouldSetLayout() {
         assertThat(mPreference.getWidgetLayoutResource())
-                .isEqualTo(R.layout.preference_widget_master_checkbox);
+                .isEqualTo(R.layout.preference_widget_primary_checkbox);
     }
 
     @Test
     public void setChecked_shouldUpdateCheckBoxCheckedState() {
         final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
                 LayoutInflater.from(mContext).inflate(
-                  R.layout.preference_widget_master_checkbox, null));
+                  R.layout.preference_widget_primary_checkbox, null));
         final CheckBox checkBox = (CheckBox) holder.findViewById(R.id.checkboxWidget);
         mPreference.onBindViewHolder(holder);
 
@@ -75,7 +75,7 @@
     public void setEnabled_shouldUpdateCheckBoxEnabledState() {
         final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
                 LayoutInflater.from(mContext).inflate(
-                  R.layout.preference_widget_master_checkbox, null));
+                  R.layout.preference_widget_primary_checkbox, null));
         final CheckBox checkBox = (CheckBox) holder.findViewById(R.id.checkboxWidget);
         mPreference.onBindViewHolder(holder);
 
@@ -90,7 +90,7 @@
     public void setCheckboxEnabled_shouldOnlyUpdateCheckBoxEnabledState() {
         final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
                 LayoutInflater.from(mContext).inflate(
-                        R.layout.preference_widget_master_checkbox, null));
+                        R.layout.preference_widget_primary_checkbox, null));
         final CheckBox checkBox = (CheckBox) holder.findViewById(R.id.checkboxWidget);
         mPreference.onBindViewHolder(holder);
 
@@ -107,7 +107,7 @@
     public void onBindViewHolder_shouldSetCheckboxEnabledState() {
         final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
                 LayoutInflater.from(mContext).inflate(
-                        R.layout.preference_widget_master_checkbox, null));
+                        R.layout.preference_widget_primary_checkbox, null));
         final CheckBox checkBox = (CheckBox) holder.findViewById(R.id.checkboxWidget);
 
         mPreference.setCheckBoxEnabled(false);
@@ -129,7 +129,7 @@
         final LinearLayout widgetView = holder.itemView.findViewById(android.R.id.widget_frame);
         assertThat(widgetView).isNotNull();
 
-        inflater.inflate(R.layout.preference_widget_master_checkbox, widgetView, true);
+        inflater.inflate(R.layout.preference_widget_primary_checkbox, widgetView, true);
         final CheckBox checkBox = (CheckBox) holder.findViewById(R.id.checkboxWidget);
         mPreference.onBindViewHolder(holder);
 
@@ -148,7 +148,7 @@
         final LinearLayout widgetView = holder.itemView.findViewById(android.R.id.widget_frame);
         assertThat(widgetView).isNotNull();
 
-        inflater.inflate(R.layout.preference_widget_master_checkbox, widgetView, true);
+        inflater.inflate(R.layout.preference_widget_primary_checkbox, widgetView, true);
         final CheckBox checkBox = (CheckBox) holder.findViewById(R.id.checkboxWidget);
         mPreference.onBindViewHolder(holder);
         mPreference.setEnabled(false);
@@ -178,8 +178,8 @@
     @Test
     public void onBindViewHolder_checkBoxShouldHaveContentDescription() {
         final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
-            LayoutInflater.from(mContext)
-                .inflate(R.layout.preference_widget_master_checkbox, null));
+                LayoutInflater.from(mContext).inflate(R.layout.preference_widget_primary_checkbox,
+                        null));
         final CheckBox checkBox = (CheckBox) holder.findViewById(R.id.checkboxWidget);
         final String label = "TestButton";
         mPreference.setTitle(label);
diff --git a/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/PrimarySwitchPreferenceTest.java
similarity index 95%
rename from tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java
rename to tests/robotests/src/com/android/settings/widget/PrimarySwitchPreferenceTest.java
index 8115a02..c58f595 100644
--- a/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/widget/PrimarySwitchPreferenceTest.java
@@ -39,28 +39,28 @@
 import org.robolectric.RuntimeEnvironment;
 
 @RunWith(RobolectricTestRunner.class)
-public class MasterSwitchPreferenceTest {
+public class PrimarySwitchPreferenceTest {
 
     private Context mContext;
-    private MasterSwitchPreference mPreference;
+    private PrimarySwitchPreference mPreference;
     private PreferenceViewHolder mHolder;
     private LinearLayout mWidgetView;
 
     @Before
     public void setUp() {
         mContext = RuntimeEnvironment.application;
-        mPreference = new MasterSwitchPreference(mContext);
+        mPreference = new PrimarySwitchPreference(mContext);
         LayoutInflater inflater = LayoutInflater.from(mContext);
         mHolder = PreferenceViewHolder.createInstanceForTests(inflater.inflate(
                 com.android.settingslib.R.layout.preference_two_target, null));
         mWidgetView = mHolder.itemView.findViewById(android.R.id.widget_frame);
-        inflater.inflate(R.layout.restricted_preference_widget_master_switch, mWidgetView, true);
+        inflater.inflate(R.layout.restricted_preference_widget_primary_switch, mWidgetView, true);
     }
 
     @Test
     public void createNewPreference_shouldSetLayout() {
         assertThat(mPreference.getWidgetLayoutResource())
-                .isEqualTo(R.layout.restricted_preference_widget_master_switch);
+                .isEqualTo(R.layout.restricted_preference_widget_primary_switch);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/widget/SeekBarPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/SeekBarPreferenceTest.java
index f7dea22..42ed074 100644
--- a/tests/robotests/src/com/android/settings/widget/SeekBarPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/widget/SeekBarPreferenceTest.java
@@ -19,6 +19,7 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
@@ -110,6 +111,13 @@
         assertThat(seekBarPreference.isSelectable()).isTrue();
     }
 
+    @Test
+    public void testSetSeekBarStateDescription() {
+        mSeekBarPreference.setSeekBarStateDescription("test");
+
+        verify(mSeekBarPreference).setSeekBarStateDescription("test");
+    }
+
     public static class TestFragment extends PreferenceFragmentCompat {
         @Override
         public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
diff --git a/tests/robotests/src/com/android/settings/widget/SwitchBarTest.java b/tests/robotests/src/com/android/settings/widget/SwitchBarTest.java
index 31cb966..f85e104 100644
--- a/tests/robotests/src/com/android/settings/widget/SwitchBarTest.java
+++ b/tests/robotests/src/com/android/settings/widget/SwitchBarTest.java
@@ -70,7 +70,7 @@
 
     @Test
     public void cycleChecked_customLabel_shouldUpdateTextAndBackground() {
-        final int onText = R.string.master_clear_progress_text;
+        final int onText = R.string.main_clear_progress_text;
         final int offText = R.string.manage_space_text;
 
         mBar.setSwitchBarText(onText, offText);
@@ -87,9 +87,9 @@
     @Test
     public void setCheck_customLabelWithStringType_shouldUpdateTextAndBackground() {
         final String onText = mContext.getString(
-                R.string.accessibility_service_master_switch_title);
+                R.string.accessibility_service_primary_switch_title);
         final String offText = mContext.getString(
-                R.string.accessibility_service_master_switch_title);
+                R.string.accessibility_service_primary_switch_title);
         final TextView switchBarTextView = ((TextView) mBar.findViewById(R.id.switch_text));
 
         mBar.setSwitchBarText(onText, offText);
diff --git a/tests/robotests/src/com/android/settings/wifi/AddNetworkFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/AddNetworkFragmentTest.java
index db699e5..7421bd3 100644
--- a/tests/robotests/src/com/android/settings/wifi/AddNetworkFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/AddNetworkFragmentTest.java
@@ -55,7 +55,7 @@
 
     @Test
     public void getMode_shouldBeModeConnected() {
-        assertThat(mAddNetworkFragment.getMode()).isEqualTo(WifiConfigUiBase.MODE_CONNECT);
+        assertThat(mAddNetworkFragment.getMode()).isEqualTo(WifiConfigUiBase2.MODE_CONNECT);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/wifi/ConfigureAccessPointFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/ConfigureAccessPointFragmentTest.java
deleted file mode 100644
index 1189760..0000000
--- a/tests/robotests/src/com/android/settings/wifi/ConfigureAccessPointFragmentTest.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-
-import android.app.settings.SettingsEnums;
-import android.os.Bundle;
-
-import com.android.settings.testutils.shadow.ShadowConnectivityManager;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.androidx.fragment.FragmentController;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(shadows = ShadowConnectivityManager.class)
-public class ConfigureAccessPointFragmentTest {
-
-    private static final String KEY_SSID = "key_ssid";
-    private static final String KEY_SECURITY = "key_security";
-
-    private ConfigureAccessPointFragment mConfigureAccessPointFragment;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        Bundle bundle = new Bundle();
-
-        bundle.putString(KEY_SSID, "Test AP");
-        bundle.putInt(KEY_SECURITY, 1 /* WEP */);
-        mConfigureAccessPointFragment = spy(new ConfigureAccessPointFragment());
-        mConfigureAccessPointFragment.setArguments(bundle);
-        FragmentController.setupFragment(mConfigureAccessPointFragment);
-    }
-
-    @Test
-    public void getMetricsCategory_shouldReturnConfigureNetwork() {
-        assertThat(mConfigureAccessPointFragment.getMetricsCategory()).isEqualTo(
-                SettingsEnums.SETTINGS_WIFI_CONFIGURE_NETWORK);
-    }
-
-    @Test
-    public void getMode_shouldBeModeConnected() {
-        assertThat(mConfigureAccessPointFragment.getMode()).isEqualTo(
-                WifiConfigUiBase.MODE_CONNECT);
-    }
-
-    @Test
-    public void launchFragment_shouldShowSubmitButton() {
-        assertThat(mConfigureAccessPointFragment.getSubmitButton()).isNotNull();
-    }
-
-    @Test
-    public void launchFragment_shouldShowCancelButton() {
-        assertThat(mConfigureAccessPointFragment.getCancelButton()).isNotNull();
-    }
-
-    @Test
-    public void onClickSubmitButton_shouldHandleSubmitAction() {
-        mConfigureAccessPointFragment.getSubmitButton().performClick();
-
-        verify(mConfigureAccessPointFragment).handleSubmitAction();
-    }
-
-    @Test
-    public void dispatchSubmit_shouldHandleSubmitAction() {
-        mConfigureAccessPointFragment.dispatchSubmit();
-
-        verify(mConfigureAccessPointFragment).handleSubmitAction();
-    }
-
-    @Test
-    public void onClickCancelButton_shouldHandleCancelAction() {
-        mConfigureAccessPointFragment.getCancelButton().performClick();
-
-        verify(mConfigureAccessPointFragment).handleCancelAction();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/ConfigureWifiEntryFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/ConfigureWifiEntryFragmentTest.java
index 27517e8..4a317a6 100644
--- a/tests/robotests/src/com/android/settings/wifi/ConfigureWifiEntryFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/ConfigureWifiEntryFragmentTest.java
@@ -68,7 +68,7 @@
     @Test
     public void getMode_shouldBeModeConnected() {
         assertThat(mConfigureWifiEntryFragment.getMode()).isEqualTo(
-                WifiConfigUiBase.MODE_CONNECT);
+                WifiConfigUiBase2.MODE_CONNECT);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/wifi/ConnectedAccessPointPreferenceTest.java b/tests/robotests/src/com/android/settings/wifi/ConnectedAccessPointPreferenceTest.java
deleted file mode 100644
index bb9971b..0000000
--- a/tests/robotests/src/com/android/settings/wifi/ConnectedAccessPointPreferenceTest.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.view.View;
-
-import com.android.settings.R;
-import com.android.settingslib.wifi.AccessPoint;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class ConnectedAccessPointPreferenceTest {
-
-    @Mock
-    private AccessPoint mAccessPoint;
-    @Mock
-    private View mView;
-    @Mock
-    private ConnectedAccessPointPreference.OnGearClickListener mOnGearClickListener;
-    private Context mContext;
-    private ConnectedAccessPointPreference mConnectedAccessPointPreference;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mContext = RuntimeEnvironment.application;
-        mConnectedAccessPointPreference = new ConnectedAccessPointPreference(mAccessPoint, mContext,
-                null, 0 /* iconResId */, false /* forSavedNetworks */, null /* fragment */);
-        mConnectedAccessPointPreference.setOnGearClickListener(mOnGearClickListener);
-    }
-
-    @Test
-    public void testOnClick_gearClicked_listenerInvoked() {
-        when(mView.getId()).thenReturn(R.id.settings_button);
-
-        mConnectedAccessPointPreference.onClick(mView);
-
-        verify(mOnGearClickListener).onGearClick(mConnectedAccessPointPreference);
-    }
-
-    @Test
-    public void testOnClick_gearNotClicked_listenerNotInvoked() {
-        mConnectedAccessPointPreference.onClick(mView);
-
-        verify(mOnGearClickListener, never()).onGearClick(mConnectedAccessPointPreference);
-    }
-
-    @Test
-    public void testCaptivePortalStatus_isCaptivePortal_dividerDrawn() {
-        mConnectedAccessPointPreference.setCaptivePortal(true);
-        assertThat(mConnectedAccessPointPreference.shouldShowDivider()).isTrue();
-    }
-
-    @Test
-    public void testCaptivePortalStatus_isNotCaptivePortal_dividerNotDrawn() {
-        mConnectedAccessPointPreference.setCaptivePortal(false);
-        assertThat(mConnectedAccessPointPreference.shouldShowDivider()).isFalse();
-    }
-
-    @Test
-    public void testWidgetLayoutPreference() {
-        assertThat(mConnectedAccessPointPreference.getWidgetLayoutResource())
-            .isEqualTo(R.layout.preference_widget_gear_optional_background);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogActivityTest.java b/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogActivityTest.java
index ecf9c68..094e282 100644
--- a/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogActivityTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogActivityTest.java
@@ -25,8 +25,11 @@
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
+import android.content.Intent;
+import android.net.wifi.ScanResult;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiManager;
+import android.net.wifi.WifiManager.NetworkRequestUserSelectionCallback;
 import android.os.Bundle;
 
 import androidx.annotation.Nullable;
@@ -40,22 +43,31 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.MockitoAnnotations;
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowLooper;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = ShadowAlertDialogCompat.class)
 public class NetworkRequestDialogActivityTest {
 
+    private static final String TEST_SSID = "testssid";
+    private static final String TEST_CAPABILITY = "wep";
+
     NetworkRequestDialogActivity mActivity;
     WifiManager mWifiManager;
     Context mContext;
 
     @Before
     public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
         mContext = spy(RuntimeEnvironment.application);
 
         WifiTracker wifiTracker = mock(WifiTracker.class);
@@ -118,6 +130,15 @@
         }
     }
 
+    private void startSpecifiedActivity() {
+        final Intent intent = new Intent().setClassName(
+                RuntimeEnvironment.application.getPackageName(),
+                NetworkRequestDialogActivity.class.getName());
+        intent.putExtra(NetworkRequestDialogActivity.EXTRA_IS_SPECIFIED_SSID, true);
+        mActivity = spy(Robolectric.buildActivity(NetworkRequestDialogActivity.class,
+                intent).create().get());
+    }
+
     @Test
     public void updateAccessPointList_onUserSelectionConnectSuccess_shouldFinishActivity() {
         final WifiConfiguration config = new WifiConfiguration();
@@ -128,6 +149,89 @@
     }
 
     @Test
+    public void specifiedSsid_onCreate_shouldShowProgressDialog() {
+        startSpecifiedActivity();
+
+        assertThat(mActivity.mProgressDialog).isNotNull();
+        assertThat(mActivity.mProgressDialog.isShowing()).isTrue();
+    }
+
+    private ScanResult getScanResult(String ssid, String capability) {
+        final ScanResult scanResult = mock(ScanResult.class);
+        scanResult.SSID = ssid;
+        scanResult.capabilities = capability;
+
+        return scanResult;
+    }
+
+    @Test
+    public void specifiedSsid_onMatch_shouldShowDialogFragment() {
+        startSpecifiedActivity();
+
+        final List<ScanResult> scanResults = new ArrayList<>();
+        scanResults.add(getScanResult(TEST_SSID, TEST_CAPABILITY));
+
+        mActivity.onMatch(scanResults);
+
+        assertThat(mActivity.mProgressDialog).isNull();
+        assertThat(mActivity.mDialogFragment).isNotNull();
+    }
+
+    @Test
+    public void onAbort_withFakeActivity_callStopAndPopShouldBeTrue() {
+        final FakeNetworkRequestDialogActivity fakeActivity =
+                Robolectric.setupActivity(FakeNetworkRequestDialogActivity.class);
+
+        fakeActivity.onResume();
+        fakeActivity.onAbort();
+
+        assertThat(fakeActivity.bCalledStopAndPop).isTrue();
+    }
+
+    @Test
+    public void onUserSelectionConnectFailure_shouldShowDialogFragment() {
+        WifiConfiguration wifiConfiguration = mock(WifiConfiguration.class);
+        startSpecifiedActivity();
+        final List<ScanResult> scanResults = new ArrayList<>();
+        scanResults.add(getScanResult(TEST_SSID, TEST_CAPABILITY));
+        mActivity.onMatch(scanResults);
+
+        mActivity.onUserSelectionConnectFailure(wifiConfiguration);
+
+        assertThat(mActivity.mProgressDialog).isNull();
+        assertThat(mActivity.mDialogFragment).isNotNull();
+    }
+
+    @Test
+    public void onClickConnectButton_shouldShowProgressDialog() {
+        NetworkRequestUserSelectionCallback networkRequestUserSelectionCallback = mock(
+                NetworkRequestUserSelectionCallback.class);
+        startSpecifiedActivity();
+        final List<ScanResult> scanResults = new ArrayList<>();
+        scanResults.add(getScanResult(TEST_SSID, TEST_CAPABILITY));
+        mActivity.onMatch(scanResults);
+        mActivity.onUserSelectionCallbackRegistration(networkRequestUserSelectionCallback);
+
+        mActivity.onClickConnectButton();
+
+        assertThat(mActivity.mProgressDialog.isShowing()).isTrue();
+        assertThat(mActivity.mDialogFragment).isNull();
+    }
+
+    @Test
+    public void onCancel_shouldCloseAllUI() {
+        startSpecifiedActivity();
+        final List<ScanResult> scanResults = new ArrayList<>();
+        scanResults.add(getScanResult(TEST_SSID, TEST_CAPABILITY));
+        mActivity.onMatch(scanResults);
+
+        mActivity.onCancel();
+
+        assertThat(mActivity.mProgressDialog).isNull();
+        assertThat(mActivity.mDialogFragment).isNull();
+    }
+
+    @Test
     public void updateAccessPointList_onUserSelectionConnectFailure_shouldFinishActivity() {
         final WifiConfiguration config = new WifiConfiguration();
         config.SSID = "Test AP 3";
diff --git a/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java
index ccd6e6c..2e9f019 100644
--- a/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java
@@ -18,19 +18,18 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.wifi.ScanResult;
-import android.net.wifi.WifiManager;
+import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiManager.NetworkRequestUserSelectionCallback;
-import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
@@ -40,13 +39,13 @@
 
 import com.android.settings.R;
 import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
-import com.android.settingslib.wifi.AccessPoint;
-import com.android.settingslib.wifi.WifiTracker;
-import com.android.settingslib.wifi.WifiTrackerFactory;
+import com.android.wifitrackerlib.WifiEntry;
+import com.android.wifitrackerlib.WifiPickerTracker;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.InOrder;
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
@@ -65,8 +64,6 @@
 
     private FragmentActivity mActivity;
     private NetworkRequestDialogFragment networkRequestDialogFragment;
-    private Context mContext;
-    private WifiTracker mWifiTracker;
 
     @Before
     public void setUp() {
@@ -74,10 +71,7 @@
                 new Intent().putExtra(NetworkRequestDialogFragment.EXTRA_APP_NAME,
                         TEST_APP_NAME)).setup().get();
         networkRequestDialogFragment = spy(NetworkRequestDialogFragment.newInstance());
-        mContext = spy(RuntimeEnvironment.application);
-
-        mWifiTracker = mock(WifiTracker.class);
-        WifiTrackerFactory.setTestingWifiTracker(mWifiTracker);
+        networkRequestDialogFragment.mWifiPickerTracker = mock(WifiPickerTracker.class);
     }
 
     @Test
@@ -93,7 +87,7 @@
         networkRequestDialogFragment.show(mActivity.getSupportFragmentManager(), /* tag */ null);
         final AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
 
-        final String targetTitle = mContext.getString(
+        final String targetTitle = RuntimeEnvironment.application.getString(
                 R.string.network_connection_request_dialog_title, TEST_APP_NAME);
         final TextView view = alertDialog.findViewById(R.id.network_request_title_text);
         assertThat(view.getText()).isEqualTo(targetTitle);
@@ -113,124 +107,95 @@
     }
 
     @Test
-    public void onUserSelectionCallbackRegistration_onClick_shouldCallSelect() {
+    public void onClick_validSelection_shouldCallSelect() {
         final int indexClickItem = 3;
-        List<AccessPoint> accessPointList = createAccessPointList();
-        AccessPoint clickedAccessPoint = accessPointList.get(indexClickItem);
-        clickedAccessPoint.generateOpenNetworkConfig();
-        when(networkRequestDialogFragment.getAccessPointList()).thenReturn(accessPointList);
-
-        NetworkRequestUserSelectionCallback selectionCallback = mock(
+        final List<WifiEntry> wifiEntryList = createWifiEntryList();
+        final WifiEntry clickedWifiEntry = wifiEntryList.get(indexClickItem);
+        final WifiConfiguration wifiConfig = new WifiConfiguration();
+        when(clickedWifiEntry.getWifiConfiguration()).thenReturn(wifiConfig);
+        networkRequestDialogFragment.mFilteredWifiEntries = wifiEntryList;
+        final NetworkRequestUserSelectionCallback selectionCallback = mock(
                 NetworkRequestUserSelectionCallback.class);
-        AlertDialog dialog = mock(AlertDialog.class);
+        final AlertDialog dialog = mock(AlertDialog.class);
         networkRequestDialogFragment.onUserSelectionCallbackRegistration(selectionCallback);
 
-        // Act.
         networkRequestDialogFragment.onClick(dialog, indexClickItem);
 
-        // Check.
-        verify(selectionCallback, times(1)).select(clickedAccessPoint.getConfig());
+        verify(selectionCallback, times(1)).select(wifiConfig);
     }
 
     @Test
-    public void onMatch_shouldUpdatedList() {
-        when(networkRequestDialogFragment.getContext()).thenReturn(mContext);
-        Context applicationContext = spy(RuntimeEnvironment.application.getApplicationContext());
-        when(mContext.getApplicationContext()).thenReturn(applicationContext);
-        WifiManager wifiManager = mock(WifiManager.class);
-        when(applicationContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(wifiManager);
-        networkRequestDialogFragment.onResume();
+    public void onMatch_shouldUpdateWifiEntries() {
+        final InOrder inOrder = inOrder(networkRequestDialogFragment);
 
-        List<AccessPoint> accessPointList = createAccessPointList();
-        when(mWifiTracker.getAccessPoints()).thenReturn(accessPointList);
+        networkRequestDialogFragment.onMatch(new ArrayList<ScanResult>());
 
-        final String ssidAp1 = "Test AP 1";
-        final String ssidAp2 = "Test AP 2";
-        List<ScanResult> scanResults = new ArrayList<>();
-        ScanResult scanResult = mock(ScanResult.class);
-        scanResult.SSID = ssidAp1;
-        scanResult.capabilities = "WEP";
-        scanResults.add(scanResult);
-        scanResult = mock(ScanResult.class);
-        scanResult.SSID = ssidAp2;
-        scanResult.capabilities = "WEP";
-        scanResults.add(scanResult);
-
-        // Act.
-        networkRequestDialogFragment.onMatch(scanResults);
-
-        // Check.
-        List<AccessPoint> returnList = networkRequestDialogFragment.getAccessPointList();
-        assertThat(returnList).isNotEmpty();
-        assertThat(returnList.size()).isEqualTo(2);
-        assertThat(returnList.get(0).getSsid()).isEqualTo(ssidAp1);
-        assertThat(returnList.get(1).getSsid()).isEqualTo(ssidAp2);
+        inOrder.verify(networkRequestDialogFragment).updateWifiEntries();
+        inOrder.verify(networkRequestDialogFragment).updateUi();
     }
 
     @Test
-    public void onAccessPointsChanged_shouldUpdatedList() {
-        when(networkRequestDialogFragment.getContext()).thenReturn(mContext);
-        Context applicationContext = spy(RuntimeEnvironment.application.getApplicationContext());
-        when(mContext.getApplicationContext()).thenReturn(applicationContext);
-        WifiManager wifiManager = mock(WifiManager.class);
-        when(applicationContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(wifiManager);
-        networkRequestDialogFragment.onResume();
+    public void onWifiStateChanged_nonEmptyMatchedScanResults_shouldUpdateWifiEntries() {
+        final InOrder inOrder = inOrder(networkRequestDialogFragment);
 
-        List<AccessPoint> accessPointList = new ArrayList<>();
-        when(mWifiTracker.getAccessPoints()).thenReturn(accessPointList);
-
-        final String ssidAp1 = "Test AP 1";
-        List<ScanResult> scanResults = new ArrayList<>();
+        final List<ScanResult> scanResults = new ArrayList<>();
+        networkRequestDialogFragment.mMatchedScanResults = scanResults;
         ScanResult scanResult = mock(ScanResult.class);
-        scanResult.SSID = ssidAp1;
-        scanResult.capabilities = "WEP";
-        scanResults.add(scanResult);
-
-        // Act.
+        networkRequestDialogFragment.mMatchedScanResults.add(scanResult);
         networkRequestDialogFragment.onMatch(scanResults);
 
-        accessPointList = createAccessPointList();
-        when(mWifiTracker.getAccessPoints()).thenReturn(accessPointList);
-
-        // Act.
-        networkRequestDialogFragment.mFilterWifiTracker.mWifiListener.onAccessPointsChanged();
-
-        // Check.
-        List<AccessPoint> returnList = networkRequestDialogFragment.getAccessPointList();
-        assertThat(returnList).isNotEmpty();
-        assertThat(returnList.size()).isEqualTo(1);
-        assertThat(returnList.get(0).getSsid()).isEqualTo(ssidAp1);
+        inOrder.verify(networkRequestDialogFragment).updateWifiEntries();
+        inOrder.verify(networkRequestDialogFragment).updateUi();
     }
 
-    private List<AccessPoint> createAccessPointList() {
-        List<AccessPoint> accessPointList = spy(new ArrayList<>());
-        Bundle bundle = new Bundle();
+    @Test
+    public void onWifiEntriesChanged_nonEmptyMatchedScanResults_shouldUpdateWifiEntries() {
+        final InOrder inOrder = inOrder(networkRequestDialogFragment);
 
-        bundle.putString(KEY_SSID, "Test AP 1");
-        bundle.putInt(KEY_SECURITY, 1 /* WEP */);
-        accessPointList.add(new AccessPoint(mContext, bundle));
+        final List<ScanResult> scanResults = new ArrayList<>();
+        networkRequestDialogFragment.mMatchedScanResults = scanResults;
+        ScanResult scanResult = mock(ScanResult.class);
+        networkRequestDialogFragment.mMatchedScanResults.add(scanResult);
+        networkRequestDialogFragment.onMatch(scanResults);
 
-        bundle.putString(KEY_SSID, "Test AP 2");
-        bundle.putInt(KEY_SECURITY, 1 /* WEP */);
-        accessPointList.add(new AccessPoint(mContext, bundle));
+        inOrder.verify(networkRequestDialogFragment).updateWifiEntries();
+        inOrder.verify(networkRequestDialogFragment).updateUi();
+    }
 
-        bundle.putString(KEY_SSID, "Test AP 3");
-        bundle.putInt(KEY_SECURITY, 1 /* WEP */);
-        accessPointList.add(new AccessPoint(mContext, bundle));
+    private List<WifiEntry> createWifiEntryList() {
+        List<WifiEntry> wifiEntryList = spy(new ArrayList<>());
 
-        bundle.putString(KEY_SSID, "Test AP 4");
-        bundle.putInt(KEY_SECURITY, 0 /* NONE */);
-        accessPointList.add(new AccessPoint(mContext, bundle));
+        final WifiEntry wifiEntry1 = mock(WifiEntry.class);
+        when(wifiEntry1.getSsid()).thenReturn("Test AP 1");
+        when(wifiEntry1.getSecurity()).thenReturn(WifiEntry.SECURITY_WEP);
+        wifiEntryList.add(wifiEntry1);
 
-        bundle.putString(KEY_SSID, "Test AP 5");
-        bundle.putInt(KEY_SECURITY, 1 /* WEP */);
-        accessPointList.add(new AccessPoint(mContext, bundle));
+        final WifiEntry wifiEntry2 = mock(WifiEntry.class);
+        when(wifiEntry2.getSsid()).thenReturn("Test AP 2");
+        when(wifiEntry2.getSecurity()).thenReturn(WifiEntry.SECURITY_WEP);
+        wifiEntryList.add(wifiEntry2);
 
-        bundle.putString(KEY_SSID, "Test AP 6");
-        bundle.putInt(KEY_SECURITY, 1 /* WEP */);
-        accessPointList.add(new AccessPoint(mContext, bundle));
+        final WifiEntry wifiEntry3 = mock(WifiEntry.class);
+        when(wifiEntry3.getSsid()).thenReturn("Test AP 3");
+        when(wifiEntry3.getSecurity()).thenReturn(WifiEntry.SECURITY_WEP);
+        wifiEntryList.add(wifiEntry3);
 
-        return accessPointList;
+        final WifiEntry wifiEntry4 = mock(WifiEntry.class);
+        when(wifiEntry4.getSsid()).thenReturn("Test AP 4");
+        when(wifiEntry4.getSecurity()).thenReturn(WifiEntry.SECURITY_NONE);
+        wifiEntryList.add(wifiEntry4);
+
+        final WifiEntry wifiEntry5 = mock(WifiEntry.class);
+        when(wifiEntry5.getSsid()).thenReturn("Test AP 5");
+        when(wifiEntry5.getSecurity()).thenReturn(WifiEntry.SECURITY_WEP);
+        wifiEntryList.add(wifiEntry5);
+
+        final WifiEntry wifiEntry6 = mock(WifiEntry.class);
+        when(wifiEntry6.getSsid()).thenReturn("Test AP 6");
+        when(wifiEntry6.getSecurity()).thenReturn(WifiEntry.SECURITY_WEP);
+        wifiEntryList.add(wifiEntry6);
+
+        return wifiEntryList;
     }
 
     @Test
@@ -247,8 +212,10 @@
     public void onMatchManyResult_showNeutralButton() {
         networkRequestDialogFragment.show(mActivity.getSupportFragmentManager(), /* tag */ null);
         final AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
-        List<AccessPoint> accessPointList = createAccessPointList();
-        when(mWifiTracker.getAccessPoints()).thenReturn(accessPointList);
+        List<WifiEntry> wifiEntryList = createWifiEntryList();
+        final WifiPickerTracker wifiPickerTracker = mock(WifiPickerTracker.class);
+        when(wifiPickerTracker.getWifiEntries()).thenReturn(wifiEntryList);
+        networkRequestDialogFragment.mWifiPickerTracker = wifiPickerTracker;
 
         final String ssidAp = "Test AP ";
         final List<ScanResult> scanResults = new ArrayList<>();
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java b/tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java
index e588799..29a3797 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java
@@ -21,6 +21,7 @@
 import static org.mockito.Mockito.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
+import static org.robolectric.Shadows.shadowOf;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -32,6 +33,9 @@
 import android.net.wifi.WifiManager;
 import android.os.ServiceSpecificException;
 import android.security.KeyStore;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
@@ -43,7 +47,7 @@
 
 import com.android.settings.R;
 import com.android.settings.testutils.shadow.ShadowConnectivityManager;
-import com.android.settings.wifi.details.WifiPrivacyPreferenceController;
+import com.android.settings.wifi.details2.WifiPrivacyPreferenceController2;
 import com.android.wifitrackerlib.WifiEntry;
 
 import org.junit.Before;
@@ -56,6 +60,9 @@
 import org.robolectric.Shadows;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowInputMethodManager;
+import org.robolectric.shadows.ShadowSubscriptionManager;
+
+import java.util.Arrays;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = ShadowConnectivityManager.class)
@@ -71,6 +78,7 @@
     private KeyStore mKeyStore;
     private View mView;
     private Spinner mHiddenSettingsSpinner;
+    private ShadowSubscriptionManager mShadowSubscriptionManager;
 
     public WifiConfigController2 mController;
     private static final String HEX_PSK = "01234567012345670123456701234567012345670123456701234567"
@@ -101,6 +109,7 @@
         final Spinner ipSettingsSpinner = mView.findViewById(R.id.ip_settings);
         mHiddenSettingsSpinner = mView.findViewById(R.id.hidden_settings);
         ipSettingsSpinner.setSelection(DHCP);
+        mShadowSubscriptionManager = shadowOf(mContext.getSystemService(SubscriptionManager.class));
 
         mController = new TestWifiConfigController2(mConfigUiBase, mView, mWifiEntry,
                 WifiConfigUiBase2.MODE_CONNECT);
@@ -225,6 +234,35 @@
     }
 
     @Test
+    public void isSubmittable_caCertWithoutDomain_shouldReturnFalse() {
+        when(mWifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_EAP);
+        mController = new TestWifiConfigController2(mConfigUiBase, mView, mWifiEntry,
+                WifiConfigUiBase2.MODE_CONNECT);
+        mView.findViewById(R.id.l_ca_cert).setVisibility(View.VISIBLE);
+        final Spinner eapCaCertSpinner = mView.findViewById(R.id.ca_cert);
+        eapCaCertSpinner.setAdapter(mController.getSpinnerAdapter(new String[]{"certificate"}));
+        eapCaCertSpinner.setSelection(0);
+        mView.findViewById(R.id.l_domain).setVisibility(View.VISIBLE);
+
+        assertThat(mController.isSubmittable()).isFalse();
+    }
+
+    @Test
+    public void isSubmittable_caCertWithDomain_shouldReturnTrue() {
+        when(mWifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_EAP);
+        mController = new TestWifiConfigController2(mConfigUiBase, mView, mWifiEntry,
+                WifiConfigUiBase2.MODE_CONNECT);
+        mView.findViewById(R.id.l_ca_cert).setVisibility(View.VISIBLE);
+        final Spinner eapCaCertSpinner = mView.findViewById(R.id.ca_cert);
+        eapCaCertSpinner.setAdapter(mController.getSpinnerAdapter(new String[]{"certificate"}));
+        eapCaCertSpinner.setSelection(0);
+        mView.findViewById(R.id.l_domain).setVisibility(View.VISIBLE);
+        ((TextView) mView.findViewById(R.id.domain)).setText("fakeDomain");
+
+        assertThat(mController.isSubmittable()).isTrue();
+    }
+
+    @Test
     public void getSignalString_notReachable_shouldHaveNoSignalString() {
         when(mWifiEntry.getLevel()).thenReturn(WifiEntry.WIFI_LEVEL_UNREACHABLE);
 
@@ -249,7 +287,7 @@
     @Test
     public void loadCertificates_undesiredCertificates_shouldNotLoadUndesiredCertificates() {
         final Spinner spinner = new Spinner(mContext);
-        when(mKeyStore.list(anyString())).thenReturn(WifiConfigController.UNDESIRED_CERTIFICATES);
+        when(mKeyStore.list(anyString())).thenReturn(WifiConfigController2.UNDESIRED_CERTIFICATES);
 
         mController.loadCertificates(spinner,
                 "prefix",
@@ -392,7 +430,7 @@
     public void loadMacRandomizedValue_shouldPersistentAsDefault() {
         final Spinner privacySetting = mView.findViewById(R.id.privacy_settings);
         final int prefPersist =
-                WifiPrivacyPreferenceController.translateMacRandomizedValueToPrefValue(
+                WifiPrivacyPreferenceController2.translateMacRandomizedValueToPrefValue(
                         WifiConfiguration.RANDOMIZATION_PERSISTENT);
 
         assertThat(privacySetting.getVisibility()).isEqualTo(View.VISIBLE);
@@ -420,7 +458,7 @@
 
         final Spinner privacySetting = mView.findViewById(R.id.privacy_settings);
         final int expectedPrefValue =
-                WifiPrivacyPreferenceController.translateMacRandomizedValueToPrefValue(
+                WifiPrivacyPreferenceController2.translateMacRandomizedValueToPrefValue(
                         macRandomizedValue);
 
         assertThat(privacySetting.getVisibility()).isEqualTo(View.VISIBLE);
@@ -438,7 +476,7 @@
     public void saveMacRandomizedValue_ChangedToNone_shouldGetNone() {
         final Spinner privacySetting = mView.findViewById(R.id.privacy_settings);
         final int prefMacNone =
-                WifiPrivacyPreferenceController.translateMacRandomizedValueToPrefValue(
+                WifiPrivacyPreferenceController2.translateMacRandomizedValueToPrefValue(
                         WifiConfiguration.RANDOMIZATION_NONE);
         privacySetting.setSelection(prefMacNone);
 
@@ -760,4 +798,41 @@
         mController = new TestWifiConfigController2(mConfigUiBase, mView, mWifiEntry,
                 WifiConfigUiBase2.MODE_MODIFY);
     }
+
+    @Test
+    public void loadSims_noSim_simSpinnerDefaultNoSim() {
+        when(mWifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_EAP);
+        mController = new TestWifiConfigController2(mConfigUiBase, mView, mWifiEntry,
+                WifiConfigUiBase2.MODE_CONNECT);
+        final Spinner eapMethodSpinner = mock(Spinner.class);
+        when(eapMethodSpinner.getSelectedItemPosition()).thenReturn(
+                WifiConfigController2.WIFI_EAP_METHOD_SIM);
+        mController.mEapMethodSpinner = eapMethodSpinner;
+
+        mController.loadSims();
+
+        final WifiConfiguration wifiConfiguration = mController.getConfig();
+        assertThat(wifiConfiguration.carrierId).isEqualTo(TelephonyManager.UNKNOWN_CARRIER_ID);
+    }
+
+    @Test
+    public void loadSims_oneSim_simSpinnerDefaultSubscription() {
+        when(mWifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_EAP);
+        final SubscriptionInfo subscriptionInfo = mock(SubscriptionInfo.class);
+        final int carrierId = 6;
+        when(subscriptionInfo.getCarrierId()).thenReturn(carrierId);
+        when(subscriptionInfo.getCarrierName()).thenReturn("FAKE-CARRIER");
+        mShadowSubscriptionManager.setActiveSubscriptionInfoList(Arrays.asList(subscriptionInfo));
+        mController = new TestWifiConfigController2(mConfigUiBase, mView, mWifiEntry,
+                WifiConfigUiBase2.MODE_CONNECT);
+        final Spinner eapMethodSpinner = mock(Spinner.class);
+        when(eapMethodSpinner.getSelectedItemPosition()).thenReturn(
+                WifiConfigController2.WIFI_EAP_METHOD_SIM);
+        mController.mEapMethodSpinner = eapMethodSpinner;
+
+        mController.loadSims();
+
+        final WifiConfiguration wifiConfiguration = mController.getConfig();
+        assertThat(wifiConfiguration.carrierId).isEqualTo(carrierId);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
index 9146998..8f73bc3 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
@@ -16,11 +16,15 @@
 
 package com.android.settings.wifi;
 
+import static com.android.settings.wifi.WifiConfigController.PRIVACY_SPINNER_INDEX_DEVICE_MAC;
+import static com.android.settings.wifi.WifiConfigController.PRIVACY_SPINNER_INDEX_RANDOMIZED_MAC;
+
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.Mockito.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
+import static org.robolectric.Shadows.shadowOf;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -32,6 +36,9 @@
 import android.net.wifi.WifiManager;
 import android.os.ServiceSpecificException;
 import android.security.KeyStore;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
@@ -43,7 +50,6 @@
 
 import com.android.settings.R;
 import com.android.settings.testutils.shadow.ShadowConnectivityManager;
-import com.android.settings.wifi.details.WifiPrivacyPreferenceController;
 import com.android.settingslib.wifi.AccessPoint;
 
 import org.junit.Before;
@@ -56,6 +62,9 @@
 import org.robolectric.Shadows;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowInputMethodManager;
+import org.robolectric.shadows.ShadowSubscriptionManager;
+
+import java.util.Arrays;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = ShadowConnectivityManager.class)
@@ -71,6 +80,7 @@
     private KeyStore mKeyStore;
     private View mView;
     private Spinner mHiddenSettingsSpinner;
+    private ShadowSubscriptionManager mShadowSubscriptionManager;
 
     public WifiConfigController mController;
     private static final String HEX_PSK = "01234567012345670123456701234567012345670123456701234567"
@@ -95,6 +105,7 @@
         final Spinner ipSettingsSpinner = mView.findViewById(R.id.ip_settings);
         mHiddenSettingsSpinner = mView.findViewById(R.id.hidden_settings);
         ipSettingsSpinner.setSelection(DHCP);
+        mShadowSubscriptionManager = shadowOf(mContext.getSystemService(SubscriptionManager.class));
 
         mController = new TestWifiConfigController(mConfigUiBase, mView, mAccessPoint,
                 WifiConfigUiBase.MODE_CONNECT);
@@ -219,6 +230,35 @@
     }
 
     @Test
+    public void isSubmittable_caCertWithoutDomain_shouldReturnFalse() {
+        when(mAccessPoint.getSecurity()).thenReturn(AccessPoint.SECURITY_EAP);
+        mController = new TestWifiConfigController(mConfigUiBase, mView, mAccessPoint,
+                WifiConfigUiBase.MODE_CONNECT);
+        mView.findViewById(R.id.l_ca_cert).setVisibility(View.VISIBLE);
+        final Spinner eapCaCertSpinner = mView.findViewById(R.id.ca_cert);
+        eapCaCertSpinner.setAdapter(mController.getSpinnerAdapter(new String[]{"certificate"}));
+        eapCaCertSpinner.setSelection(0);
+        mView.findViewById(R.id.l_domain).setVisibility(View.VISIBLE);
+
+        assertThat(mController.isSubmittable()).isFalse();
+    }
+
+    @Test
+    public void isSubmittable_caCertWithDomain_shouldReturnTrue() {
+        when(mAccessPoint.getSecurity()).thenReturn(AccessPoint.SECURITY_EAP);
+        mController = new TestWifiConfigController(mConfigUiBase, mView, mAccessPoint,
+                WifiConfigUiBase.MODE_CONNECT);
+        mView.findViewById(R.id.l_ca_cert).setVisibility(View.VISIBLE);
+        final Spinner eapCaCertSpinner = mView.findViewById(R.id.ca_cert);
+        eapCaCertSpinner.setAdapter(mController.getSpinnerAdapter(new String[]{"certificate"}));
+        eapCaCertSpinner.setSelection(0);
+        mView.findViewById(R.id.l_domain).setVisibility(View.VISIBLE);
+        ((TextView) mView.findViewById(R.id.domain)).setText("fakeDomain");
+
+        assertThat(mController.isSubmittable()).isTrue();
+    }
+
+    @Test
     public void getSignalString_notReachable_shouldHaveNoSignalString() {
         when(mAccessPoint.isReachable()).thenReturn(false);
 
@@ -381,14 +421,12 @@
     }
 
     @Test
-    public void loadMacRandomizedValue_shouldPersistentAsDefault() {
+    public void loadMacRandomizedValue_shouldMandomizedMacAsDefault() {
         final Spinner privacySetting = mView.findViewById(R.id.privacy_settings);
-        final int prefPersist =
-                WifiPrivacyPreferenceController.translateMacRandomizedValueToPrefValue(
-                        WifiConfiguration.RANDOMIZATION_PERSISTENT);
 
         assertThat(privacySetting.getVisibility()).isEqualTo(View.VISIBLE);
-        assertThat(privacySetting.getSelectedItemPosition()).isEqualTo(prefPersist);
+        assertThat(privacySetting.getSelectedItemPosition()).isEqualTo(
+                PRIVACY_SPINNER_INDEX_RANDOMIZED_MAC);
     }
 
     @Test
@@ -409,14 +447,12 @@
         mockWifiConfig.macRandomizationSetting = macRandomizedValue;
         mController = new TestWifiConfigController(mConfigUiBase, mView, mAccessPoint,
                 WifiConfigUiBase.MODE_CONNECT);
-
         final Spinner privacySetting = mView.findViewById(R.id.privacy_settings);
-        final int expectedPrefValue =
-                WifiPrivacyPreferenceController.translateMacRandomizedValueToPrefValue(
-                        macRandomizedValue);
 
         assertThat(privacySetting.getVisibility()).isEqualTo(View.VISIBLE);
-        assertThat(privacySetting.getSelectedItemPosition()).isEqualTo(expectedPrefValue);
+        assertThat(privacySetting.getSelectedItemPosition()).isEqualTo(
+                macRandomizedValue == WifiConfiguration.RANDOMIZATION_PERSISTENT
+                ? PRIVACY_SPINNER_INDEX_RANDOMIZED_MAC : PRIVACY_SPINNER_INDEX_DEVICE_MAC);
     }
 
     @Test
@@ -427,12 +463,9 @@
     }
 
     @Test
-    public void saveMacRandomizedValue_ChangedToNone_shouldGetNone() {
+    public void saveMacRandomizedValue_ChangedToDeviceMac_shouldGetNone() {
         final Spinner privacySetting = mView.findViewById(R.id.privacy_settings);
-        final int prefMacNone =
-                WifiPrivacyPreferenceController.translateMacRandomizedValueToPrefValue(
-                        WifiConfiguration.RANDOMIZATION_NONE);
-        privacySetting.setSelection(prefMacNone);
+        privacySetting.setSelection(PRIVACY_SPINNER_INDEX_DEVICE_MAC);
 
         WifiConfiguration config = mController.getConfig();
         assertThat(config.macRandomizationSetting).isEqualTo(WifiConfiguration.RANDOMIZATION_NONE);
@@ -575,4 +608,41 @@
 
         assertThat(advButton.getVisibility()).isEqualTo(View.GONE);
     }
+
+    @Test
+    public void loadSims_noSim_simSpinnerDefaultNoSim() {
+        when(mAccessPoint.getSecurity()).thenReturn(AccessPoint.SECURITY_EAP);
+        mController = new TestWifiConfigController(mConfigUiBase, mView, mAccessPoint,
+                WifiConfigUiBase.MODE_CONNECT);
+        final Spinner eapMethodSpinner = mock(Spinner.class);
+        when(eapMethodSpinner.getSelectedItemPosition()).thenReturn(
+                WifiConfigController2.WIFI_EAP_METHOD_SIM);
+        mController.mEapMethodSpinner = eapMethodSpinner;
+
+        mController.loadSims();
+
+        final WifiConfiguration wifiConfiguration = mController.getConfig();
+        assertThat(wifiConfiguration.carrierId).isEqualTo(TelephonyManager.UNKNOWN_CARRIER_ID);
+    }
+
+    @Test
+    public void loadSims_oneSim_simSpinnerDefaultSubscription() {
+        when(mAccessPoint.getSecurity()).thenReturn(AccessPoint.SECURITY_EAP);
+        final SubscriptionInfo subscriptionInfo = mock(SubscriptionInfo.class);
+        final int carrierId = 6;
+        when(subscriptionInfo.getCarrierId()).thenReturn(carrierId);
+        when(subscriptionInfo.getCarrierName()).thenReturn("FAKE-CARRIER");
+        mShadowSubscriptionManager.setActiveSubscriptionInfoList(Arrays.asList(subscriptionInfo));
+        mController = new TestWifiConfigController(mConfigUiBase, mView, mAccessPoint,
+                WifiConfigUiBase.MODE_CONNECT);
+        final Spinner eapMethodSpinner = mock(Spinner.class);
+        when(eapMethodSpinner.getSelectedItemPosition()).thenReturn(
+                WifiConfigController2.WIFI_EAP_METHOD_SIM);
+        mController.mEapMethodSpinner = eapMethodSpinner;
+
+        mController.loadSims();
+
+        final WifiConfiguration wifiConfiguration = mController.getConfig();
+        assertThat(wifiConfiguration.carrierId).isEqualTo(carrierId);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java b/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java
index 41d1bbe..0e1ca92 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java
@@ -23,13 +23,18 @@
 import android.content.Intent;
 import android.net.wifi.WifiConfiguration;
 
+import androidx.lifecycle.Lifecycle.State;
+import androidx.test.core.app.ActivityScenario;
+
 import com.android.settings.R;
 import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
 import com.android.settings.testutils.shadow.ShadowConnectivityManager;
+import com.android.settings.testutils.shadow.ShadowNetworkDetailsTracker;
 import com.android.settings.testutils.shadow.ShadowWifiManager;
 
 import com.google.android.setupcompat.util.WizardManagerHelper;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -42,15 +47,20 @@
 
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = {
+        ShadowAlertDialogCompat.class,
         ShadowConnectivityManager.class,
-        ShadowWifiManager.class,
-        ShadowAlertDialogCompat.class
+        ShadowNetworkDetailsTracker.class,
+        ShadowWifiManager.class
 })
 public class WifiDialogActivityTest {
 
     private static final String AP1_SSID = "\"ap1\"";
     @Mock
     private WifiConfigController mController;
+    @Mock
+    private WifiConfigController2 mController2;
+
+    private ActivityScenario<WifiDialogActivity> mWifiDialogActivity;
 
     @Before
     public void setUp() {
@@ -59,6 +69,18 @@
         WifiConfiguration wifiConfig = new WifiConfiguration();
         wifiConfig.SSID = AP1_SSID;
         doReturn(wifiConfig).when(mController).getConfig();
+        doReturn(wifiConfig).when(mController2).getConfig();
+    }
+
+    @After
+    public void cleanUp() {
+        if (mWifiDialogActivity != null) {
+            mWifiDialogActivity.close();
+        }
+    }
+
+    private ActivityScenario<WifiDialogActivity> createTargetActivity(Intent activityIntent) {
+        return ActivityScenario.launch(activityIntent);
     }
 
     @Test
@@ -75,6 +97,27 @@
     }
 
     @Test
+    public void onSubmit2_whenConnectForCallerIsTrue_shouldConnectToNetwork() {
+        final Intent intent = new Intent("com.android.settings.WIFI_DIALOG");
+        intent.putExtra(WifiDialogActivity.KEY_CHOSEN_WIFIENTRY_KEY, "FAKE_KEY");
+        intent.putExtra(WifiDialogActivity.KEY_CONNECT_FOR_CALLER, true);
+        mWifiDialogActivity = createTargetActivity(intent);
+
+        mWifiDialogActivity.moveToState(State.CREATED);
+        mWifiDialogActivity.moveToState(State.STARTED);
+
+        WifiDialog2 dialog = (WifiDialog2) ShadowAlertDialogCompat.getLatestAlertDialog();
+        assertThat(dialog).isNotNull();
+
+        ReflectionHelpers.setField(dialog, "mController", mController2);
+
+        mWifiDialogActivity.onActivity(activity -> {
+            activity.onSubmit(dialog);
+            assertThat(ShadowWifiManager.get().savedWifiConfig.SSID).isEqualTo(AP1_SSID);
+        });
+    }
+
+    @Test
     public void onSubmit_whenConnectForCallerIsFalse_shouldNotConnectToNetwork() {
         WifiDialogActivity activity =
                 Robolectric.buildActivity(
@@ -93,6 +136,27 @@
     }
 
     @Test
+    public void onSubmit2_whenConnectForCallerIsFalse_shouldNotConnectToNetwork() {
+        final Intent intent = new Intent("com.android.settings.WIFI_DIALOG");
+        intent.putExtra(WifiDialogActivity.KEY_CHOSEN_WIFIENTRY_KEY, "FAKE_KEY");
+        intent.putExtra(WifiDialogActivity.KEY_CONNECT_FOR_CALLER, false);
+        mWifiDialogActivity = createTargetActivity(intent);
+
+        mWifiDialogActivity.moveToState(State.CREATED);
+        mWifiDialogActivity.moveToState(State.STARTED);
+
+        WifiDialog2 dialog = (WifiDialog2) ShadowAlertDialogCompat.getLatestAlertDialog();
+        assertThat(dialog).isNotNull();
+
+        ReflectionHelpers.setField(dialog, "mController", mController2);
+
+        mWifiDialogActivity.onActivity(activity -> {
+            activity.onSubmit(dialog);
+            assertThat(ShadowWifiManager.get().savedWifiConfig).isEqualTo(null);
+        });
+    }
+
+    @Test
     public void onSubmit_whenLaunchInSetupFlow_shouldBeLightThemeForWifiDialog() {
         WifiDialogActivity activity =
                 Robolectric.buildActivity(
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiDialogTest.java b/tests/robotests/src/com/android/settings/wifi/WifiDialogTest.java
deleted file mode 100644
index ed9b851..0000000
--- a/tests/robotests/src/com/android/settings/wifi/WifiDialogTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.android.settings.wifi;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-
-import com.android.settings.R;
-import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
-import com.android.settings.wifi.WifiDialog.WifiDialogListener;
-import com.android.settingslib.wifi.AccessPoint;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(shadows = ShadowEntityHeaderController.class)
-public class WifiDialogTest {
-    @Mock private AccessPoint mockAccessPoint;
-
-    private Context mContext = RuntimeEnvironment.application;
-
-    private WifiDialogListener mListener = new WifiDialogListener() {};
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-    }
-
-    @Test
-    public void createModal_usesDefaultTheme() {
-        WifiDialog modal = WifiDialog
-                .createModal(mContext, mListener, mockAccessPoint, WifiConfigUiBase.MODE_CONNECT);
-
-        WifiDialog wifiDialog = new WifiDialog(mContext, mListener, mockAccessPoint,
-                WifiConfigUiBase.MODE_CONNECT, 0 /* style */, false /* hideSubmitButton */);
-        assertThat(modal.getContext().getThemeResId())
-                .isEqualTo(wifiDialog.getContext().getThemeResId());
-    }
-
-    @Test
-    public void createModal_whenSetTheme_shouldBeCustomizedTheme() {
-        WifiDialog modal = WifiDialog.createModal(mContext, mListener, mockAccessPoint,
-                WifiConfigUiBase.MODE_CONNECT, R.style.SuwAlertDialogThemeCompat_Light);
-
-        WifiDialog wifiDialog = new WifiDialog(mContext, mListener, mockAccessPoint,
-                WifiConfigUiBase.MODE_CONNECT, R.style.SuwAlertDialogThemeCompat_Light,
-                        false /* hideSubmitButton */);
-        assertThat(modal.getContext().getThemeResId())
-                .isEqualTo(wifiDialog.getContext().getThemeResId());
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiNoInternetDialogTest.java b/tests/robotests/src/com/android/settings/wifi/WifiNoInternetDialogTest.java
index af7a2a3..dc5ccb4 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiNoInternetDialogTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiNoInternetDialogTest.java
@@ -16,16 +16,234 @@
 
 package com.android.settings.wifi;
 
+import static android.net.ConnectivityManager.ACTION_PROMPT_LOST_VALIDATION;
+import static android.net.ConnectivityManager.ACTION_PROMPT_PARTIAL_CONNECTIVITY;
+import static android.net.ConnectivityManager.ACTION_PROMPT_UNVALIDATED;
+import static android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.net.ConnectivityManager;
+import android.net.Network;
+import android.net.NetworkCapabilities;
+import android.net.NetworkInfo;
+import android.net.NetworkRequest;
+import android.net.Uri;
+import android.os.Bundle;
+
+import com.android.settings.R;
+
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
 
 @RunWith(RobolectricTestRunner.class)
 public class WifiNoInternetDialogTest {
+
+    private static final String FAKE_NETWORK_ID = "13";
+    private static final String FAKE_URL = "netId:13";
+    private static final String WRONG_URL = "netId:";
+    private static final String FAKE_SSID = "fake_ssid";
+
+    @Captor
+    private ArgumentCaptor<ConnectivityManager.NetworkCallback> mCallbackCaptor;
+
+    @Mock
+    private ConnectivityManager mConnectivityManager;
+
+    @Mock
+    private NetworkInfo mNetworkInfo;
+
+    @Mock
+    private NetworkCapabilities mNetworkCapabilities;
+
+    private WifiNoInternetDialog mActivity;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+    }
+
     @Test
     public void launchActivity_noIntentAction_shouldNotFatalException() {
         WifiNoInternetDialog wifiNoInternetDialog =
                 Robolectric.setupActivity(WifiNoInternetDialog.class);
     }
-}
+
+    @Test
+    public void setupPromptUnvalidated_shouldShowNoInternetAccessRemember() {
+        setupActivityWithAction(ACTION_PROMPT_UNVALIDATED, FAKE_URL);
+        setupNetworkComponents();
+
+        mActivity.onCreate(new Bundle());
+
+        assertThat(mActivity.mAlwaysAllow.getText()).isEqualTo(
+                mActivity.getString(R.string.no_internet_access_remember));
+    }
+
+    @Test
+    public void setupPromptPartialConnectivity_shouldShowNoInternetAccessRemember() {
+        setupActivityWithAction(ACTION_PROMPT_PARTIAL_CONNECTIVITY, FAKE_URL);
+        setupNetworkComponents();
+
+        mActivity.onCreate(new Bundle());
+
+        assertThat(mActivity.mAlwaysAllow.getText()).isEqualTo(
+                mActivity.getString(R.string.no_internet_access_remember));
+    }
+
+    @Test
+    public void setupPromptLostValidationAction_shouldShowLostInternetAccessPersist() {
+        setupActivityWithAction(ACTION_PROMPT_LOST_VALIDATION, FAKE_URL);
+        setupNetworkComponents();
+
+        mActivity.onCreate(new Bundle());
+
+        assertThat(mActivity.mAlwaysAllow.getText()).isEqualTo(
+                mActivity.getString(R.string.lost_internet_access_persist));
+    }
+
+    @Test
+    public void clickPositiveButton_whenPromptUnvalidated_shouldCallSetAcceptUnvalidated() {
+        setupActivityWithAction(ACTION_PROMPT_UNVALIDATED, FAKE_URL);
+        setupNetworkComponents();
+        mActivity.onCreate(new Bundle());
+
+        mActivity.onClick(null, DialogInterface.BUTTON_POSITIVE);
+
+        verify(mConnectivityManager).setAcceptUnvalidated(any(Network.class), eq(true), eq(false));
+    }
+
+    @Test
+    public void positiveButton_withPartialConnectivity_shouldCallSetAcceptPartialConnectivity() {
+        setupActivityWithAction(ACTION_PROMPT_PARTIAL_CONNECTIVITY, FAKE_URL);
+        setupNetworkComponents();
+        mActivity.onCreate(new Bundle());
+
+        mActivity.onClick(null, DialogInterface.BUTTON_POSITIVE);
+
+        verify(mConnectivityManager).setAcceptPartialConnectivity(any(Network.class), eq(true),
+                eq(false));
+    }
+
+    @Test
+    public void positiveButton_withLostValidation_shouldCallSetAvoidUnvalidated() {
+        setupActivityWithAction(ACTION_PROMPT_LOST_VALIDATION, FAKE_URL);
+        setupNetworkComponents();
+        mActivity.onCreate(new Bundle());
+
+        mActivity.onClick(null, DialogInterface.BUTTON_POSITIVE);
+
+        verify(mConnectivityManager).setAvoidUnvalidated(any(Network.class));
+    }
+
+    @Test
+    public void destroyWithNoClick_inPartialConnectivity_shouldCallSetAcceptPartialConnectivity() {
+        setupActivityWithAction(ACTION_PROMPT_PARTIAL_CONNECTIVITY, FAKE_URL);
+        setupNetworkComponents();
+        when(mActivity.isFinishing()).thenReturn(true);
+        mActivity.onCreate(new Bundle());
+
+        mActivity.onDestroy();
+
+        verify(mConnectivityManager).setAcceptPartialConnectivity(any(Network.class), eq(false),
+                eq(false));
+    }
+
+    @Test
+    public void destroyWithNoClick_whenUnvalidated_shouldCallSetAcceptUnvalidated() {
+        setupActivityWithAction(ACTION_PROMPT_UNVALIDATED, FAKE_URL);
+        setupNetworkComponents();
+        when(mActivity.isFinishing()).thenReturn(true);
+        mActivity.onCreate(new Bundle());
+
+        mActivity.onDestroy();
+
+        verify(mConnectivityManager).setAcceptUnvalidated(any(Network.class), eq(false), eq(false));
+    }
+
+    @Test
+    public void networkCallbackOnLost_shouldFinish() {
+        setupActivityWithAction(ACTION_PROMPT_UNVALIDATED, FAKE_URL);
+        setupNetworkComponents();
+        mActivity.onCreate(new Bundle());
+        verify(mConnectivityManager, times(1)).registerNetworkCallback(
+                any(NetworkRequest.class), mCallbackCaptor.capture());
+
+        mCallbackCaptor.getValue().onLost(new Network(Integer.parseInt(FAKE_NETWORK_ID)));
+
+        verify(mActivity).finish();
+    }
+
+    @Test
+    public void networkCallbackOnCapabilitiesChanged_shouldFinish() {
+        setupActivityWithAction(ACTION_PROMPT_UNVALIDATED, FAKE_URL);
+        setupNetworkComponents();
+        when(mNetworkCapabilities.hasCapability(NET_CAPABILITY_VALIDATED)).thenReturn(true);
+        mActivity.onCreate(new Bundle());
+        verify(mConnectivityManager, times(1)).registerNetworkCallback(
+                any(NetworkRequest.class), mCallbackCaptor.capture());
+
+        mCallbackCaptor.getValue().onCapabilitiesChanged(
+                new Network(Integer.parseInt(FAKE_NETWORK_ID)), mNetworkCapabilities);
+
+        verify(mActivity).finish();
+    }
+
+    @Test
+    public void networkNotConnectedOrConnecting_shouldFinish() {
+        setupActivityWithAction(ACTION_PROMPT_UNVALIDATED, FAKE_URL);
+        setupNetworkComponents();
+        when(mNetworkInfo.isConnectedOrConnecting()).thenReturn(false);
+
+        mActivity.onCreate(new Bundle());
+
+        verify(mActivity).finish();
+    }
+
+    @Test
+    public void withWrongUrl_shouldFinish() {
+        setupActivityWithAction(ACTION_PROMPT_UNVALIDATED, WRONG_URL);
+        setupNetworkComponents();
+
+        mActivity.onCreate(new Bundle());
+
+        verify(mActivity).finish();
+    }
+
+    private void setupNetworkComponents() {
+        when(mActivity.getSystemService(Context.CONNECTIVITY_SERVICE))
+                .thenReturn(mConnectivityManager);
+        when(mNetworkInfo.isConnectedOrConnecting()).thenReturn(true);
+        when(mNetworkCapabilities.getSsid()).thenReturn(FAKE_SSID);
+        when(mConnectivityManager.getNetworkInfo(any()))
+                .thenReturn(mNetworkInfo);
+        when(mConnectivityManager.getNetworkCapabilities(any()))
+                .thenReturn(mNetworkCapabilities);
+    }
+
+    private void setupActivityWithAction(String action, String url) {
+        final Intent intent = new Intent(action).setClassName(
+                RuntimeEnvironment.application.getPackageName(),
+                WifiNoInternetDialog.class.getName());
+        intent.setData(Uri.parse(url));
+        mActivity = spy(Robolectric.buildActivity(WifiNoInternetDialog.class, intent).get());
+    }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiPrimarySwitchPreferenceControllerTest.java
similarity index 90%
rename from tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/wifi/WifiPrimarySwitchPreferenceControllerTest.java
index 1d13232..b94df29 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiPrimarySwitchPreferenceControllerTest.java
@@ -38,7 +38,7 @@
 
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal;
-import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settings.widget.PrimarySwitchPreference;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
 import org.junit.Before;
@@ -52,21 +52,21 @@
 
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = ShadowRestrictedLockUtilsInternal.class)
-public class WifiMasterSwitchPreferenceControllerTest {
+public class WifiPrimarySwitchPreferenceControllerTest {
 
     @Mock
     private WifiManager mWifiManager;
     @Mock
     private PreferenceScreen mScreen;
     @Mock
-    private MasterSwitchPreference mPreference;
+    private PrimarySwitchPreference mPreference;
     @Mock
     private ConnectivityManager mConnectivityManager;
     @Mock
     private NetworkScoreManager mNetworkScoreManager;
 
     private Context mContext;
-    private WifiMasterSwitchPreferenceController mController;
+    private WifiPrimarySwitchPreferenceController mController;
     private MetricsFeatureProvider mMetricsFeatureProvider;
 
     @Before
@@ -76,20 +76,20 @@
         mContext = spy(RuntimeEnvironment.application.getApplicationContext());
         when(mContext.getSystemService(ConnectivityManager.class)).thenReturn(mConnectivityManager);
         when(mContext.getSystemService(NetworkScoreManager.class)).thenReturn(mNetworkScoreManager);
-        mController = new WifiMasterSwitchPreferenceController(mContext, mMetricsFeatureProvider);
+        mController = new WifiPrimarySwitchPreferenceController(mContext, mMetricsFeatureProvider);
         when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
         when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
         when(mWifiManager.getWifiState()).thenReturn(WifiManager.WIFI_STATE_DISABLED);
     }
 
     @Test
-    public void testWifiMasterSwitch_byDefault_shouldBeShown() {
+    public void testWifiPrimarySwitch_byDefault_shouldBeShown() {
         assertThat(mController.isAvailable()).isTrue();
     }
 
     @Test
     @Config(qualifiers = "mcc999")
-    public void testWifiMasterSwitch_ifDisabled_shouldNotBeShown() {
+    public void testWifiPrimarySwitch_ifDisabled_shouldNotBeShown() {
         assertThat(mController.isAvailable()).isFalse();
     }
 
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSettings2Test.java b/tests/robotests/src/com/android/settings/wifi/WifiSettings2Test.java
deleted file mode 100644
index b2a28db..0000000
--- a/tests/robotests/src/com/android/settings/wifi/WifiSettings2Test.java
+++ /dev/null
@@ -1,367 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-package com.android.settings.wifi;
-
-import static com.android.settings.wifi.WifiConfigUiBase2.MODE_CONNECT;
-import static com.android.settings.wifi.WifiConfigUiBase2.MODE_MODIFY;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.Activity;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.res.Resources;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiManager;
-import android.os.Bundle;
-import android.os.PowerManager;
-import android.os.UserManager;
-import android.provider.Settings;
-import android.view.ContextMenu;
-import android.view.View;
-
-import androidx.fragment.app.FragmentActivity;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.android.settings.R;
-import com.android.settings.datausage.DataUsagePreference;
-import com.android.settings.testutils.shadow.ShadowDataUsageUtils;
-import com.android.settings.testutils.shadow.ShadowFragment;
-import com.android.settingslib.wifi.LongPressWifiEntryPreference;
-import com.android.wifitrackerlib.WifiEntry;
-import com.android.wifitrackerlib.WifiPickerTracker;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowToast;
-
-@RunWith(RobolectricTestRunner.class)
-public class WifiSettings2Test {
-
-    private static final int NUM_NETWORKS = 4;
-    private static final String FAKE_URI_STRING = "fakeuri";
-
-    @Mock
-    private PowerManager mPowerManager;
-    @Mock
-    private WifiManager mWifiManager;
-    @Mock
-    private DataUsagePreference mDataUsagePreference;
-    private Context mContext;
-    private WifiSettings2 mWifiSettings2;
-    @Mock
-    private WifiPickerTracker mMockWifiPickerTracker;
-    @Mock
-    private PreferenceManager mPreferenceManager;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = spy(RuntimeEnvironment.application);
-
-        mWifiSettings2 = spy(new WifiSettings2());
-        doReturn(mContext).when(mWifiSettings2).getContext();
-        doReturn(mPreferenceManager).when(mWifiSettings2).getPreferenceManager();
-        doReturn(mPowerManager).when(mContext).getSystemService(PowerManager.class);
-        doReturn(mWifiManager).when(mContext).getSystemService(WifiManager.class);
-        doReturn(mContext).when(mPreferenceManager).getContext();
-        mWifiSettings2.mAddWifiNetworkPreference = new AddWifiNetworkPreference(mContext);
-        mWifiSettings2.mSavedNetworksPreference = new Preference(mContext);
-        mWifiSettings2.mConfigureWifiSettingsPreference = new Preference(mContext);
-        mWifiSettings2.mWifiPickerTracker = mMockWifiPickerTracker;
-        mWifiSettings2.mWifiManager = mWifiManager;
-    }
-
-    @Test
-    public void addNetworkFragmentSendResult_onActivityResult_shouldHandleEvent() {
-        final WifiSettings2 wifiSettings2 = spy(new WifiSettings2());
-        final Intent intent = new Intent();
-        doNothing().when(wifiSettings2).handleAddNetworkRequest(anyInt(), any(Intent.class));
-
-        wifiSettings2.onActivityResult(WifiSettings2.ADD_NETWORK_REQUEST, Activity.RESULT_OK,
-                intent);
-
-        verify(wifiSettings2).handleAddNetworkRequest(anyInt(), any(Intent.class));
-    }
-
-    @Test
-    public void setAdditionalSettingsSummaries_hasSavedNetwork_preferenceVisible() {
-        when(mMockWifiPickerTracker.getNumSavedNetworks()).thenReturn(NUM_NETWORKS);
-        when(mMockWifiPickerTracker.getNumSavedSubscriptions()).thenReturn(0 /* count */);
-
-        mWifiSettings2.setAdditionalSettingsSummaries();
-
-        assertThat(mWifiSettings2.mSavedNetworksPreference.isVisible()).isTrue();
-        assertThat(mWifiSettings2.mSavedNetworksPreference.getSummary()).isEqualTo(
-                mContext.getResources().getQuantityString(
-                        R.plurals.wifi_saved_access_points_summary,
-                        NUM_NETWORKS, NUM_NETWORKS));
-    }
-
-    @Test
-    public void setAdditionalSettingsSummaries_hasSavedPasspointNetwork_preferenceVisible() {
-        when(mMockWifiPickerTracker.getNumSavedNetworks()).thenReturn(0 /* count */);
-        when(mMockWifiPickerTracker.getNumSavedSubscriptions()).thenReturn(NUM_NETWORKS);
-
-        mWifiSettings2.setAdditionalSettingsSummaries();
-
-        assertThat(mWifiSettings2.mSavedNetworksPreference.isVisible()).isTrue();
-        assertThat(mWifiSettings2.mSavedNetworksPreference.getSummary()).isEqualTo(
-                mContext.getResources().getQuantityString(
-                        R.plurals.wifi_saved_passpoint_access_points_summary,
-                        NUM_NETWORKS, NUM_NETWORKS));
-    }
-
-    @Test
-    public void setAdditionalSettingsSummaries_hasTwoKindsSavedNetwork_preferenceVisible() {
-        when(mMockWifiPickerTracker.getNumSavedNetworks()).thenReturn(NUM_NETWORKS);
-        when(mMockWifiPickerTracker.getNumSavedSubscriptions()).thenReturn(NUM_NETWORKS);
-
-        mWifiSettings2.setAdditionalSettingsSummaries();
-
-        assertThat(mWifiSettings2.mSavedNetworksPreference.isVisible()).isTrue();
-        assertThat(mWifiSettings2.mSavedNetworksPreference.getSummary()).isEqualTo(
-                mContext.getResources().getQuantityString(
-                        R.plurals.wifi_saved_all_access_points_summary,
-                        NUM_NETWORKS*2, NUM_NETWORKS*2));
-    }
-
-    @Test
-    public void setAdditionalSettingsSummaries_noSavedNetwork_preferenceInvisible() {
-        when(mMockWifiPickerTracker.getNumSavedNetworks()).thenReturn(0 /* count */);
-        when(mMockWifiPickerTracker.getNumSavedSubscriptions()).thenReturn(0 /* count */);
-
-        mWifiSettings2.setAdditionalSettingsSummaries();
-
-        assertThat(mWifiSettings2.mSavedNetworksPreference.isVisible()).isFalse();
-    }
-
-    @Test
-    public void setAdditionalSettingsSummaries_wifiWakeupEnabled_displayOn() {
-        final ContentResolver contentResolver = mContext.getContentResolver();
-        when(mWifiManager.isAutoWakeupEnabled()).thenReturn(true);
-        when(mWifiManager.isScanAlwaysAvailable()).thenReturn(true);
-        Settings.Global.putInt(contentResolver, Settings.Global.AIRPLANE_MODE_ON, 0);
-        when(mPowerManager.isPowerSaveMode()).thenReturn(false);
-
-        mWifiSettings2.setAdditionalSettingsSummaries();
-
-        assertThat(mWifiSettings2.mConfigureWifiSettingsPreference.getSummary()).isEqualTo(
-                mContext.getString(R.string.wifi_configure_settings_preference_summary_wakeup_on));
-    }
-
-    @Test
-    public void setAdditionalSettingsSummaries_wifiWakeupDisabled_displayOff() {
-        final ContentResolver contentResolver = mContext.getContentResolver();
-        when(mWifiManager.isAutoWakeupEnabled()).thenReturn(false);
-
-        mWifiSettings2.setAdditionalSettingsSummaries();
-
-        assertThat(mWifiSettings2.mConfigureWifiSettingsPreference.getSummary()).isEqualTo(
-                mContext.getString(R.string.wifi_configure_settings_preference_summary_wakeup_off));
-    }
-
-    @Test
-    public void checkAddWifiNetworkPrefernce_preferenceVisible() {
-        assertThat(mWifiSettings2.mAddWifiNetworkPreference.isVisible()).isTrue();
-        assertThat(mWifiSettings2.mAddWifiNetworkPreference.getTitle()).isEqualTo(
-                mContext.getString(R.string.wifi_add_network));
-    }
-
-    private void setUpForOnCreate() {
-        final FragmentActivity activity = mock(FragmentActivity.class);
-        when(mWifiSettings2.getActivity()).thenReturn(activity);
-        final Resources.Theme theme = mContext.getTheme();
-        when(activity.getTheme()).thenReturn(theme);
-        UserManager userManager = mock(UserManager.class);
-        when(activity.getSystemService(Context.USER_SERVICE))
-                .thenReturn(userManager);
-
-        when(mWifiSettings2.findPreference(WifiSettings2.PREF_KEY_DATA_USAGE))
-                .thenReturn(mDataUsagePreference);
-    }
-
-    @Test
-    @Config(shadows = {ShadowDataUsageUtils.class, ShadowFragment.class})
-    public void checkDataUsagePreference_perferenceInvisibleIfWifiNotSupported() {
-        setUpForOnCreate();
-        ShadowDataUsageUtils.IS_WIFI_SUPPORTED = false;
-
-        mWifiSettings2.onCreate(Bundle.EMPTY);
-
-        verify(mDataUsagePreference).setVisible(false);
-    }
-
-    @Test
-    @Config(shadows = {ShadowDataUsageUtils.class, ShadowFragment.class})
-    public void checkDataUsagePreference_perferenceVisibleIfWifiSupported() {
-        setUpForOnCreate();
-        ShadowDataUsageUtils.IS_WIFI_SUPPORTED = true;
-
-        mWifiSettings2.onCreate(Bundle.EMPTY);
-
-        verify(mDataUsagePreference).setVisible(true);
-        verify(mDataUsagePreference).setTemplate(any(), eq(0) /*subId*/, eq(null) /*service*/);
-    }
-
-    @Test
-    public void onCreateAdapter_hasStableIdsTrue() {
-        final PreferenceScreen preferenceScreen = mock(PreferenceScreen.class);
-        when(preferenceScreen.getContext()).thenReturn(mContext);
-
-        RecyclerView.Adapter adapter = mWifiSettings2.onCreateAdapter(preferenceScreen);
-
-        assertThat(adapter.hasStableIds()).isTrue();
-    }
-
-    @Test
-    public void onCreateContextMenu_shouldHaveForgetAndDisconnectMenuForConnectedWifiEntry() {
-        final FragmentActivity activity = mock(FragmentActivity.class);
-        when(activity.getApplicationContext()).thenReturn(mContext);
-        when(mWifiSettings2.getActivity()).thenReturn(activity);
-
-        final WifiEntry wifiEntry = mock(WifiEntry.class);
-        when(wifiEntry.canDisconnect()).thenReturn(true);
-        when(wifiEntry.canForget()).thenReturn(true);
-        when(wifiEntry.isSaved()).thenReturn(true);
-        when(wifiEntry.getConnectedState()).thenReturn(WifiEntry.CONNECTED_STATE_CONNECTED);
-
-        final LongPressWifiEntryPreference connectedWifiEntryPreference =
-                mWifiSettings2.createLongPressWifiEntryPreference(wifiEntry);
-        final View view = mock(View.class);
-        when(view.getTag()).thenReturn(connectedWifiEntryPreference);
-
-        final ContextMenu menu = mock(ContextMenu.class);
-        mWifiSettings2.onCreateContextMenu(menu, view, null /* info */);
-
-        verify(menu).add(anyInt(), eq(WifiSettings2.MENU_ID_FORGET), anyInt(), anyInt());
-        verify(menu).add(anyInt(), eq(WifiSettings2.MENU_ID_DISCONNECT), anyInt(), anyInt());
-    }
-
-    @Test
-    public void onWifiEntriesChanged_shouldChangeNextButtonState() {
-        mWifiSettings2.onWifiEntriesChanged();
-
-        verify(mWifiSettings2).changeNextButtonState(anyBoolean());
-    }
-
-    @Test
-    public void openSubscriptionHelpPage_shouldCallStartActivityForResult() {
-        doReturn(new Intent()).when(mWifiSettings2).getHelpIntent(mContext, FAKE_URI_STRING);
-        doNothing().when(mWifiSettings2).startActivityForResult(any(Intent.class), anyInt());
-        final WifiEntry mockWifiEntry = mock(WifiEntry.class);
-        when(mockWifiEntry.getHelpUriString()).thenReturn(FAKE_URI_STRING);
-
-        mWifiSettings2.openSubscriptionHelpPage(mockWifiEntry);
-
-        verify(mWifiSettings2, times(1)).startActivityForResult(any(), anyInt());
-    }
-
-    @Test
-    public void onNumSavedNetworksChanged_isFinishing_ShouldNotCrash() {
-        final FragmentActivity activity = mock(FragmentActivity.class);
-        when(activity.isFinishing()).thenReturn(true);
-        when(mWifiSettings2.getActivity()).thenReturn(activity);
-        when(mWifiSettings2.getContext()).thenReturn(null);
-
-        mWifiSettings2.onNumSavedNetworksChanged();
-    }
-
-    @Test
-    public void onNumSavedSubscriptionsChanged_isFinishing_ShouldNotCrash() {
-        final FragmentActivity activity = mock(FragmentActivity.class);
-        when(activity.isFinishing()).thenReturn(true);
-        when(mWifiSettings2.getActivity()).thenReturn(activity);
-        when(mWifiSettings2.getContext()).thenReturn(null);
-
-        mWifiSettings2.onNumSavedSubscriptionsChanged();
-    }
-
-    @Test
-    public void onSubmit_modeModifyNoConfig_toastErrorMessage() {
-        WifiDialog2 dialog = createWifiDialog2(MODE_MODIFY, null /* config */);
-
-        mWifiSettings2.onSubmit(dialog);
-
-        assertThat(ShadowToast.getTextOfLatestToast()).isEqualTo(
-                mContext.getString(R.string.wifi_failed_save_message));
-    }
-
-    @Test
-    public void onSubmit_modeModifyHasConfig_saveWifiManager() {
-        final WifiConfiguration config = mock(WifiConfiguration.class);
-        WifiDialog2 dialog = createWifiDialog2(MODE_MODIFY, config);
-
-        mWifiSettings2.onSubmit(dialog);
-
-        verify(mWifiManager).save(eq(config), any());
-    }
-
-    @Test
-    public void onSubmit_modeConnectNoConfig_connectWifiEntry() {
-        WifiDialog2 dialog = createWifiDialog2(MODE_CONNECT, null /* config */);
-        final WifiEntry wifiEntry = dialog.getWifiEntry();
-
-        mWifiSettings2.onAttach(mContext);
-        mWifiSettings2.onSubmit(dialog);
-
-        verify(mWifiSettings2).connect(wifiEntry, false /* editIfNoConfig */,
-                false /* fullScreenEdit*/);
-    }
-
-    @Test
-    public void onSubmit_modeConnectHasConfig_connectWifiManager() {
-        final WifiConfiguration config = mock(WifiConfiguration.class);
-        WifiDialog2 dialog = createWifiDialog2(MODE_CONNECT, config);
-
-        mWifiSettings2.onSubmit(dialog);
-
-        verify(mWifiManager).connect(eq(config), any(WifiManager.ActionListener.class));
-    }
-
-    private WifiDialog2 createWifiDialog2(int mode, WifiConfiguration config) {
-        final WifiEntry wifiEntry = mock(WifiEntry.class);
-        when(wifiEntry.canConnect()).thenReturn(true);
-        final WifiConfigController2 controller = mock(WifiConfigController2.class);
-        when(controller.getConfig()).thenReturn(config);
-        final WifiDialog2 wifiDialog2 =  spy(WifiDialog2.createModal(mContext, null /* listener */,
-                wifiEntry, mode));
-        when(wifiDialog2.getController()).thenReturn(controller);
-        return wifiDialog2;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java
index b955156..7eba586 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 The Android Open Source Project
+ * Copyright (C) 2019 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,17 +15,20 @@
  */
 package com.android.settings.wifi;
 
-import static android.net.wifi.WifiManager.WIFI_STATE_ENABLED;
+import static com.android.settings.wifi.WifiConfigUiBase2.MODE_CONNECT;
+import static com.android.settings.wifi.WifiConfigUiBase2.MODE_MODIFY;
 
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -33,91 +36,58 @@
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.PackageManager;
 import android.content.res.Resources;
-import android.net.ConnectivityManager;
-import android.net.Network;
-import android.net.NetworkCapabilities;
-import android.net.wifi.EAPConstants;
 import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
-import android.net.wifi.hotspot2.PasspointConfiguration;
-import android.net.wifi.hotspot2.pps.Credential;
-import android.net.wifi.hotspot2.pps.HomeSp;
 import android.os.Bundle;
 import android.os.PowerManager;
 import android.os.UserManager;
 import android.provider.Settings;
-import android.util.FeatureFlagUtils;
 import android.view.ContextMenu;
 import android.view.View;
 
 import androidx.fragment.app.FragmentActivity;
 import androidx.preference.Preference;
+import androidx.preference.PreferenceManager;
 import androidx.preference.PreferenceScreen;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.android.settings.R;
-import com.android.settings.SettingsActivity;
 import com.android.settings.datausage.DataUsagePreference;
-import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.shadow.ShadowDataUsageUtils;
 import com.android.settings.testutils.shadow.ShadowFragment;
-import com.android.settings.widget.SwitchBar;
-import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
-import com.android.settingslib.wifi.AccessPoint;
-import com.android.settingslib.wifi.WifiTracker;
-import com.android.settingslib.wifi.WifiTrackerFactory;
+import com.android.settingslib.wifi.LongPressWifiEntryPreference;
+import com.android.wifitrackerlib.WifiEntry;
+import com.android.wifitrackerlib.WifiPickerTracker;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import org.robolectric.shadows.ShadowToast;
 
 @RunWith(RobolectricTestRunner.class)
 public class WifiSettingsTest {
 
     private static final int NUM_NETWORKS = 4;
+    private static final String FAKE_URI_STRING = "fakeuri";
 
     @Mock
-    private WifiTracker mWifiTracker;
-    @Mock
     private PowerManager mPowerManager;
     @Mock
-    private DataUsagePreference mDataUsagePreference;
-    @Mock
-    private RecyclerView mRecyclerView;
-    @Mock
-    private RecyclerView.Adapter mRecyclerViewAdapter;
-    @Mock
-    private View mHeaderView;
-    @Mock
     private WifiManager mWifiManager;
     @Mock
-    private ConnectivityManager mConnectivityManager;
-    @Mock
-    private Intent mActivityIntent;
-    @Mock
-    private SwitchBar mSwitchBar;
-    @Mock
-    private WifiInfo mWifiInfo;
-    @Mock
-    private PackageManager mPackageManager;
+    private DataUsagePreference mDataUsagePreference;
     private Context mContext;
     private WifiSettings mWifiSettings;
-    private FakeFeatureFactory mFakeFeatureFactory;
-    private MetricsFeatureProvider mMetricsFeatureProvider;
+    @Mock
+    private WifiPickerTracker mMockWifiPickerTracker;
+    @Mock
+    private PreferenceManager mPreferenceManager;
 
     @Before
     public void setUp() {
@@ -126,75 +96,33 @@
 
         mWifiSettings = spy(new WifiSettings());
         doReturn(mContext).when(mWifiSettings).getContext();
-        doReturn(mRecyclerViewAdapter).when(mRecyclerView).getAdapter();
-        doReturn(mRecyclerView).when(mWifiSettings).getListView();
+        doReturn(mPreferenceManager).when(mWifiSettings).getPreferenceManager();
         doReturn(mPowerManager).when(mContext).getSystemService(PowerManager.class);
-        doReturn(mHeaderView).when(mWifiSettings).setPinnedHeaderView(anyInt());
-        doReturn(mWifiInfo).when(mWifiManager).getConnectionInfo();
-        doReturn(mWifiManager).when(mWifiTracker).getManager();
+        doReturn(mWifiManager).when(mContext).getSystemService(WifiManager.class);
+        doReturn(mContext).when(mPreferenceManager).getContext();
         mWifiSettings.mAddWifiNetworkPreference = new AddWifiNetworkPreference(mContext);
         mWifiSettings.mSavedNetworksPreference = new Preference(mContext);
         mWifiSettings.mConfigureWifiSettingsPreference = new Preference(mContext);
-        mWifiSettings.mWifiTracker = mWifiTracker;
+        mWifiSettings.mWifiPickerTracker = mMockWifiPickerTracker;
         mWifiSettings.mWifiManager = mWifiManager;
-        mWifiSettings.mConnectivityManager = mConnectivityManager;
-        mFakeFeatureFactory = FakeFeatureFactory.setupForTest();
-        mMetricsFeatureProvider = mFakeFeatureFactory.getMetricsFeatureProvider();
-        ReflectionHelpers.setField(mWifiSettings, "mMetricsFeatureProvider",
-                mMetricsFeatureProvider);
-        WifiTrackerFactory.setTestingWifiTracker(mWifiTracker);
     }
 
     @Test
     public void addNetworkFragmentSendResult_onActivityResult_shouldHandleEvent() {
-        final WifiSettings wifiSettings = spy(new WifiSettings());
+        final WifiSettings WifiSettings = spy(new WifiSettings());
         final Intent intent = new Intent();
-        doNothing().when(wifiSettings).handleAddNetworkRequest(anyInt(), any(Intent.class));
+        doNothing().when(WifiSettings).handleAddNetworkRequest(anyInt(), any(Intent.class));
 
-        wifiSettings.onActivityResult(WifiSettings.ADD_NETWORK_REQUEST, Activity.RESULT_OK, intent);
+        WifiSettings.onActivityResult(WifiSettings.ADD_NETWORK_REQUEST, Activity.RESULT_OK,
+                intent);
 
-        verify(wifiSettings).handleAddNetworkRequest(anyInt(), any(Intent.class));
-    }
-
-    private List<WifiConfiguration> createMockWifiConfigurations(int count) {
-        final List<WifiConfiguration> mockConfigs = new ArrayList<>();
-        for (int i = 0; i < count; i++) {
-            mockConfigs.add(new WifiConfiguration());
-        }
-        return mockConfigs;
-    }
-
-    private List<PasspointConfiguration> createMockPasspointConfigurations(int count) {
-        final List<PasspointConfiguration> mockConfigs = new ArrayList<>();
-        for (int i = 0; i < count; i++) {
-            final HomeSp sp = new HomeSp();
-            sp.setFqdn("fqdn");
-            final PasspointConfiguration config = new PasspointConfiguration();
-            config.setHomeSp(sp);
-            Credential.SimCredential simCredential = new Credential.SimCredential();
-            Credential credential = new Credential();
-            credential.setRealm("test.example.com");
-            simCredential.setImsi("12345*");
-            simCredential.setEapType(EAPConstants.EAP_SIM);
-            credential.setSimCredential(simCredential);
-            config.setCredential(credential);
-            mockConfigs.add(config);
-        }
-        return mockConfigs;
-    }
-
-    static NetworkCapabilities makeCaptivePortalNetworkCapabilities() {
-        final NetworkCapabilities capabilities = new NetworkCapabilities();
-        capabilities.clearAll();
-        capabilities.addTransportType(NetworkCapabilities.TRANSPORT_WIFI);
-        capabilities.addCapability(NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL);
-        return capabilities;
+        verify(WifiSettings).handleAddNetworkRequest(anyInt(), any(Intent.class));
     }
 
     @Test
     public void setAdditionalSettingsSummaries_hasSavedNetwork_preferenceVisible() {
-        when(mWifiManager.getConfiguredNetworks())
-                .thenReturn(createMockWifiConfigurations(NUM_NETWORKS));
+        when(mMockWifiPickerTracker.getNumSavedNetworks()).thenReturn(NUM_NETWORKS);
+        when(mMockWifiPickerTracker.getNumSavedSubscriptions()).thenReturn(0 /* count */);
 
         mWifiSettings.setAdditionalSettingsSummaries();
 
@@ -207,8 +135,8 @@
 
     @Test
     public void setAdditionalSettingsSummaries_hasSavedPasspointNetwork_preferenceVisible() {
-        when(mWifiManager.getPasspointConfigurations())
-                .thenReturn(createMockPasspointConfigurations(NUM_NETWORKS));
+        when(mMockWifiPickerTracker.getNumSavedNetworks()).thenReturn(0 /* count */);
+        when(mMockWifiPickerTracker.getNumSavedSubscriptions()).thenReturn(NUM_NETWORKS);
 
         mWifiSettings.setAdditionalSettingsSummaries();
 
@@ -221,10 +149,8 @@
 
     @Test
     public void setAdditionalSettingsSummaries_hasTwoKindsSavedNetwork_preferenceVisible() {
-        when(mWifiManager.getConfiguredNetworks())
-                .thenReturn(createMockWifiConfigurations(NUM_NETWORKS));
-        when(mWifiManager.getPasspointConfigurations())
-                .thenReturn(createMockPasspointConfigurations(NUM_NETWORKS));
+        when(mMockWifiPickerTracker.getNumSavedNetworks()).thenReturn(NUM_NETWORKS);
+        when(mMockWifiPickerTracker.getNumSavedSubscriptions()).thenReturn(NUM_NETWORKS);
 
         mWifiSettings.setAdditionalSettingsSummaries();
 
@@ -237,8 +163,8 @@
 
     @Test
     public void setAdditionalSettingsSummaries_noSavedNetwork_preferenceInvisible() {
-        when(mWifiManager.getConfiguredNetworks())
-                .thenReturn(createMockWifiConfigurations(0 /* count */));
+        when(mMockWifiPickerTracker.getNumSavedNetworks()).thenReturn(0 /* count */);
+        when(mMockWifiPickerTracker.getNumSavedSubscriptions()).thenReturn(0 /* count */);
 
         mWifiSettings.setAdditionalSettingsSummaries();
 
@@ -278,29 +204,21 @@
     }
 
     private void setUpForOnCreate() {
-        final SettingsActivity activity = mock(SettingsActivity.class);
-        when(activity.getSwitchBar()).thenReturn(mSwitchBar);
+        final FragmentActivity activity = mock(FragmentActivity.class);
         when(mWifiSettings.getActivity()).thenReturn(activity);
         final Resources.Theme theme = mContext.getTheme();
         when(activity.getTheme()).thenReturn(theme);
-        when(activity.getIntent()).thenReturn(mActivityIntent);
         UserManager userManager = mock(UserManager.class);
         when(activity.getSystemService(Context.USER_SERVICE))
                 .thenReturn(userManager);
+
         when(mWifiSettings.findPreference(WifiSettings.PREF_KEY_DATA_USAGE))
                 .thenReturn(mDataUsagePreference);
-        when(activity.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
-        when(activity.getSystemService(ConnectivityManager.class)).thenReturn(mConnectivityManager);
-        when(activity.getPackageManager()).thenReturn(mPackageManager);
     }
 
     @Test
     @Config(shadows = {ShadowDataUsageUtils.class, ShadowFragment.class})
     public void checkDataUsagePreference_perferenceInvisibleIfWifiNotSupported() {
-        if (FeatureFlagUtils.isEnabled(mContext, FeatureFlagUtils.SETTINGS_WIFITRACKER2)) {
-            return;
-        }
-
         setUpForOnCreate();
         ShadowDataUsageUtils.IS_WIFI_SUPPORTED = false;
 
@@ -312,10 +230,6 @@
     @Test
     @Config(shadows = {ShadowDataUsageUtils.class, ShadowFragment.class})
     public void checkDataUsagePreference_perferenceVisibleIfWifiSupported() {
-        if (FeatureFlagUtils.isEnabled(mContext, FeatureFlagUtils.SETTINGS_WIFITRACKER2)) {
-            return;
-        }
-
         setUpForOnCreate();
         ShadowDataUsageUtils.IS_WIFI_SUPPORTED = true;
 
@@ -326,28 +240,6 @@
     }
 
     @Test
-    public void onCreateContextMenu_shouldHaveForgetMenuForConnectedAccessPreference() {
-        final FragmentActivity mockActivity = mock(FragmentActivity.class);
-        when(mockActivity.getApplicationContext()).thenReturn(mContext);
-        when(mWifiSettings.getActivity()).thenReturn(mockActivity);
-
-        final AccessPoint accessPoint = mock(AccessPoint.class);
-        when(accessPoint.isConnectable()).thenReturn(false);
-        when(accessPoint.isSaved()).thenReturn(true);
-        when(accessPoint.isActive()).thenReturn(true);
-
-        final ConnectedAccessPointPreference connectedPreference =
-            mWifiSettings.createConnectedAccessPointPreference(accessPoint, mContext);
-        final View view = mock(View.class);
-        when(view.getTag()).thenReturn(connectedPreference);
-
-        final ContextMenu menu = mock(ContextMenu.class);
-        mWifiSettings.onCreateContextMenu(menu, view, null /* info */);
-
-        verify(menu).add(anyInt(), eq(WifiSettings.MENU_ID_FORGET), anyInt(), anyInt());
-    }
-
-    @Test
     public void onCreateAdapter_hasStableIdsTrue() {
         final PreferenceScreen preferenceScreen = mock(PreferenceScreen.class);
         when(preferenceScreen.getContext()).thenReturn(mContext);
@@ -358,60 +250,118 @@
     }
 
     @Test
-    @Config(shadows = {ShadowDataUsageUtils.class, ShadowFragment.class})
-    public void clickOnWifiNetworkWith_shouldStartCaptivePortalApp() {
-        if (FeatureFlagUtils.isEnabled(mContext, FeatureFlagUtils.SETTINGS_WIFITRACKER2)) {
-            return;
-        }
+    public void onCreateContextMenu_shouldHaveForgetAndDisconnectMenuForConnectedWifiEntry() {
+        final FragmentActivity activity = mock(FragmentActivity.class);
+        when(activity.getApplicationContext()).thenReturn(mContext);
+        when(mWifiSettings.getActivity()).thenReturn(activity);
 
-        when(mWifiManager.getConfiguredNetworks()).thenReturn(createMockWifiConfigurations(
-                NUM_NETWORKS));
-        when(mWifiTracker.isConnected()).thenReturn(true);
+        final WifiEntry wifiEntry = mock(WifiEntry.class);
+        when(wifiEntry.canDisconnect()).thenReturn(true);
+        when(wifiEntry.canForget()).thenReturn(true);
+        when(wifiEntry.isSaved()).thenReturn(true);
+        when(wifiEntry.getConnectedState()).thenReturn(WifiEntry.CONNECTED_STATE_CONNECTED);
 
-        final AccessPoint accessPointActive = mock(AccessPoint.class);
-        when(accessPointActive.isActive()).thenReturn(true);
-        when(accessPointActive.isSaved()).thenReturn(false);
-        when(accessPointActive.getConfig()).thenReturn(mock(WifiConfiguration.class));
+        final LongPressWifiEntryPreference connectedWifiEntryPreference =
+                mWifiSettings.createLongPressWifiEntryPreference(wifiEntry);
+        final View view = mock(View.class);
+        when(view.getTag()).thenReturn(connectedWifiEntryPreference);
 
-        final AccessPoint accessPointInactive = mock(AccessPoint.class);
-        when(accessPointInactive.isActive()).thenReturn(false);
-        when(accessPointInactive.isSaved()).thenReturn(false);
-        when(accessPointInactive.getConfig()).thenReturn(mock(WifiConfiguration.class));
+        final ContextMenu menu = mock(ContextMenu.class);
+        mWifiSettings.onCreateContextMenu(menu, view, null /* info */);
 
-        when(mWifiTracker.getAccessPoints()).thenReturn(Arrays.asList(accessPointActive,
-                accessPointInactive));
-        when(mWifiManager.getWifiState()).thenReturn(WIFI_STATE_ENABLED);
-        when(mWifiManager.isWifiEnabled()).thenReturn(true);
+        verify(menu).add(anyInt(), eq(WifiSettings.MENU_ID_FORGET), anyInt(), anyInt());
+        verify(menu).add(anyInt(), eq(WifiSettings.MENU_ID_DISCONNECT), anyInt(), anyInt());
+    }
 
-        final Network network = mock(Network.class);
-        when(mWifiManager.getCurrentNetwork()).thenReturn(network);
+    @Test
+    public void onWifiEntriesChanged_shouldChangeNextButtonState() {
+        mWifiSettings.onWifiEntriesChanged();
 
-        // Simulate activity creation cycle
-        setUpForOnCreate();
-        ShadowDataUsageUtils.IS_WIFI_SUPPORTED = true;
-        mWifiSettings.onCreate(Bundle.EMPTY);
-        mWifiSettings.onActivityCreated(null);
-        mWifiSettings.onViewCreated(new View(mContext), new Bundle());
-        mWifiSettings.onStart();
+        verify(mWifiSettings).changeNextButtonState(anyBoolean());
+    }
 
-        // Click on open network
-        final Preference openWifiPref = new LongPressAccessPointPreference(accessPointInactive,
-                mContext, null,
-                false /* forSavedNetworks */, R.drawable.ic_wifi_signal_0,
-                null);
-        mWifiSettings.onPreferenceTreeClick(openWifiPref);
+    @Test
+    public void openSubscriptionHelpPage_shouldCallStartActivityForResult() {
+        doReturn(new Intent()).when(mWifiSettings).getHelpIntent(mContext, FAKE_URI_STRING);
+        doNothing().when(mWifiSettings).startActivityForResult(any(Intent.class), anyInt());
+        final WifiEntry mockWifiEntry = mock(WifiEntry.class);
+        when(mockWifiEntry.getHelpUriString()).thenReturn(FAKE_URI_STRING);
 
-        // Ensure connect() was called, and fake success.
-        ArgumentCaptor<WifiManager.ActionListener> wifiCallbackCaptor = ArgumentCaptor.forClass(
-                WifiManager.ActionListener.class);
-        verify(mWifiManager).connect(any(WifiConfiguration.class), wifiCallbackCaptor.capture());
-        wifiCallbackCaptor.getValue().onSuccess();
+        mWifiSettings.openSubscriptionHelpPage(mockWifiEntry);
 
-        // Simulate capability change
-        mWifiSettings.mCaptivePortalNetworkCallback.onCapabilitiesChanged(network,
-                makeCaptivePortalNetworkCapabilities());
+        verify(mWifiSettings, times(1)).startActivityForResult(any(), anyInt());
+    }
 
-        // Ensure CP was called
-        verify(mConnectivityManager).startCaptivePortalApp(eq(network));
+    @Test
+    public void onNumSavedNetworksChanged_isFinishing_ShouldNotCrash() {
+        final FragmentActivity activity = mock(FragmentActivity.class);
+        when(activity.isFinishing()).thenReturn(true);
+        when(mWifiSettings.getActivity()).thenReturn(activity);
+        when(mWifiSettings.getContext()).thenReturn(null);
+
+        mWifiSettings.onNumSavedNetworksChanged();
+    }
+
+    @Test
+    public void onNumSavedSubscriptionsChanged_isFinishing_ShouldNotCrash() {
+        final FragmentActivity activity = mock(FragmentActivity.class);
+        when(activity.isFinishing()).thenReturn(true);
+        when(mWifiSettings.getActivity()).thenReturn(activity);
+        when(mWifiSettings.getContext()).thenReturn(null);
+
+        mWifiSettings.onNumSavedSubscriptionsChanged();
+    }
+
+    @Test
+    public void onSubmit_modeModifyNoConfig_toastErrorMessage() {
+        WifiDialog2 dialog = createWifiDialog2(MODE_MODIFY, null /* config */);
+
+        mWifiSettings.onSubmit(dialog);
+
+        assertThat(ShadowToast.getTextOfLatestToast()).isEqualTo(
+                mContext.getString(R.string.wifi_failed_save_message));
+    }
+
+    @Test
+    public void onSubmit_modeModifyHasConfig_saveWifiManager() {
+        final WifiConfiguration config = mock(WifiConfiguration.class);
+        WifiDialog2 dialog = createWifiDialog2(MODE_MODIFY, config);
+
+        mWifiSettings.onSubmit(dialog);
+
+        verify(mWifiManager).save(eq(config), any());
+    }
+
+    @Test
+    public void onSubmit_modeConnectNoConfig_connectWifiEntry() {
+        WifiDialog2 dialog = createWifiDialog2(MODE_CONNECT, null /* config */);
+        final WifiEntry wifiEntry = dialog.getWifiEntry();
+
+        mWifiSettings.onAttach(mContext);
+        mWifiSettings.onSubmit(dialog);
+
+        verify(mWifiSettings).connect(wifiEntry, false /* editIfNoConfig */,
+                false /* fullScreenEdit*/);
+    }
+
+    @Test
+    public void onSubmit_modeConnectHasConfig_connectWifiManager() {
+        final WifiConfiguration config = mock(WifiConfiguration.class);
+        WifiDialog2 dialog = createWifiDialog2(MODE_CONNECT, config);
+
+        mWifiSettings.onSubmit(dialog);
+
+        verify(mWifiManager).connect(eq(config), any(WifiManager.ActionListener.class));
+    }
+
+    private WifiDialog2 createWifiDialog2(int mode, WifiConfiguration config) {
+        final WifiEntry wifiEntry = mock(WifiEntry.class);
+        when(wifiEntry.canConnect()).thenReturn(true);
+        final WifiConfigController2 controller = mock(WifiConfigController2.class);
+        when(controller.getConfig()).thenReturn(config);
+        final WifiDialog2 wifiDialog2 =  spy(WifiDialog2.createModal(mContext, null /* listener */,
+                wifiEntry, mode));
+        when(wifiDialog2.getController()).thenReturn(controller);
+        return wifiDialog2;
     }
 }
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiUtilsTest.java b/tests/robotests/src/com/android/settings/wifi/WifiUtilsTest.java
index 9de095d..630b319 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiUtilsTest.java
@@ -18,20 +18,17 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import android.net.wifi.WifiConfiguration;
+
+import com.android.wifitrackerlib.WifiEntry;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 
-import static org.mockito.Mockito.spy;
-
-import android.content.Context;
-import android.net.wifi.WifiConfiguration;
-import android.os.Bundle;
-
-import com.android.settingslib.wifi.AccessPoint;
-
-import org.robolectric.RuntimeEnvironment;
-
 @RunWith(RobolectricTestRunner.class)
 public class WifiUtilsTest {
 
@@ -48,29 +45,29 @@
     public void testPassword() {
         final String longPassword = "123456789012345678901234567890"
                 + "1234567890123456789012345678901234567890";
-        assertThat(WifiUtils.isHotspotPasswordValid("123")).isFalse();
-        assertThat(WifiUtils.isHotspotPasswordValid("12345678")).isTrue();
-        assertThat(WifiUtils.isHotspotPasswordValid("1234567890")).isTrue();
-        assertThat(WifiUtils.isHotspotPasswordValid(longPassword)).isFalse();
-        assertThat(WifiUtils.isHotspotPasswordValid("")).isFalse();
+        assertThat(WifiUtils.isHotspotWpa2PasswordValid("123")).isFalse();
+        assertThat(WifiUtils.isHotspotWpa2PasswordValid("12345678")).isTrue();
+        assertThat(WifiUtils.isHotspotWpa2PasswordValid("1234567890")).isTrue();
+        assertThat(WifiUtils.isHotspotWpa2PasswordValid(longPassword)).isFalse();
+        assertThat(WifiUtils.isHotspotWpa2PasswordValid("")).isFalse();
+        assertThat(WifiUtils.isHotspotWpa2PasswordValid("€¥£")).isFalse();
     }
 
     @Test
-    public void getWifiConfigByAccessPoint_shouldReturnCorrectConfig() {
-        String testSSID = "WifiUtilsTest";
-        Bundle bundle = new Bundle();
-        bundle.putString("key_ssid", testSSID);
-        Context context = spy(RuntimeEnvironment.application);
-        AccessPoint accessPoint = new AccessPoint(context, bundle);
+    public void getWifiConfigByWifiEntry_shouldReturnCorrectConfig() {
+        final String testSSID = "WifiUtilsTest";
+        final WifiEntry wifiEntry = mock(WifiEntry.class);
+        when(wifiEntry.getSsid()).thenReturn(testSSID);
 
-        WifiConfiguration config = WifiUtils.getWifiConfig(accessPoint, null, null);
+        final WifiConfiguration config = WifiUtils.getWifiConfig(wifiEntry, null /* scanResult */);
 
         assertThat(config).isNotNull();
-        assertThat(config.SSID).isEqualTo(AccessPoint.convertToQuotedString(testSSID));
+        assertThat(config.SSID).isEqualTo("\"" + testSSID + "\"");
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void getWifiConfigWithNullInput_ThrowIllegalArgumentException() {
-        WifiConfiguration config = WifiUtils.getWifiConfig(null, null, null);
+        WifiConfiguration config = WifiUtils.getWifiConfig(null /* wifiEntry */,
+                null /* scanResult */);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/robotests/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragmentTest.java
index 3f02e2e..70c7810 100644
--- a/tests/robotests/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragmentTest.java
@@ -18,9 +18,12 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -35,6 +38,7 @@
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
+import androidx.fragment.app.FragmentActivity;
 
 import com.android.settings.R;
 import com.android.wifitrackerlib.WifiEntry;
@@ -43,8 +47,10 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.shadows.androidx.fragment.FragmentController;
 
@@ -74,26 +80,33 @@
     private ArrayList<Integer> mFakedResultArrayList = new ArrayList<>();
 
     @Mock
-    private WifiEntry mMockWifiEntry;
+    private WifiEntry mWifiEntry;
 
     @Mock
-    private WifiPickerTracker mMockWifiPickerTracker;
+    private WifiPickerTracker mWifiPickerTracker;
 
     @Mock
-    private WifiManager mMockWifiManager;
+    private WifiManager mWifiManager;
+
+    private FragmentActivity mActivity;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mAddAppNetworksFragment = spy(new AddAppNetworksFragment());
+        mActivity = spy(Robolectric.setupActivity(FragmentActivity.class));
+        doReturn(mActivity).when(mAddAppNetworksFragment).getActivity();
+        when(mWifiManager.isWifiEnabled()).thenReturn(true);
+        when(mActivity.getSystemService(WifiManager.class)).thenReturn(mWifiManager);
+
         mNewWpaSuggestionEntry = generateRegularWifiSuggestion(FAKE_NEW_WPA_SSID,
                 WifiConfiguration.KeyMgmt.WPA_PSK, "1234567890");
         mNewOpenSuggestionEntry = generateRegularWifiSuggestion(FAKE_NEW_OPEN_SSID,
                 WifiConfiguration.KeyMgmt.NONE, null);
         mSavedWpaConfigurationEntry = generateRegularWifiConfiguration(FAKE_NEW_SAVED_WPA_SSID,
                 WifiConfiguration.KeyMgmt.WPA_PSK, "\"1234567890\"");
-        when(mMockWifiManager.isWifiEnabled()).thenReturn(true);
-        mAddAppNetworksFragment.mWifiPickerTracker = mMockWifiPickerTracker;
+
+        mAddAppNetworksFragment.mWifiPickerTracker = mWifiPickerTracker;
         setUpOneScannedNetworkWithScanedLevel4();
     }
 
@@ -213,7 +226,7 @@
     @Test
     public void withOneSuggestion_whenScanResultChanged_uiListShouldHaveNewLevel() {
         // Arrange
-        when(mMockWifiPickerTracker.getWifiState()).thenReturn(WifiManager.WIFI_STATE_ENABLED);
+        when(mWifiPickerTracker.getWifiState()).thenReturn(WifiManager.WIFI_STATE_ENABLED);
         // Setup a fake saved network list and assign to fragment.
         addOneSavedNetworkConfiguration(mSavedWpaConfigurationEntry);
         // Setup one specified networks and its results and assign to fragment.
@@ -233,7 +246,7 @@
     @Test
     public void withOneSuggestion_whenScanResultChangedButWifiOff_uiListShouldHaveZeroLevel() {
         // Arrange
-        when(mMockWifiPickerTracker.getWifiState()).thenReturn(WifiManager.WIFI_STATE_DISABLED);
+        when(mWifiPickerTracker.getWifiState()).thenReturn(WifiManager.WIFI_STATE_DISABLED);
         // Setup a fake saved network list and assign to fragment.
         addOneSavedNetworkConfiguration(mSavedWpaConfigurationEntry);
         // Setup one specified networks and its results and assign to fragment.
@@ -252,6 +265,9 @@
 
     @Test
     public void onDestroy_quitWorkerThread() {
+        addOneSpecifiedRegularNetworkSuggestion(mNewWpaSuggestionEntry);
+        setUpBundle(mFakedSpecifiedNetworksList);
+        setupFragment();
         mAddAppNetworksFragment.mWorkerThread = mock(HandlerThread.class);
 
         try {
@@ -263,12 +279,182 @@
         verify(mAddAppNetworksFragment.mWorkerThread).quit();
     }
 
+    @Test
+    public void status_withOneNetworkSave_shouldShowOneNetworkSaving() {
+        addOneSpecifiedRegularNetworkSuggestion(mNewWpaSuggestionEntry);
+        setUpBundle(mFakedSpecifiedNetworksList);
+        setupFragment();
+
+        mAddAppNetworksFragment.showSaveStatusByState(
+                AddAppNetworksFragment.MESSAGE_START_SAVING_NETWORK);
+
+        final TextView textView = (TextView) mAddAppNetworksFragment.mLayoutView.findViewById(
+                R.id.single_status);
+        assertThat(textView.getText()).isEqualTo(mAddAppNetworksFragment.getString(
+                R.string.wifi_add_app_single_network_saving_summary));
+    }
+
+    @Test
+    public void status_withTwoNetworksSave_shouldShowMultipleNetworksSaving() {
+        addOneSpecifiedRegularNetworkSuggestion(mNewWpaSuggestionEntry);
+        addOneSpecifiedRegularNetworkSuggestion(mNewOpenSuggestionEntry);
+        setUpBundle(mFakedSpecifiedNetworksList);
+        setupFragment();
+
+        mAddAppNetworksFragment.showSaveStatusByState(
+                AddAppNetworksFragment.MESSAGE_START_SAVING_NETWORK);
+
+        final TextView textView = (TextView) mAddAppNetworksFragment.mLayoutView.findViewById(
+                R.id.app_summary);
+        assertThat(textView.getText()).isEqualTo(
+                mAddAppNetworksFragment.getString(R.string.wifi_add_app_networks_saving_summary,
+                        2));
+    }
+
+    @Test
+    public void status_withOneNetworkSaved_shouldShowOneNetworkSaved() {
+        addOneSpecifiedRegularNetworkSuggestion(mNewWpaSuggestionEntry);
+        setUpBundle(mFakedSpecifiedNetworksList);
+        setupFragment();
+
+        mAddAppNetworksFragment.showSaveStatusByState(
+                AddAppNetworksFragment.MESSAGE_SHOW_SAVED_AND_CONNECT_NETWORK);
+
+        final TextView textView = (TextView) mAddAppNetworksFragment.mLayoutView.findViewById(
+                R.id.single_status);
+        assertThat(textView.getText()).isEqualTo(mAddAppNetworksFragment.getString(
+                R.string.wifi_add_app_single_network_saved_summary));
+    }
+
+    @Test
+    public void status_withTwoNetworksSaved_shouldShowMultipleNetworksSaved() {
+        addOneSpecifiedRegularNetworkSuggestion(mNewWpaSuggestionEntry);
+        addOneSpecifiedRegularNetworkSuggestion(mNewOpenSuggestionEntry);
+        setUpBundle(mFakedSpecifiedNetworksList);
+        setupFragment();
+
+        mAddAppNetworksFragment.showSaveStatusByState(
+                AddAppNetworksFragment.MESSAGE_SHOW_SAVED_AND_CONNECT_NETWORK);
+
+        final TextView textView = (TextView) mAddAppNetworksFragment.mLayoutView.findViewById(
+                R.id.app_summary);
+        assertThat(textView.getText()).isEqualTo(
+                mAddAppNetworksFragment.getString(R.string.wifi_add_app_networks_saved_summary));
+    }
+
+    @Test
+    public void status_withOneNetworkSaveFailed_shouldShowOneNetworkFailed() {
+        addOneSpecifiedRegularNetworkSuggestion(mNewWpaSuggestionEntry);
+        setUpBundle(mFakedSpecifiedNetworksList);
+        setupFragment();
+
+        mAddAppNetworksFragment.showSaveStatusByState(
+                AddAppNetworksFragment.MESSAGE_SHOW_SAVE_FAILED);
+
+        final TextView textView = (TextView) mAddAppNetworksFragment.mLayoutView.findViewById(
+                R.id.single_status);
+        assertThat(textView.getText()).isEqualTo(mAddAppNetworksFragment.getString(
+                R.string.wifi_add_app_network_save_failed_summary));
+    }
+
+    @Test
+    public void status_withTwoNetworksSaveFailed_shouldShowMultipleNetworksFailed() {
+        addOneSpecifiedRegularNetworkSuggestion(mNewWpaSuggestionEntry);
+        addOneSpecifiedRegularNetworkSuggestion(mNewOpenSuggestionEntry);
+        setUpBundle(mFakedSpecifiedNetworksList);
+        setupFragment();
+
+        mAddAppNetworksFragment.showSaveStatusByState(
+                AddAppNetworksFragment.MESSAGE_SHOW_SAVE_FAILED);
+
+        final TextView textView = (TextView) mAddAppNetworksFragment.mLayoutView.findViewById(
+                R.id.app_summary);
+        assertThat(textView.getText()).isEqualTo(mAddAppNetworksFragment.getString(
+                R.string.wifi_add_app_network_save_failed_summary));
+    }
+
+    @Test
+    public void saveOneNetwork_shouldCallWifiManagerSaveOnce() {
+        addOneSpecifiedRegularNetworkSuggestion(mNewWpaSuggestionEntry);
+        setUpBundle(mFakedSpecifiedNetworksList);
+        setupFragment();
+
+        mAddAppNetworksFragment.saveNetwork(0 /* index */);
+
+        verify(mWifiManager, times(1)).save(any(), any());
+    }
+
+    @Test
+    public void onSuccess_saveTwoNetworks_shouldCallWifiNamagerSaveTwice() {
+        addOneSpecifiedRegularNetworkSuggestion(mNewWpaSuggestionEntry);
+        addOneSpecifiedRegularNetworkSuggestion(mNewOpenSuggestionEntry);
+        setUpBundle(mFakedSpecifiedNetworksList);
+        setupFragment();
+        mAddAppNetworksFragment.saveNetwork(0 /* index */);
+
+        final ArgumentCaptor<WifiManager.ActionListener> wifiCallbackCaptor =
+                ArgumentCaptor.forClass(WifiManager.ActionListener.class);
+        verify(mWifiManager).save(any(WifiConfiguration.class), wifiCallbackCaptor.capture());
+        wifiCallbackCaptor.getValue().onSuccess();
+
+        verify(mWifiManager, times(2)).save(any(), any());
+    }
+
+    @Test
+    public void onFailedFirstOne_saveTwoNetworks_shouldAlsoCallWifiNamagerSaveTwice() {
+        addOneSpecifiedRegularNetworkSuggestion(mNewWpaSuggestionEntry);
+        addOneSpecifiedRegularNetworkSuggestion(mNewOpenSuggestionEntry);
+        setUpBundle(mFakedSpecifiedNetworksList);
+        setupFragment();
+        mAddAppNetworksFragment.saveNetwork(0 /* index */);
+
+        final ArgumentCaptor<WifiManager.ActionListener> wifiCallbackCaptor =
+                ArgumentCaptor.forClass(WifiManager.ActionListener.class);
+        verify(mWifiManager).save(any(WifiConfiguration.class), wifiCallbackCaptor.capture());
+        wifiCallbackCaptor.getValue().onFailure(anyInt());
+
+        verify(mWifiManager, times(2)).save(any(), any());
+    }
+
+    @Test
+    public void saveSuccess_shouldEnterShowAndConnectState() {
+        addOneSpecifiedRegularNetworkSuggestion(mNewWpaSuggestionEntry);
+        setUpBundle(mFakedSpecifiedNetworksList);
+        setupFragment();
+        mAddAppNetworksFragment.saveNetwork(0 /* index */);
+
+        final ArgumentCaptor<WifiManager.ActionListener> wifiCallbackCaptor =
+                ArgumentCaptor.forClass(WifiManager.ActionListener.class);
+        verify(mWifiManager).save(any(WifiConfiguration.class), wifiCallbackCaptor.capture());
+        wifiCallbackCaptor.getValue().onSuccess();
+
+        assertThat(mAddAppNetworksFragment.mHandler.hasMessages(
+                AddAppNetworksFragment.MESSAGE_SHOW_SAVED_AND_CONNECT_NETWORK)).isTrue();
+    }
+
+    @Test
+    public void saveFailed_shouldEnterFailedState() {
+        addOneSpecifiedRegularNetworkSuggestion(mNewWpaSuggestionEntry);
+        setUpBundle(mFakedSpecifiedNetworksList);
+        setupFragment();
+        mAddAppNetworksFragment.saveNetwork(0 /* index */);
+
+        final ArgumentCaptor<WifiManager.ActionListener> wifiCallbackCaptor =
+                ArgumentCaptor.forClass(
+                        WifiManager.ActionListener.class);
+        verify(mWifiManager).save(any(WifiConfiguration.class), wifiCallbackCaptor.capture());
+        wifiCallbackCaptor.getValue().onFailure(1 /* reason */);
+
+        assertThat(mAddAppNetworksFragment.mHandler.hasMessages(
+                AddAppNetworksFragment.MESSAGE_SHOW_SAVE_FAILED)).isTrue();
+    }
+
     private void setUpOneScannedNetworkWithScanedLevel4() {
         final ArrayList list = new ArrayList<>();
-        list.add(mMockWifiEntry);
-        when(mMockWifiPickerTracker.getWifiEntries()).thenReturn(list);
-        when(mMockWifiEntry.getSsid()).thenReturn(FAKE_NEW_OPEN_SSID);
-        when(mMockWifiEntry.getLevel()).thenReturn(SCANED_LEVEL4);
+        list.add(mWifiEntry);
+        when(mWifiPickerTracker.getWifiEntries()).thenReturn(list);
+        when(mWifiEntry.getSsid()).thenReturn(FAKE_NEW_OPEN_SSID);
+        when(mWifiEntry.getLevel()).thenReturn(SCANED_LEVEL4);
     }
 
     private void addOneSavedNetworkConfiguration(@NonNull WifiConfiguration wifiConfiguration) {
diff --git a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java
index 0b9ef55..03a63b0 100644
--- a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java
@@ -21,6 +21,7 @@
 import static android.app.slice.SliceItem.FORMAT_TEXT;
 
 import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME;
+
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.anyInt;
@@ -152,7 +153,7 @@
         mQueryImsState.setIsEnabledByUser(false);
         mQueryImsState.setIsTtyOnVolteEnabled(false);
         when(mMockCarrierConfigManager.getConfigForSubId(1)).thenReturn(null);
-        mWfcSliceHelper.setActivationAppIntent(new Intent()); // dummy Intent
+        mWfcSliceHelper.setActivationAppIntent(new Intent()); // unused Intent
 
         final Slice slice  = mWfcSliceHelper.createWifiCallingSlice(
                 CustomSliceRegistry.WIFI_CALLING_URI);
diff --git a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
deleted file mode 100644
index 11d5ece..0000000
--- a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
+++ /dev/null
@@ -1,1992 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.wifi.details;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Mockito.atLeastOnce;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.res.Resources;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.ColorDrawable;
-import android.graphics.drawable.Drawable;
-import android.net.CaptivePortalData;
-import android.net.ConnectivityManager;
-import android.net.ConnectivityManager.NetworkCallback;
-import android.net.IpPrefix;
-import android.net.LinkAddress;
-import android.net.LinkProperties;
-import android.net.MacAddress;
-import android.net.Network;
-import android.net.NetworkCapabilities;
-import android.net.NetworkInfo;
-import android.net.NetworkRequest;
-import android.net.RouteInfo;
-import android.net.Uri;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
-import android.os.Handler;
-import android.provider.Settings;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.ImageView;
-
-import androidx.fragment.app.FragmentActivity;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.R;
-import com.android.settings.Utils;
-import com.android.settings.testutils.shadow.ShadowDevicePolicyManager;
-import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
-import com.android.settings.widget.EntityHeaderController;
-import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-import com.android.settingslib.utils.StringUtil;
-import com.android.settingslib.widget.ActionButtonsPreference;
-import com.android.settingslib.widget.LayoutPreference;
-import com.android.settingslib.wifi.AccessPoint;
-import com.android.settingslib.wifi.WifiTracker;
-import com.android.settingslib.wifi.WifiTrackerFactory;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
-import org.mockito.InOrder;
-import org.mockito.Matchers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowToast;
-
-import java.net.Inet4Address;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
-import java.time.format.FormatStyle;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.stream.Collectors;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(shadows = {ShadowDevicePolicyManager.class, ShadowEntityHeaderController.class})
-public class WifiDetailPreferenceControllerTest {
-
-    private static final int LEVEL = 1;
-    private static final int RSSI = -55;
-    private static final int TX_LINK_SPEED = 123;
-    private static final int RX_LINK_SPEED = 54;
-    private static final String SSID = "ssid";
-    private static final String MAC_ADDRESS = "01:23:45:67:89:ab";
-    private static final String RANDOMIZED_MAC_ADDRESS = "RANDOMIZED_MAC_ADDRESS";
-    private static final String FACTORY_MAC_ADDRESS = "FACTORY_MAC_ADDRESS";
-    private static final String SECURITY = "None";
-    private static final String FQDN = "fqdn";
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private PreferenceScreen mockScreen;
-
-    @Mock
-    private AccessPoint mockAccessPoint;
-    @Mock
-    private FragmentActivity mockActivity;
-    @Mock
-    private ConnectivityManager mockConnectivityManager;
-    @Mock
-    private Network mockNetwork;
-    @Mock
-    private NetworkInfo mockNetworkInfo;
-    @Mock
-    private WifiConfiguration mockWifiConfig;
-    @Mock
-    private WifiInfo mockWifiInfo;
-    @Mock
-    private WifiNetworkDetailsFragment mockFragment;
-    @Mock
-    private WifiManager mockWifiManager;
-    @Mock
-    private WifiTracker mockWifiTracker;
-    @Mock
-    private MetricsFeatureProvider mockMetricsFeatureProvider;
-    @Mock
-    private WifiDetailPreferenceController.IconInjector mockIconInjector;
-    @Mock
-    private WifiDetailPreferenceController.Clock mMockClock;
-    @Mock
-    private MacAddress mockMacAddress;
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private EntityHeaderController mockHeaderController;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private LayoutPreference mockHeaderLayoutPreference;
-    @Mock
-    private ImageView mockHeaderIcon;
-
-    @Mock
-    private ActionButtonsPreference mockButtonsPref;
-    @Mock
-    private Preference mockSignalStrengthPref;
-    @Mock
-    private Preference mockTxLinkSpeedPref;
-    @Mock
-    private Preference mockRxLinkSpeedPref;
-    @Mock
-    private Preference mockFrequencyPref;
-    @Mock
-    private Preference mockSecurityPref;
-    @Mock
-    private Preference mockSsidPref;
-    @Mock
-    private Preference mockMacAddressPref;
-    @Mock
-    private Preference mockIpAddressPref;
-    @Mock
-    private Preference mockGatewayPref;
-    @Mock
-    private Preference mockSubnetPref;
-    @Mock
-    private Preference mockDnsPref;
-    @Mock
-    private PreferenceCategory mockIpv6Category;
-    @Mock
-    private Preference mockIpv6AddressesPref;
-    @Mock
-    private PackageManager mockPackageManager;
-
-    @Captor
-    private ArgumentCaptor<NetworkCallback> mCallbackCaptor;
-    @Captor
-    private ArgumentCaptor<View.OnClickListener> mForgetClickListener;
-
-    private Context mContext;
-    private Lifecycle mLifecycle;
-    private LifecycleOwner mLifecycleOwner;
-    private LinkProperties mLinkProperties;
-    private WifiDetailPreferenceController mController;
-
-    // This class exists so that these values can be made static final. They can't be static final
-    // members of the test class, because any attempt to call IpPrefix or RouteInfo constructors
-    // during static initialization of the test class results in NoSuchMethorError being thrown
-    // when the test is run.
-    private static class Constants {
-        static final int IPV4_PREFIXLEN = 25;
-        static final LinkAddress IPV4_ADDR;
-        static final Inet4Address IPV4_GATEWAY;
-        static final RouteInfo IPV4_DEFAULT;
-        static final RouteInfo IPV4_SUBNET;
-        static final LinkAddress IPV6_LINKLOCAL;
-        static final LinkAddress IPV6_GLOBAL1;
-        static final LinkAddress IPV6_GLOBAL2;
-        static final InetAddress IPV4_DNS1;
-        static final InetAddress IPV4_DNS2;
-        static final InetAddress IPV6_DNS;
-
-        private static LinkAddress ipv6LinkAddress(String addr) throws UnknownHostException {
-            return new LinkAddress(InetAddress.getByName(addr), 64);
-        }
-
-        private static LinkAddress ipv4LinkAddress(String addr, int prefixlen)
-                throws UnknownHostException {
-            return new LinkAddress(InetAddress.getByName(addr), prefixlen);
-        }
-
-        static {
-            try {
-                // We create our test constants in these roundabout ways because the robolectric
-                // shadows don't contain NetworkUtils.parseNumericAddress and other utility methods,
-                // so the easy ways to do things fail with NoSuchMethodError.
-                IPV4_ADDR = ipv4LinkAddress("192.0.2.2", IPV4_PREFIXLEN);
-                IPV4_GATEWAY = (Inet4Address) InetAddress.getByName("192.0.2.127");
-
-                final Inet4Address any4 = (Inet4Address) InetAddress.getByName("0.0.0.0");
-                IpPrefix subnet = new IpPrefix(IPV4_ADDR.getAddress(), IPV4_PREFIXLEN);
-                IPV4_SUBNET = new RouteInfo(subnet, any4);
-                IPV4_DEFAULT = new RouteInfo(new IpPrefix(any4, 0), IPV4_GATEWAY);
-
-                IPV6_LINKLOCAL = ipv6LinkAddress("fe80::211:25ff:fef8:7cb2%1");
-                IPV6_GLOBAL1 = ipv6LinkAddress("2001:db8:1::211:25ff:fef8:7cb2");
-                IPV6_GLOBAL2 = ipv6LinkAddress("2001:db8:1::3dfe:8902:f98f:739d");
-
-                IPV4_DNS1 = InetAddress.getByName("8.8.8.8");
-                IPV4_DNS2 = InetAddress.getByName("8.8.4.4");
-                IPV6_DNS = InetAddress.getByName("2001:4860:4860::64");
-            } catch (UnknownHostException e) {
-                throw new RuntimeException("Invalid hardcoded IP addresss: " + e);
-            }
-        }
-    }
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mContext = spy(RuntimeEnvironment.application);
-        mLifecycleOwner = () -> mLifecycle;
-        mLifecycle = new Lifecycle(mLifecycleOwner);
-
-        when(mContext.getPackageManager()).thenReturn(mockPackageManager);
-        when(mockAccessPoint.getConfig()).thenReturn(mockWifiConfig);
-        when(mockAccessPoint.getLevel()).thenReturn(LEVEL);
-        when(mockAccessPoint.getSecurityString(false)).thenReturn(SECURITY);
-        when(mockAccessPoint.getSsidStr()).thenReturn(SSID);
-        when(mockConnectivityManager.getNetworkInfo(any(Network.class)))
-                .thenReturn(mockNetworkInfo);
-        doNothing().when(mockConnectivityManager).registerNetworkCallback(
-                nullable(NetworkRequest.class), mCallbackCaptor.capture(), nullable(Handler.class));
-        mockButtonsPref = createMock();
-        when(mockButtonsPref.setButton1OnClickListener(mForgetClickListener.capture()))
-                .thenReturn(mockButtonsPref);
-
-        when(mockWifiInfo.getTxLinkSpeedMbps()).thenReturn(TX_LINK_SPEED);
-        when(mockWifiInfo.getRxLinkSpeedMbps()).thenReturn(RX_LINK_SPEED);
-        when(mockWifiInfo.getRssi()).thenReturn(RSSI);
-        when(mockWifiInfo.getMacAddress()).thenReturn(MAC_ADDRESS);
-        when(mockWifiManager.getConnectionInfo()).thenReturn(mockWifiInfo);
-
-        when(mockWifiManager.getCurrentNetwork()).thenReturn(mockNetwork);
-        mLinkProperties = new LinkProperties();
-        when(mockConnectivityManager.getLinkProperties(mockNetwork)).thenReturn(mLinkProperties);
-
-        when(mockFragment.getActivity()).thenReturn(mockActivity);
-
-        ShadowEntityHeaderController.setUseMock(mockHeaderController);
-        // builder pattern
-        when(mockHeaderController.setRecyclerView(mockFragment.getListView(), mLifecycle))
-                .thenReturn(mockHeaderController);
-        when(mockHeaderController.setSummary(nullable(String.class)))
-                .thenReturn(mockHeaderController);
-        when(mockHeaderController.setSecondSummary(nullable(String.class)))
-                .thenReturn(mockHeaderController);
-        when(mockIconInjector.getIcon(anyInt())).thenReturn(new ColorDrawable());
-
-        setupMockedPreferenceScreen();
-    }
-
-    private void setUpForConnectedNetwork() {
-        when(mockAccessPoint.isActive()).thenReturn(true);
-        ArrayList list = new ArrayList<>();
-        list.add(mockAccessPoint);
-        when(mockWifiTracker.getAccessPoints()).thenReturn(list);
-        WifiTrackerFactory.setTestingWifiTracker(mockWifiTracker);
-        when(mockAccessPoint.matches(any(AccessPoint.class))).thenReturn(true);
-        when(mockAccessPoint.isReachable()).thenReturn(true);
-
-        mController = newWifiDetailPreferenceController();
-    }
-
-    private void setUpForDisconnectedNetwork() {
-        when(mockAccessPoint.isActive()).thenReturn(false);
-        ArrayList list = new ArrayList<>();
-        list.add(mockAccessPoint);
-        when(mockWifiTracker.getAccessPoints()).thenReturn(list);
-        WifiTrackerFactory.setTestingWifiTracker(mockWifiTracker);
-        when(mockAccessPoint.matches(any(AccessPoint.class))).thenReturn(true);
-        when(mockAccessPoint.isReachable()).thenReturn(true);
-
-        mController = newWifiDetailPreferenceController();
-    }
-
-    private void setUpForNotInRangeNetwork() {
-        when(mockAccessPoint.isActive()).thenReturn(false);
-        ArrayList list = new ArrayList<>();
-        list.add(mockAccessPoint);
-        when(mockWifiTracker.getAccessPoints()).thenReturn(list);
-        WifiTrackerFactory.setTestingWifiTracker(mockWifiTracker);
-        when(mockAccessPoint.matches(any(AccessPoint.class))).thenReturn(false);
-        when(mockAccessPoint.isReachable()).thenReturn(false);
-
-        mController = newWifiDetailPreferenceController();
-    }
-
-    private WifiDetailPreferenceController newWifiDetailPreferenceController() {
-        return new WifiDetailPreferenceController(
-                mockAccessPoint,
-                mockConnectivityManager,
-                mContext,
-                mockFragment,
-                null,  // Handler
-                mLifecycle,
-                mockWifiManager,
-                mockMetricsFeatureProvider,
-                mockIconInjector,
-                mMockClock);
-    }
-
-    private void setupMockedPreferenceScreen() {
-        when(mockScreen.getPreferenceManager().getContext()).thenReturn(mContext);
-
-        when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_HEADER))
-                .thenReturn(mockHeaderLayoutPreference);
-        when(mockHeaderLayoutPreference.findViewById(R.id.entity_header_icon))
-                .thenReturn(mockHeaderIcon);
-
-        when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_BUTTONS_PREF))
-                .thenReturn(mockButtonsPref);
-        when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_SIGNAL_STRENGTH_PREF))
-                .thenReturn(mockSignalStrengthPref);
-        when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_TX_LINK_SPEED))
-                .thenReturn(mockTxLinkSpeedPref);
-        when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_RX_LINK_SPEED))
-                .thenReturn(mockRxLinkSpeedPref);
-        when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_FREQUENCY_PREF))
-                .thenReturn(mockFrequencyPref);
-        when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_SECURITY_PREF))
-                .thenReturn(mockSecurityPref);
-        when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_SSID_PREF))
-                .thenReturn(mockSsidPref);
-        when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_MAC_ADDRESS_PREF))
-                .thenReturn(mockMacAddressPref);
-        when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_IP_ADDRESS_PREF))
-                .thenReturn(mockIpAddressPref);
-        when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_GATEWAY_PREF))
-                .thenReturn(mockGatewayPref);
-        when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_SUBNET_MASK_PREF))
-                .thenReturn(mockSubnetPref);
-        when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_DNS_PREF))
-                .thenReturn(mockDnsPref);
-        when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_IPV6_CATEGORY))
-                .thenReturn(mockIpv6Category);
-        when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_IPV6_ADDRESSES_PREF))
-                .thenReturn(mockIpv6AddressesPref);
-    }
-
-    private void displayAndResume() {
-        mController.displayPreference(mockScreen);
-        mController.onResume();
-    }
-
-    @Test
-    public void isAvailable_shouldAlwaysReturnTrue() {
-        setUpForConnectedNetwork();
-        mController.displayPreference(mockScreen);
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void securityPreference_stringShouldBeSet() {
-        setUpForConnectedNetwork();
-        displayAndResume();
-
-        verify(mockSecurityPref).setSummary(SECURITY);
-    }
-
-    @Test
-    public void latestWifiInfo_shouldBeFetchedInDisplayPreferenceForConnectedNetwork() {
-        setUpForConnectedNetwork();
-
-        displayAndResume();
-
-        verify(mockWifiManager, times(1)).getConnectionInfo();
-    }
-
-    @Test
-    public void latestWifiInfo_shouldNotBeFetchedInDisplayPreferenceForDisconnectedNetwork() {
-        setUpForDisconnectedNetwork();
-
-        displayAndResume();
-
-        verify(mockWifiManager, never()).getConnectionInfo();
-    }
-
-    @Test
-    public void latestWifiInfo_shouldNotBeFetchedInDisplayPreferenceForNotInRangeNetwork() {
-        setUpForNotInRangeNetwork();
-
-        displayAndResume();
-
-        verify(mockWifiManager, never()).getConnectionInfo();
-    }
-
-    @Test
-    public void latestNetworkInfo_shouldBeFetchedInDisplayPreferenceForConnectedNetwork() {
-        setUpForConnectedNetwork();
-
-        displayAndResume();
-
-        verify(mockConnectivityManager, times(1)).getNetworkInfo(any(Network.class));
-    }
-
-    @Test
-    public void latestNetworkInfo_shouldNotBeFetchedInDisplayPreferenceForDisconnectedNetwork() {
-        setUpForDisconnectedNetwork();
-
-        displayAndResume();
-
-        verify(mockConnectivityManager, never()).getNetworkInfo(any(Network.class));
-    }
-
-    @Test
-    public void latestNetworkInfo_shouldNotBeFetchedInDisplayPreferenceForNotInRangeNetwork() {
-        setUpForNotInRangeNetwork();
-
-        displayAndResume();
-
-        verify(mockConnectivityManager, never()).getNetworkInfo(any(Network.class));
-    }
-
-    @Test
-    public void networkCallback_shouldBeRegisteredOnResume() {
-        setUpForConnectedNetwork();
-        displayAndResume();
-
-        verify(mockConnectivityManager, times(1)).registerNetworkCallback(
-                nullable(NetworkRequest.class), mCallbackCaptor.capture(), nullable(Handler.class));
-    }
-
-    @Test
-    public void networkCallback_shouldBeUnregisteredOnPause() {
-        setUpForConnectedNetwork();
-        displayAndResume();
-        mController.onPause();
-
-        verify(mockConnectivityManager, times(1))
-                .unregisterNetworkCallback(mCallbackCaptor.getValue());
-    }
-
-    @Test
-    public void entityHeader_shouldHaveIconSetForConnectedNetwork() {
-        setUpForConnectedNetwork();
-        Drawable expectedIcon = mockIconInjector.getIcon(LEVEL);
-
-        displayAndResume();
-
-        verify(mockHeaderController).setIcon(expectedIcon);
-    }
-
-    @Test
-    public void entityHeader_shouldHaveIconSetForDisconnectedNetwork() {
-        setUpForDisconnectedNetwork();
-        Drawable expectedIcon = mockIconInjector.getIcon(LEVEL);
-
-        displayAndResume();
-
-        verify(mockHeaderController).setIcon(expectedIcon);
-    }
-
-    @Test
-    public void entityHeader_shouldNotHaveIconSetForNotInRangeNetwork() {
-        setUpForNotInRangeNetwork();
-
-        displayAndResume();
-
-        verify(mockHeaderController, never()).setIcon(any(Drawable.class));
-    }
-
-    @Test
-    public void entityHeader_shouldHaveLabelSetToTitle() {
-        setUpForConnectedNetwork();
-        String label = "title";
-        when(mockAccessPoint.getTitle()).thenReturn(label);
-
-        displayAndResume();
-
-        verify(mockHeaderController).setLabel(label);
-    }
-
-    @Test
-    public void entityHeader_shouldHaveSummarySet() {
-        setUpForConnectedNetwork();
-        String summary = "summary";
-        when(mockAccessPoint.getSettingsSummary(true /*convertSavedAsDisconnected*/))
-                .thenReturn(summary);
-
-        displayAndResume();
-
-        verify(mockHeaderController).setSummary(summary);
-    }
-
-    private void doShouldShowRemainingTimeTest(ZonedDateTime now, long timeRemainingMs) {
-        when(mMockClock.now()).thenReturn(now);
-        setUpForConnectedNetwork();
-        displayAndResume();
-
-        final CaptivePortalData data = new CaptivePortalData.Builder()
-                .setExpiryTime(now.toInstant().getEpochSecond() * 1000 + timeRemainingMs)
-                .build();
-        final LinkProperties lp = new LinkProperties();
-        lp.setCaptivePortalData(data);
-
-        updateLinkProperties(lp);
-    }
-
-    @Test
-    public void entityHeader_shouldShowShortRemainingTime() {
-        // Expires in 1h, 2min, 15sec
-        final long timeRemainingMs = (3600 + 2 * 60 + 15) * 1000;
-        final ZonedDateTime fakeNow = ZonedDateTime.of(2020, 1, 2, 3, 4, 5, 6,
-                ZoneId.of("Europe/London"));
-        doShouldShowRemainingTimeTest(fakeNow, timeRemainingMs);
-        final String expectedSummary = mContext.getString(R.string.wifi_time_remaining,
-                StringUtil.formatElapsedTime(mContext, timeRemainingMs, false /* withSeconds */));
-        final InOrder inOrder = inOrder(mockHeaderController);
-        inOrder.verify(mockHeaderController).setSecondSummary(expectedSummary);
-
-        updateLinkProperties(new LinkProperties());
-        inOrder.verify(mockHeaderController).setSecondSummary((String) null);
-    }
-
-    @Test
-    public void entityHeader_shouldShowExpiryDate() {
-        // Expires in 49h, 2min, 15sec
-        final long timeRemainingMs = (49 * 3600 + 2 * 60 + 15) * 1000;
-        final ZonedDateTime fakeNow = ZonedDateTime.of(2020, 1, 2, 3, 4, 5, 6,
-                ZoneId.of("Europe/London"));
-        doShouldShowRemainingTimeTest(fakeNow, timeRemainingMs);
-        final String expectedSummary = mContext.getString(
-                R.string.wifi_expiry_time,
-                DateTimeFormatter.ofLocalizedDateTime(FormatStyle.SHORT).format(
-                        fakeNow.plusNanos(timeRemainingMs * 1_000_000)));
-        final InOrder inOrder = inOrder(mockHeaderController);
-        inOrder.verify(mockHeaderController).setSecondSummary(expectedSummary);
-
-        updateLinkProperties(new LinkProperties());
-        inOrder.verify(mockHeaderController).setSecondSummary((String) null);
-    }
-
-    @Test
-    public void entityHeader_shouldConvertSavedAsDisconnected() {
-        setUpForDisconnectedNetwork();
-
-        displayAndResume();
-
-        verify(mockAccessPoint, times(1)).getSettingsSummary(true /*convertSavedAsDisconnected*/);
-    }
-
-    @Test
-    public void signalStrengthPref_shouldHaveIconSetForConnectedNetwork() {
-        setUpForConnectedNetwork();
-
-        displayAndResume();
-
-        verify(mockSignalStrengthPref).setIcon(any(Drawable.class));
-    }
-
-    @Test
-    public void signalStrengthPref_shouldHaveIconSetForDisconnectedNetwork() {
-        setUpForDisconnectedNetwork();
-
-        displayAndResume();
-
-        verify(mockSignalStrengthPref).setIcon(any(Drawable.class));
-    }
-
-    @Test
-    public void signalStrengthPref_shouldNotHaveIconSetForOutOfRangeNetwork() {
-        setUpForNotInRangeNetwork();
-
-        displayAndResume();
-
-        verify(mockSignalStrengthPref, never()).setIcon(any(Drawable.class));
-    }
-
-    @Test
-    public void signalStrengthPref_shouldHaveDetailTextSetForConnectedNetwork() {
-        setUpForConnectedNetwork();
-        String expectedStrength =
-                mContext.getResources().getStringArray(R.array.wifi_signal)[LEVEL];
-
-        displayAndResume();
-
-        verify(mockSignalStrengthPref).setSummary(expectedStrength);
-    }
-
-    @Test
-    public void signalStrengthPref_shouldHaveDetailTextSetForDisconnectedNetwork() {
-        setUpForDisconnectedNetwork();
-        String expectedStrength =
-                mContext.getResources().getStringArray(R.array.wifi_signal)[LEVEL];
-
-        displayAndResume();
-
-        verify(mockSignalStrengthPref).setSummary(expectedStrength);
-    }
-
-    @Test
-    public void signalStrengthPref_shouldNotHaveDetailTextSetForNotInRangeNetwork() {
-        setUpForNotInRangeNetwork();
-
-        displayAndResume();
-
-        verify(mockSignalStrengthPref, never()).setSummary(any(String.class));
-    }
-
-    @Test
-    public void linkSpeedPref_shouldNotShowIfNotSet() {
-        setUpForConnectedNetwork();
-        when(mockWifiInfo.getTxLinkSpeedMbps()).thenReturn(WifiInfo.LINK_SPEED_UNKNOWN);
-
-        displayAndResume();
-
-        verify(mockTxLinkSpeedPref).setVisible(false);
-    }
-
-    @Test
-    public void linkSpeedPref_shouldVisibleForConnectedNetwork() {
-        setUpForConnectedNetwork();
-        String expectedLinkSpeed = mContext.getString(R.string.tx_link_speed, TX_LINK_SPEED);
-
-        displayAndResume();
-
-        verify(mockTxLinkSpeedPref).setVisible(true);
-        verify(mockTxLinkSpeedPref).setSummary(expectedLinkSpeed);
-    }
-
-    @Test
-    public void linkSpeedPref_shouldInvisibleForDisconnectedNetwork() {
-        setUpForDisconnectedNetwork();
-
-        displayAndResume();
-
-        verify(mockTxLinkSpeedPref).setVisible(false);
-        verify(mockTxLinkSpeedPref, never()).setSummary(any(String.class));
-    }
-
-    @Test
-    public void linkSpeedPref_shouldInvisibleForNotInRangeNetwork() {
-        setUpForNotInRangeNetwork();
-
-        displayAndResume();
-
-        verify(mockTxLinkSpeedPref).setVisible(false);
-        verify(mockTxLinkSpeedPref, never()).setSummary(any(String.class));
-    }
-
-    @Test
-    public void rxLinkSpeedPref_shouldNotShowIfNotSet() {
-        setUpForConnectedNetwork();
-        when(mockWifiInfo.getRxLinkSpeedMbps()).thenReturn(WifiInfo.LINK_SPEED_UNKNOWN);
-
-        displayAndResume();
-
-        verify(mockRxLinkSpeedPref).setVisible(false);
-    }
-
-    @Test
-    public void rxLinkSpeedPref_shouldVisibleForConnectedNetwork() {
-        setUpForConnectedNetwork();
-        String expectedLinkSpeed = mContext.getString(R.string.rx_link_speed, RX_LINK_SPEED);
-
-        displayAndResume();
-
-        verify(mockRxLinkSpeedPref).setVisible(true);
-        verify(mockRxLinkSpeedPref).setSummary(expectedLinkSpeed);
-    }
-
-    @Test
-    public void rxLinkSpeedPref_shouldInvisibleForDisconnectedNetwork() {
-        setUpForDisconnectedNetwork();
-
-        displayAndResume();
-
-        verify(mockRxLinkSpeedPref).setVisible(false);
-        verify(mockRxLinkSpeedPref, never()).setSummary(any(String.class));
-    }
-
-    @Test
-    public void rxLinkSpeedPref_shouldInvisibleForNotInRangeNetwork() {
-        setUpForNotInRangeNetwork();
-
-        displayAndResume();
-
-        verify(mockRxLinkSpeedPref).setVisible(false);
-        verify(mockRxLinkSpeedPref, never()).setSummary(any(String.class));
-    }
-
-    @Test
-    public void ssidPref_shouldHaveDetailTextSetForPasspointR1() {
-        setUpForConnectedNetwork();
-        when(mockAccessPoint.isPasspoint()).thenReturn(true);
-        when(mockAccessPoint.isOsuProvider()).thenReturn(false);
-
-        displayAndResume();
-
-        verify(mockSsidPref, times(1)).setSummary(SSID);
-        verify(mockSsidPref, times(1)).setVisible(true);
-    }
-
-    @Test
-    public void ssidPref_shouldHaveDetailTextSetForPasspointR2() {
-        setUpForConnectedNetwork();
-        when(mockAccessPoint.isPasspoint()).thenReturn(false);
-        when(mockAccessPoint.isOsuProvider()).thenReturn(true);
-
-        displayAndResume();
-
-        verify(mockSsidPref, times(1)).setSummary(SSID);
-        verify(mockSsidPref, times(1)).setVisible(true);
-    }
-
-    @Test
-    public void ssidPref_shouldNotShowIfNotPasspoint() {
-        setUpForConnectedNetwork();
-        when(mockAccessPoint.isPasspoint()).thenReturn(false);
-        when(mockAccessPoint.isOsuProvider()).thenReturn(false);
-
-        displayAndResume();
-
-        verify(mockSsidPref).setVisible(false);
-    }
-
-    @Test
-    public void macAddressPref_shouldVisibleForConnectedNetwork() {
-        setUpForConnectedNetwork();
-
-        displayAndResume();
-
-        verify(mockMacAddressPref).setVisible(true);
-        verify(mockMacAddressPref).setSummary(MAC_ADDRESS);
-    }
-
-    @Test
-    public void macAddressPref_shouldVisibleAsRandomizedForDisconnectedNetwork() {
-        setUpForDisconnectedNetwork();
-        mockWifiConfig.macRandomizationSetting = WifiConfiguration.RANDOMIZATION_PERSISTENT;
-        when(mockWifiConfig.getRandomizedMacAddress()).thenReturn(mockMacAddress);
-        when(mockMacAddress.toString()).thenReturn(RANDOMIZED_MAC_ADDRESS);
-
-        displayAndResume();
-
-        verify(mockMacAddressPref).setVisible(true);
-        verify(mockMacAddressPref).setSummary(RANDOMIZED_MAC_ADDRESS);
-    }
-
-    @Test
-    public void macAddressPref_shouldVisibleAsFactoryForDisconnectedNetwork() {
-        setUpForDisconnectedNetwork();
-        mockWifiConfig.macRandomizationSetting = WifiConfiguration.RANDOMIZATION_NONE;
-        when(mockWifiManager.getFactoryMacAddresses())
-                .thenReturn(new String[]{FACTORY_MAC_ADDRESS});
-
-        displayAndResume();
-
-        verify(mockMacAddressPref).setVisible(true);
-        verify(mockMacAddressPref).setSummary(FACTORY_MAC_ADDRESS);
-    }
-
-    @Test
-    public void ipAddressPref_shouldHaveDetailTextSetForConnectedNetwork() {
-        setUpForConnectedNetwork();
-        mLinkProperties.addLinkAddress(Constants.IPV4_ADDR);
-
-        displayAndResume();
-
-        verify(mockIpAddressPref).setSummary(Constants.IPV4_ADDR.getAddress().getHostAddress());
-        verify(mockIpAddressPref).setVisible(true);
-    }
-
-    @Test
-    public void ipAddressPref_shouldInvisibleForDisconnectedNetwork() {
-        setUpForDisconnectedNetwork();
-
-        displayAndResume();
-
-        verify(mockIpAddressPref).setVisible(false);
-    }
-
-    @Test
-    public void gatewayAndSubnet_shouldHaveDetailTextSetForConnectedNetwork() {
-        setUpForConnectedNetwork();
-        mLinkProperties.addLinkAddress(Constants.IPV4_ADDR);
-        mLinkProperties.addRoute(Constants.IPV4_DEFAULT);
-        mLinkProperties.addRoute(Constants.IPV4_SUBNET);
-
-        displayAndResume();
-
-        verify(mockSubnetPref).setSummary("255.255.255.128");
-        verify(mockGatewayPref).setSummary("192.0.2.127");
-        verify(mockSubnetPref).setVisible(true);
-    }
-
-    @Test
-    public void gatewayAndSubnet_shouldInvisibleSetForDisconnectedNetwork() {
-        setUpForDisconnectedNetwork();
-
-        displayAndResume();
-
-        verify(mockSubnetPref).setVisible(false);
-    }
-
-    @Test
-    public void dnsServersPref_shouldHaveDetailTextSetForConnectedNetwork()
-            throws UnknownHostException {
-        setUpForConnectedNetwork();
-        mLinkProperties.addDnsServer(InetAddress.getByAddress(new byte[] {8, 8, 4, 4}));
-        mLinkProperties.addDnsServer(InetAddress.getByAddress(new byte[] {8, 8, 8, 8}));
-        mLinkProperties.addDnsServer(Constants.IPV6_DNS);
-
-        displayAndResume();
-
-        verify(mockDnsPref).setSummary(
-                "8.8.4.4\n" +
-                        "8.8.8.8\n" +
-                        Constants.IPV6_DNS.getHostAddress());
-        verify(mockDnsPref).setVisible(true);
-    }
-
-    @Test
-    public void dnsServersPref_shouldInvisibleSetForDisconnectedNetwork()
-            throws UnknownHostException {
-        setUpForDisconnectedNetwork();
-
-        displayAndResume();
-
-        verify(mockDnsPref).setVisible(false);
-    }
-
-    @Test
-    public void noCurrentNetwork_shouldNotFinishActivityForConnectedNetwork() {
-        setUpForConnectedNetwork();
-        when(mockWifiManager.getCurrentNetwork()).thenReturn(null);
-
-        displayAndResume();
-
-        verify(mockActivity, never()).finish();
-    }
-
-    @Test
-    public void noLinkProperties_allIpDetailsHidden() {
-        setUpForConnectedNetwork();
-        when(mockConnectivityManager.getLinkProperties(mockNetwork)).thenReturn(null);
-        reset(mockIpv6Category, mockIpAddressPref, mockSubnetPref, mockGatewayPref, mockDnsPref);
-
-        displayAndResume();
-
-        verify(mockIpv6Category).setVisible(false);
-        verify(mockIpAddressPref).setVisible(false);
-        verify(mockSubnetPref).setVisible(false);
-        verify(mockGatewayPref).setVisible(false);
-        verify(mockDnsPref).setVisible(false);
-        verify(mockIpv6Category, never()).setVisible(true);
-        verify(mockIpAddressPref, never()).setVisible(true);
-        verify(mockSubnetPref, never()).setVisible(true);
-        verify(mockGatewayPref, never()).setVisible(true);
-        verify(mockDnsPref, never()).setVisible(true);
-    }
-
-    @Test
-    public void disconnectedNetwork_allIpDetailsHidden() {
-        setUpForDisconnectedNetwork();
-        reset(mockIpv6Category, mockIpAddressPref, mockSubnetPref, mockGatewayPref, mockDnsPref);
-
-        displayAndResume();
-
-        verify(mockIpv6Category).setVisible(false);
-        verify(mockIpAddressPref).setVisible(false);
-        verify(mockSubnetPref).setVisible(false);
-        verify(mockGatewayPref).setVisible(false);
-        verify(mockDnsPref).setVisible(false);
-        verify(mockIpv6Category, never()).setVisible(true);
-        verify(mockIpAddressPref, never()).setVisible(true);
-        verify(mockSubnetPref, never()).setVisible(true);
-        verify(mockGatewayPref, never()).setVisible(true);
-        verify(mockDnsPref, never()).setVisible(true);
-    }
-
-    // Convenience method to convert a LinkAddress to a string without a prefix length.
-    private String asString(LinkAddress l) {
-        return l.getAddress().getHostAddress();
-    }
-
-    // Pretend that the NetworkCallback was triggered with a new copy of lp. We need to create a
-    // new copy because the code only updates if !mLinkProperties.equals(lp).
-    private void updateLinkProperties(LinkProperties lp) {
-        mCallbackCaptor.getValue().onLinkPropertiesChanged(mockNetwork, new LinkProperties(lp));
-    }
-
-    private void updateNetworkCapabilities(NetworkCapabilities nc) {
-        mCallbackCaptor.getValue().onCapabilitiesChanged(mockNetwork, new NetworkCapabilities(nc));
-    }
-
-    private NetworkCapabilities makeNetworkCapabilities() {
-        NetworkCapabilities nc = new NetworkCapabilities();
-        nc.clearAll();
-        nc.addTransportType(NetworkCapabilities.TRANSPORT_WIFI);
-        return nc;
-    }
-
-    private void verifyDisplayedIpv6Addresses(InOrder inOrder, LinkAddress... addresses) {
-        String text = Arrays.stream(addresses)
-                .map(address -> asString(address))
-                .collect(Collectors.joining("\n"));
-        inOrder.verify(mockIpv6AddressesPref).setSummary(text);
-    }
-
-    @Test
-    public void onLinkPropertiesChanged_updatesFields() {
-        setUpForConnectedNetwork();
-        displayAndResume();
-
-        InOrder inOrder = inOrder(mockIpAddressPref, mockGatewayPref, mockSubnetPref,
-                mockDnsPref, mockIpv6Category, mockIpv6AddressesPref);
-
-        LinkProperties lp = new LinkProperties();
-
-        lp.addLinkAddress(Constants.IPV6_LINKLOCAL);
-        updateLinkProperties(lp);
-        verifyDisplayedIpv6Addresses(inOrder, Constants.IPV6_LINKLOCAL);
-        inOrder.verify(mockIpv6Category).setVisible(true);
-
-        lp.addRoute(Constants.IPV4_DEFAULT);
-        updateLinkProperties(lp);
-        inOrder.verify(mockGatewayPref).setSummary(Constants.IPV4_GATEWAY.getHostAddress());
-        inOrder.verify(mockGatewayPref).setVisible(true);
-
-        lp.addLinkAddress(Constants.IPV4_ADDR);
-        lp.addRoute(Constants.IPV4_SUBNET);
-        updateLinkProperties(lp);
-        inOrder.verify(mockIpAddressPref).setSummary(asString(Constants.IPV4_ADDR));
-        inOrder.verify(mockIpAddressPref).setVisible(true);
-        inOrder.verify(mockSubnetPref).setSummary("255.255.255.128");
-        inOrder.verify(mockSubnetPref).setVisible(true);
-
-        lp.addLinkAddress(Constants.IPV6_GLOBAL1);
-        lp.addLinkAddress(Constants.IPV6_GLOBAL2);
-        updateLinkProperties(lp);
-        verifyDisplayedIpv6Addresses(inOrder,
-                Constants.IPV6_LINKLOCAL,
-                Constants.IPV6_GLOBAL1,
-                Constants.IPV6_GLOBAL2);
-
-        lp.removeLinkAddress(Constants.IPV6_GLOBAL1);
-        updateLinkProperties(lp);
-        verifyDisplayedIpv6Addresses(inOrder,
-                Constants.IPV6_LINKLOCAL,
-                Constants.IPV6_GLOBAL2);
-
-        lp.addDnsServer(Constants.IPV6_DNS);
-        updateLinkProperties(lp);
-        inOrder.verify(mockDnsPref).setSummary(Constants.IPV6_DNS.getHostAddress());
-        inOrder.verify(mockDnsPref).setVisible(true);
-
-        lp.addDnsServer(Constants.IPV4_DNS1);
-        lp.addDnsServer(Constants.IPV4_DNS2);
-        updateLinkProperties(lp);
-        inOrder.verify(mockDnsPref).setSummary(
-                Constants.IPV6_DNS.getHostAddress() + "\n" +
-                        Constants.IPV4_DNS1.getHostAddress() + "\n" +
-                        Constants.IPV4_DNS2.getHostAddress());
-        inOrder.verify(mockDnsPref).setVisible(true);
-    }
-
-    @Test
-    public void onCapabilitiesChanged_callsRefreshIfNecessary() {
-        setUpForConnectedNetwork();
-        NetworkCapabilities nc = makeNetworkCapabilities();
-        when(mockConnectivityManager.getNetworkCapabilities(mockNetwork))
-                .thenReturn(new NetworkCapabilities(nc));
-
-        String summary = "Connected, no Internet";
-        when(mockAccessPoint.getSettingsSummary(true /*convertSavedAsDisconnected*/))
-                .thenReturn(summary);
-
-        InOrder inOrder = inOrder(mockHeaderController);
-        displayAndResume();
-        inOrder.verify(mockHeaderController).setSummary(summary);
-
-        // Check that an irrelevant capability update does not update the access point summary, as
-        // doing so could cause unnecessary jank...
-        summary = "Connected";
-        when(mockAccessPoint.getSettingsSummary(true /*convertSavedAsDisconnected*/))
-                .thenReturn(summary);
-        updateNetworkCapabilities(nc);
-        inOrder.verify(mockHeaderController, never()).setSummary(any(CharSequence.class));
-
-        // ... but that if the network validates, then we do refresh.
-        nc.addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED);
-        updateNetworkCapabilities(nc);
-        inOrder.verify(mockHeaderController).setSummary(summary);
-
-        summary = "Connected, no Internet";
-        when(mockAccessPoint.getSettingsSummary(true /*convertSavedAsDisconnected*/))
-                .thenReturn(summary);
-
-        // Another irrelevant update won't cause the UI to refresh...
-        updateNetworkCapabilities(nc);
-        inOrder.verify(mockHeaderController, never()).setSummary(any(CharSequence.class));
-
-        // ... but if the network is no longer validated, then we display "connected, no Internet".
-        nc.removeCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED);
-        updateNetworkCapabilities(nc);
-        inOrder.verify(mockHeaderController).setSummary(summary);
-
-        // UI will be refreshed when private DNS is broken.
-        summary = "Private DNS server cannot be accessed";
-        when(mockAccessPoint.getSettingsSummary(true /* convertSavedAsDisconnected */))
-                .thenReturn(summary);
-        nc.setPrivateDnsBroken(true);
-        updateNetworkCapabilities(nc);
-        inOrder.verify(mockHeaderController).setSummary(summary);
-
-        // UI will be refreshed when device connects to a partial connectivity network.
-        summary = "Limited connection";
-        when(mockAccessPoint.getSettingsSummary(true /*convertSavedAsDisconnected*/))
-                .thenReturn(summary);
-        nc.addCapability(NetworkCapabilities.NET_CAPABILITY_PARTIAL_CONNECTIVITY);
-        updateNetworkCapabilities(nc);
-        inOrder.verify(mockHeaderController).setSummary(summary);
-
-        // Although UI will be refreshed when network become validated. The Settings should
-        // continue to display "Limited connection" if network still provides partial connectivity.
-        nc.addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED);
-        updateNetworkCapabilities(nc);
-        inOrder.verify(mockHeaderController).setSummary(summary);
-    }
-
-    @Test
-    public void canForgetNetwork_shouldInvisibleIfWithoutConfiguration() {
-        setUpForConnectedNetwork();
-        when(mockAccessPoint.getConfig()).thenReturn(null);
-        mController = newWifiDetailPreferenceController();
-
-        displayAndResume();
-
-        verify(mockButtonsPref).setButton1Visible(false);
-    }
-
-    @Test
-    public void canForgetNetwork_ephemeral() {
-        setUpForConnectedNetwork();
-        when(mockWifiInfo.isEphemeral()).thenReturn(true);
-        when(mockAccessPoint.getConfig()).thenReturn(null);
-
-        displayAndResume();
-
-        verify(mockButtonsPref).setButton1Visible(true);
-    }
-
-    @Test
-    public void canForgetNetwork_saved() {
-        setUpForConnectedNetwork();
-        displayAndResume();
-
-        verify(mockButtonsPref).setButton1Visible(true);
-    }
-
-    @Test
-    public void canForgetNetwork_lockedDown() {
-        setUpForConnectedNetwork();
-        lockDownNetwork();
-
-        displayAndResume();
-
-        verify(mockButtonsPref).setButton1Visible(false);
-    }
-
-    @Test
-    public void canShareNetwork_shouldInvisibleIfWithoutConfiguration() {
-        setUpForConnectedNetwork();
-        when(mockAccessPoint.getConfig()).thenReturn(null);
-
-        displayAndResume();
-
-        verify(mockButtonsPref).setButton4Visible(false);
-    }
-
-    @Test
-    public void canModifyNetwork_saved() {
-        setUpForConnectedNetwork();
-        assertThat(mController.canModifyNetwork()).isTrue();
-    }
-
-    @Test
-    public void canModifyNetwork_lockedDown() {
-        setUpForConnectedNetwork();
-        lockDownNetwork();
-
-        assertThat(mController.canModifyNetwork()).isFalse();
-    }
-
-    /**
-     * Pretends that current network is locked down by device owner.
-     */
-    private void lockDownNetwork() {
-        final int doUserId = 123;
-        final int doUid = 1234;
-        String doPackage = "some.package";
-
-        mockWifiConfig.creatorUid = doUid;
-        ComponentName doComponent = new ComponentName(doPackage, "some.Class");
-        try {
-            when(mockPackageManager.getPackageUidAsUser(Matchers.anyString(), Matchers.anyInt()))
-                    .thenReturn(doUid);
-        } catch (PackageManager.NameNotFoundException e) {
-            //do nothing
-        }
-        ShadowDevicePolicyManager.getShadow().setDeviceOwnerComponentOnAnyUser(doComponent);
-        ShadowDevicePolicyManager.getShadow().setDeviceOwnerUserId(doUserId);
-
-        Settings.Global.putInt(mContext.getContentResolver(),
-                Settings.Global.WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN, 1);
-    }
-
-    @Test
-    public void forgetNetwork_ephemeral() {
-        setUpForConnectedNetwork();
-        String ssid = "ssid";
-        when(mockWifiInfo.isEphemeral()).thenReturn(true);
-        when(mockWifiInfo.getSSID()).thenReturn(ssid);
-
-        displayAndResume();
-        mForgetClickListener.getValue().onClick(null);
-
-        verify(mockWifiManager).disableEphemeralNetwork(ssid);
-        verify(mockMetricsFeatureProvider)
-                .action(mockActivity, MetricsProto.MetricsEvent.ACTION_WIFI_FORGET);
-    }
-
-    @Test
-    public void forgetNetwork_saved() {
-        setUpForConnectedNetwork();
-        mockWifiConfig.networkId = 5;
-
-        mController.displayPreference(mockScreen);
-        mForgetClickListener.getValue().onClick(null);
-
-        verify(mockWifiManager).forget(mockWifiConfig.networkId, null);
-        verify(mockMetricsFeatureProvider)
-                .action(mockActivity, MetricsProto.MetricsEvent.ACTION_WIFI_FORGET);
-    }
-
-    @Test
-    public void forgetNetwork_shouldShowDialog() {
-        setUpForConnectedNetwork();
-        final WifiDetailPreferenceController spyController = spy(mController);
-
-        mockWifiConfig.networkId = 5;
-        when(mockAccessPoint.isPasspoint()).thenReturn(true);
-        when(mockAccessPoint.getPasspointFqdn()).thenReturn(FQDN);
-        spyController.displayPreference(mockScreen);
-
-        mForgetClickListener.getValue().onClick(null);
-
-        verify(mockWifiManager, times(0)).removePasspointConfiguration(FQDN);
-        verify(mockMetricsFeatureProvider, times(0))
-                .action(mockActivity, MetricsProto.MetricsEvent.ACTION_WIFI_FORGET);
-        verify(spyController).showConfirmForgetDialog();
-    }
-
-    @Test
-    public void networkStateChangedIntent_shouldRefetchInfo() {
-        setUpForConnectedNetwork();
-
-        displayAndResume();
-
-        verify(mockConnectivityManager, times(1)).getNetworkInfo(any(Network.class));
-        verify(mockWifiManager, times(1)).getConnectionInfo();
-
-        mContext.sendBroadcast(new Intent(WifiManager.NETWORK_STATE_CHANGED_ACTION));
-
-        verify(mockConnectivityManager, times(2)).getNetworkInfo(any(Network.class));
-        verify(mockWifiManager, times(2)).getConnectionInfo();
-    }
-
-    @Test
-    public void networkStateChangedIntent_shouldRefetchInfoForConnectedNetwork() {
-        setUpForConnectedNetwork();
-
-        displayAndResume();
-
-        verify(mockConnectivityManager, times(1)).getNetworkInfo(any(Network.class));
-        verify(mockWifiManager, times(1)).getConnectionInfo();
-
-        mContext.sendBroadcast(new Intent(WifiManager.NETWORK_STATE_CHANGED_ACTION));
-
-        verify(mockConnectivityManager, times(2)).getNetworkInfo(any(Network.class));
-        verify(mockWifiManager, times(2)).getConnectionInfo();
-    }
-
-    @Test
-    public void rssiChangedIntent_shouldRefetchInfo() {
-        setUpForConnectedNetwork();
-
-        displayAndResume();
-
-        verify(mockConnectivityManager, times(1)).getNetworkInfo(any(Network.class));
-        verify(mockWifiManager, times(1)).getConnectionInfo();
-
-        mContext.sendBroadcast(new Intent(WifiManager.RSSI_CHANGED_ACTION));
-
-        verify(mockConnectivityManager, times(2)).getNetworkInfo(any(Network.class));
-        verify(mockWifiManager, times(2)).getConnectionInfo();
-    }
-
-    @Test
-    public void rssiChangedIntent_shouldRefetchInfoForConnectedNetwork() {
-        setUpForConnectedNetwork();
-        displayAndResume();
-
-        verify(mockConnectivityManager, times(1)).getNetworkInfo(any(Network.class));
-        verify(mockWifiManager, times(1)).getConnectionInfo();
-
-        mContext.sendBroadcast(new Intent(WifiManager.RSSI_CHANGED_ACTION));
-
-        verify(mockConnectivityManager, times(2)).getNetworkInfo(any(Network.class));
-        verify(mockWifiManager, times(2)).getConnectionInfo();
-    }
-
-    @Test
-    public void networkDisconnectedState_shouldNotFinishActivityForConnectedNetwork() {
-        setUpForConnectedNetwork();
-
-        displayAndResume();
-
-        when(mockConnectivityManager.getNetworkInfo(any(Network.class))).thenReturn(null);
-        mContext.sendBroadcast(new Intent(WifiManager.NETWORK_STATE_CHANGED_ACTION));
-
-        verify(mockActivity, never()).finish();
-    }
-
-    @Test
-    public void networkOnLost_shouldNotFinishActivityForConnectedNetwork() {
-        setUpForConnectedNetwork();
-
-        displayAndResume();
-
-        mCallbackCaptor.getValue().onLost(mockNetwork);
-
-        verify(mockActivity, never()).finish();
-    }
-
-    @Test
-    public void ipv6AddressPref_shouldHaveHostAddressTextSet() {
-        setUpForConnectedNetwork();
-        mLinkProperties.addLinkAddress(Constants.IPV6_LINKLOCAL);
-        mLinkProperties.addLinkAddress(Constants.IPV6_GLOBAL1);
-        mLinkProperties.addLinkAddress(Constants.IPV6_GLOBAL2);
-
-        displayAndResume();
-
-        String expectedAddresses = String.join("\n",
-                asString(Constants.IPV6_LINKLOCAL),
-                asString(Constants.IPV6_GLOBAL1),
-                asString(Constants.IPV6_GLOBAL2));
-
-        verify(mockIpv6AddressesPref).setSummary(expectedAddresses);
-    }
-
-    @Test
-    public void ipv6AddressPref_shouldNotBeSelectable() {
-        setUpForConnectedNetwork();
-        mLinkProperties.addLinkAddress(Constants.IPV6_GLOBAL2);
-
-        displayAndResume();
-
-        assertThat(mockIpv6AddressesPref.isSelectable()).isFalse();
-    }
-
-    @Test
-    public void captivePortal_shouldShowSignInButton() {
-        setUpForConnectedNetwork();
-
-        InOrder inOrder = inOrder(mockButtonsPref);
-
-        displayAndResume();
-
-        inOrder.verify(mockButtonsPref).setButton2Visible(false);
-
-        NetworkCapabilities nc = makeNetworkCapabilities();
-        updateNetworkCapabilities(nc);
-        inOrder.verify(mockButtonsPref).setButton2Visible(false);
-
-        nc.addCapability(NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL);
-        updateNetworkCapabilities(nc);
-
-        inOrder.verify(mockButtonsPref).setButton2Text(R.string.wifi_sign_in_button_text);
-        inOrder.verify(mockButtonsPref).setButton2Visible(true);
-
-        nc.removeCapability(NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL);
-        updateNetworkCapabilities(nc);
-        inOrder.verify(mockButtonsPref).setButton2Visible(false);
-    }
-
-    @Test
-    public void captivePortal_shouldShowVenueInfoButton() {
-        setUpForConnectedNetwork();
-
-        InOrder inOrder = inOrder(mockButtonsPref);
-
-        displayAndResume();
-
-        inOrder.verify(mockButtonsPref).setButton2Visible(false);
-
-        LinkProperties lp = new LinkProperties();
-        final CaptivePortalData data = new CaptivePortalData.Builder()
-                .setVenueInfoUrl(Uri.parse("https://example.com/info"))
-                .build();
-        lp.setCaptivePortalData(data);
-        updateLinkProperties(lp);
-
-        inOrder.verify(mockButtonsPref).setButton2Text(R.string.wifi_venue_website_button_text);
-        inOrder.verify(mockButtonsPref).setButton2Visible(true);
-
-        lp.setCaptivePortalData(null);
-        updateLinkProperties(lp);
-        inOrder.verify(mockButtonsPref).setButton2Visible(false);
-    }
-
-    @Test
-    public void testSignInButton_shouldStartCaptivePortalApp() {
-        setUpForConnectedNetwork();
-
-        displayAndResume();
-
-        ArgumentCaptor<OnClickListener> captor = ArgumentCaptor.forClass(OnClickListener.class);
-        verify(mockButtonsPref, atLeastOnce()).setButton2OnClickListener(captor.capture());
-        // getValue() returns the last captured value
-        captor.getValue().onClick(null);
-        verify(mockConnectivityManager).startCaptivePortalApp(mockNetwork);
-        verify(mockMetricsFeatureProvider)
-                .action(mockActivity, MetricsProto.MetricsEvent.ACTION_WIFI_SIGNIN);
-    }
-
-    @Test
-    public void testSignInButton_shouldHideSignInButtonForDisconnectedNetwork() {
-        setUpForDisconnectedNetwork();
-        NetworkCapabilities nc = makeNetworkCapabilities();
-        nc.addCapability(NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL);
-        when(mockConnectivityManager.getNetworkCapabilities(mockNetwork))
-                .thenReturn(new NetworkCapabilities(nc));
-
-        // verify onResume
-        displayAndResume();
-
-        verify(mockButtonsPref, never()).setButton2Visible(true);
-        verify(mockButtonsPref).setButton2Visible(false);
-
-        // verify onCapabilitiesChanged
-        updateNetworkCapabilities(nc);
-
-        verify(mockButtonsPref, never()).setButton2Visible(true);
-        verify(mockButtonsPref).setButton2Visible(false);
-    }
-
-    @Test
-    public void testConnectButton_shouldInvisibleForConnectNetwork() {
-        setUpForConnectedNetwork();
-
-        displayAndResume();
-
-        verify(mockButtonsPref, times(1)).setButton3Visible(false);
-    }
-
-    @Test
-    public void testConnectButton_shouldVisibleForDisconnectNetwork() {
-        setUpForDisconnectedNetwork();
-
-        displayAndResume();
-
-        verify(mockButtonsPref, times(1)).setButton3Visible(true);
-        verify(mockButtonsPref, times(1)).setButton3Text(R.string.wifi_connect);
-    }
-
-    private void setUpForToast() {
-        Resources res = mContext.getResources();
-        when(mockActivity.getResources()).thenReturn(res);
-    }
-
-    @Test
-    public void testConnectButton_clickConnect_displayAsSuccess() {
-        setUpForDisconnectedNetwork();
-        when(mockWifiManager.isWifiEnabled()).thenReturn(true);
-        InOrder inOrder = inOrder(mockButtonsPref);
-        String label = "title";
-        when(mockAccessPoint.getTitle()).thenReturn(label);
-        setUpForToast();
-
-        displayAndResume();
-
-        // check connect button exist
-        verifyConnectBtnSetUpAsVisible(inOrder);
-
-        // click connect button
-        mController.connectNetwork();
-
-        // check display button as connecting
-        verify(mockWifiManager, times(1)).connect(anyInt(), any(WifiManager.ActionListener.class));
-        verifyConnectBtnSetUpAsConnecting(inOrder);
-
-        // update as connected
-        when(mockAccessPoint.isActive()).thenReturn(true);
-        mController.updateAccessPoint();
-
-        // check connect button invisible, be init as default state and toast success message
-        verifyConnectBtnBeInitAsDefault(inOrder);
-        inOrder.verify(mockButtonsPref, times(1)).setButton3Visible(false);
-        assertThat(ShadowToast.getTextOfLatestToast()).isEqualTo(
-                mContext.getString(R.string.wifi_connected_to_message, label));
-    }
-
-    @Test
-    public void testConnectButton_clickConnectButFailed_displayFailMessage() {
-        setUpForDisconnectedNetwork();
-        ArgumentCaptor<WifiManager.ActionListener> connectListenerCaptor =
-                ArgumentCaptor.forClass(WifiManager.ActionListener.class);
-        when(mockWifiManager.isWifiEnabled()).thenReturn(true);
-        InOrder inOrder = inOrder(mockButtonsPref);
-        setUpForToast();
-
-        displayAndResume();
-
-        // check connect button exist
-        verifyConnectBtnSetUpAsVisible(inOrder);
-
-        // click connect button
-        mController.connectNetwork();
-
-        // check display button as connecting
-        verify(mockWifiManager, times(1)).connect(anyInt(), connectListenerCaptor.capture());
-        verifyConnectBtnSetUpAsConnecting(inOrder);
-
-        // update as failed
-        connectListenerCaptor.getValue().onFailure(-1);
-
-        // check connect button visible, be init as default and toast failed message
-        verifyConnectBtnBeInitAsDefault(inOrder);
-        inOrder.verify(mockButtonsPref, times(1)).setButton3Visible(true);
-        assertThat(ShadowToast.getTextOfLatestToast()).isEqualTo(
-                mContext.getString(R.string.wifi_failed_connect_message));
-    }
-
-    private void verifyConnectBtnSetUpAsVisible(InOrder inOrder) {
-        inOrder.verify(mockButtonsPref, times(1)).setButton3Text(R.string.wifi_connect);
-        inOrder.verify(mockButtonsPref, times(1)).setButton3Icon(R.drawable.ic_settings_wireless);
-        inOrder.verify(mockButtonsPref, times(1)).setButton3Visible(true);
-    }
-
-    private void verifyConnectBtnSetUpAsConnecting(InOrder inOrder) {
-        inOrder.verify(mockButtonsPref, times(1)).setButton3Text(R.string.wifi_connecting);
-        inOrder.verify(mockButtonsPref, times(1)).setButton3Enabled(false);
-    }
-
-    private void verifyConnectBtnBeInitAsDefault(InOrder inOrder) {
-        inOrder.verify(mockButtonsPref, times(1)).setButton3Text(R.string.wifi_connect);
-        inOrder.verify(mockButtonsPref, times(1)).setButton3Icon(R.drawable.ic_settings_wireless);
-        inOrder.verify(mockButtonsPref, times(1)).setButton3Enabled(true);
-    }
-
-    @Test
-    public void testConnectButton_clickConnectButTimeout_displayFailMessage() {
-        setUpForDisconnectedNetwork();
-        when(mockWifiManager.isWifiEnabled()).thenReturn(true);
-        InOrder inOrder = inOrder(mockButtonsPref);
-        setUpForToast();
-
-        displayAndResume();
-
-        // check connect button exist
-        verifyConnectBtnSetUpAsVisible(inOrder);
-
-        // click connect button
-        mController.connectNetwork();
-
-        // check display button as connecting
-        verify(mockWifiManager, times(1)).connect(anyInt(), any(WifiManager.ActionListener.class));
-        verifyConnectBtnSetUpAsConnecting(inOrder);
-
-        // update as failed
-        mController.mTimer.onFinish();
-
-        // check connect button visible, be init as default and toast failed message
-        verifyConnectBtnBeInitAsDefault(inOrder);
-        inOrder.verify(mockButtonsPref, times(1)).setButton3Visible(true);
-        assertThat(ShadowToast.getTextOfLatestToast()).isEqualTo(
-                mContext.getString(R.string.wifi_failed_connect_message));
-    }
-
-    @Test
-    public void testConnectButton_clickConnectButTimeout_displayNotInRangeMessage() {
-        setUpForNotInRangeNetwork();
-        when(mockWifiManager.isWifiEnabled()).thenReturn(true);
-        InOrder inOrder = inOrder(mockButtonsPref);
-        setUpForToast();
-
-        displayAndResume();
-
-        // check connect button exist
-        verifyConnectBtnSetUpAsVisible(inOrder);
-
-        // click connect button
-        mController.connectNetwork();
-
-        // check display button as connecting
-        verify(mockWifiManager, times(1)).connect(anyInt(), any(WifiManager.ActionListener.class));
-        verifyConnectBtnSetUpAsConnecting(inOrder);
-
-        // update as failed
-        mController.mTimer.onFinish();
-
-        // check connect button visible, be init as default and toast failed message
-        verifyConnectBtnBeInitAsDefault(inOrder);
-        inOrder.verify(mockButtonsPref, times(1)).setButton3Visible(true);
-        assertThat(ShadowToast.getTextOfLatestToast()).isEqualTo(
-                mContext.getString(R.string.wifi_not_in_range_message));
-    }
-
-    @Test
-    public void testConnectButton_clickConnectWhenWiFiDisabled_displaySuccessMessage() {
-        setUpForDisconnectedNetwork();
-        when(mockWifiManager.isWifiEnabled()).thenReturn(false); // wifi disabled
-        InOrder inOrder = inOrder(mockButtonsPref);
-        String label = "title";
-        when(mockAccessPoint.getTitle()).thenReturn(label);
-        setUpForToast();
-
-        displayAndResume();
-
-        // check connect button exist
-        verifyConnectBtnSetUpAsVisible(inOrder);
-
-        // click connect button
-        mController.connectNetwork();
-
-        // check turn on Wi-Fi, display button as connecting and toast turn on Wi-Fi message
-        verify(mockWifiManager, times(1)).setWifiEnabled(true);
-        verifyConnectBtnSetUpAsConnecting(inOrder);
-        assertThat(ShadowToast.getTextOfLatestToast()).isEqualTo(
-                mContext.getString(R.string.wifi_turned_on_message));
-
-        // notify Wi-Fi enabled
-        mController.mWifiListener.onWifiStateChanged(WifiManager.WIFI_STATE_ENABLED);
-
-        // check had connect network and icon display as expected
-        verify(mockWifiManager, times(1)).connect(anyInt(), any(WifiManager.ActionListener.class));
-        verifyConnectBtnSetUpAsConnecting(inOrder);
-
-        // update as connected
-        when(mockAccessPoint.isActive()).thenReturn(true);
-        mController.updateAccessPoint();
-
-        // check connect button invisible, be init as default state and toast success message
-        verifyConnectBtnBeInitAsDefault(inOrder);
-        inOrder.verify(mockButtonsPref, times(1)).setButton3Visible(false);
-        assertThat(ShadowToast.getTextOfLatestToast()).isEqualTo(
-                mContext.getString(R.string.wifi_connected_to_message, label));
-    }
-
-    @Test
-    public void testConnectButton_clickConnectWhenWiFiDisabled_failedToConnectWiFi() {
-        setUpForDisconnectedNetwork();
-        when(mockWifiManager.isWifiEnabled()).thenReturn(false); // wifi disabled
-        InOrder inOrder = inOrder(mockButtonsPref);
-        setUpForToast();
-
-        displayAndResume();
-
-        // check connect button exist
-        verifyConnectBtnSetUpAsVisible(inOrder);
-
-        // click connect button
-        mController.connectNetwork();
-
-        // check turn on Wi-Fi, display button as connecting and toast turn on Wi-Fi message
-        verify(mockWifiManager, times(1)).setWifiEnabled(true);
-        verifyConnectBtnSetUpAsConnecting(inOrder);
-        assertThat(ShadowToast.getTextOfLatestToast()).isEqualTo(
-                mContext.getString(R.string.wifi_turned_on_message));
-
-        // notify Wi-Fi enabled
-        mController.mWifiListener.onWifiStateChanged(WifiManager.WIFI_STATE_ENABLED);
-
-        // check had connect network and icon display as expected
-        verify(mockWifiManager, times(1)).connect(anyInt(), any(WifiManager.ActionListener.class));
-        verifyConnectBtnSetUpAsConnecting(inOrder);
-
-        // update as failed
-        mController.mTimer.onFinish();
-
-        // check connect button visible, be init as default and toast failed message
-        verifyConnectBtnBeInitAsDefault(inOrder);
-        inOrder.verify(mockButtonsPref, times(1)).setButton3Visible(true);
-        assertThat(ShadowToast.getTextOfLatestToast()).isEqualTo(
-                mContext.getString(R.string.wifi_failed_connect_message));
-    }
-
-    @Test
-    public void
-            testConnectButton_clickConnectWhenWiFiDisabled_failedToConnectWifiBecauseNotInRange() {
-        setUpForNotInRangeNetwork();
-        when(mockWifiManager.isWifiEnabled()).thenReturn(false); // wifi disabled
-        InOrder inOrder = inOrder(mockButtonsPref);
-        setUpForToast();
-
-        displayAndResume();
-
-        // check connect button exist
-        verifyConnectBtnSetUpAsVisible(inOrder);
-
-        // click connect button
-        mController.connectNetwork();
-
-        // check turn on Wi-Fi, display button as connecting and toast turn on Wi-Fi message
-        verify(mockWifiManager, times(1)).setWifiEnabled(true);
-        verifyConnectBtnSetUpAsConnecting(inOrder);
-        assertThat(ShadowToast.getTextOfLatestToast()).isEqualTo(
-                mContext.getString(R.string.wifi_turned_on_message));
-
-        // notify Wi-Fi enabled
-        mController.mWifiListener.onWifiStateChanged(WifiManager.WIFI_STATE_ENABLED);
-
-        // check had connect network and icon display as expected
-        verify(mockWifiManager, times(1)).connect(anyInt(), any(WifiManager.ActionListener.class));
-        verifyConnectBtnSetUpAsConnecting(inOrder);
-
-        // update as failed
-        mController.mTimer.onFinish();
-
-        // check connect button visible, be init as default and toast failed message
-        verifyConnectBtnBeInitAsDefault(inOrder);
-        inOrder.verify(mockButtonsPref, times(1)).setButton3Visible(true);
-        assertThat(ShadowToast.getTextOfLatestToast()).isEqualTo(
-                mContext.getString(R.string.wifi_not_in_range_message));
-    }
-
-    @Test
-    public void testConnectButton_clickConnectWhenWiFiDisabled_failedToEnableWifi() {
-        setUpForDisconnectedNetwork();
-        when(mockWifiManager.isWifiEnabled()).thenReturn(false); // wifi disabled
-        InOrder inOrder = inOrder(mockButtonsPref);
-        setUpForToast();
-
-        displayAndResume();
-
-        // check connect button exist
-        verifyConnectBtnSetUpAsVisible(inOrder);
-
-        // click connect button
-        mController.connectNetwork();
-
-        // check turn on Wi-Fi, display button as connecting and toast turn on Wi-Fi message
-        verify(mockWifiManager, times(1)).setWifiEnabled(true);
-        verifyConnectBtnSetUpAsConnecting(inOrder);
-        assertThat(ShadowToast.getTextOfLatestToast()).isEqualTo(
-                mContext.getString(R.string.wifi_turned_on_message));
-
-        // notify turn on Wi-Fi failed
-        mController.mTimer.onFinish();
-
-        // check connect button visible, be init as default and toast failed message
-        verifyConnectBtnBeInitAsDefault(inOrder);
-        inOrder.verify(mockButtonsPref, times(1)).setButton3Visible(true);
-        assertThat(ShadowToast.getTextOfLatestToast()).isEqualTo(
-                mContext.getString(R.string.wifi_failed_connect_message));
-    }
-
-    @Test
-    public void testConnectButton_clickConnectAndBackKey_ignoreTimeoutEvent() {
-        setUpForDisconnectedNetwork();
-        when(mockWifiManager.isWifiEnabled()).thenReturn(true);
-        InOrder inOrder = inOrder(mockButtonsPref);
-        setUpForToast();
-
-        displayAndResume();
-
-        // check connect button exist
-        verifyConnectBtnSetUpAsVisible(inOrder);
-
-        // click connect button
-        mController.connectNetwork();
-
-        // check display button as connecting
-        verify(mockWifiManager, times(1)).connect(anyInt(), any(WifiManager.ActionListener.class));
-        verifyConnectBtnSetUpAsConnecting(inOrder);
-
-        // leave detail page
-        when(mockFragment.getActivity()).thenReturn(null);
-
-        // timeout happened
-        mController.mTimer.onFinish();
-
-        // check connect button visible, be init as default and toast failed message
-        inOrder.verify(mockButtonsPref, never()).setButton3Text(R.string.wifi_connect);
-        inOrder.verify(mockButtonsPref, never()).setButton3Icon(R.drawable.ic_settings_wireless);
-        inOrder.verify(mockButtonsPref, never()).setButton3Enabled(true);
-        inOrder.verify(mockButtonsPref, never()).setButton3Visible(true);
-        assertThat(ShadowToast.shownToastCount()).isEqualTo(0);
-    }
-
-    @Test
-    public void updateAccessPoint_returnFalseForNothingChanged() {
-        setUpForDisconnectedNetwork();
-
-        displayAndResume();
-        boolean changed = mController.updateAccessPoint();
-
-        assertThat(changed).isFalse();
-    }
-
-    @Test
-    public void updateAccessPoint_returnTrueForSignalLevelChanged() {
-        setUpForDisconnectedNetwork();
-
-        displayAndResume();
-
-        // Level changed
-        when(mockAccessPoint.getLevel()).thenReturn(LEVEL + 1);
-        boolean changed = mController.updateAccessPoint();
-
-        assertThat(changed).isTrue();
-    }
-
-    @Test
-    public void updateAccessPoint_returnTrueForChangeAsNotInRange() {
-        setUpForDisconnectedNetwork();
-
-        displayAndResume();
-
-        // change as not in range
-        when(mockAccessPoint.matches(any(AccessPoint.class))).thenReturn(false);
-        boolean changed = mController.updateAccessPoint();
-
-        assertThat(changed).isTrue();
-    }
-
-    @Test
-    public void updateAccessPoint_returnTrueForChangeAsInRange() {
-        setUpForNotInRangeNetwork();
-
-        displayAndResume();
-
-        // change as in range
-        when(mockAccessPoint.matches(any(AccessPoint.class))).thenReturn(true);
-        boolean changed = mController.updateAccessPoint();
-
-        assertThat(changed).isTrue();
-    }
-
-    @Test
-    public void updateAccessPoint_returnTrueForChangeAsConnected() {
-        setUpForDisconnectedNetwork();
-
-        displayAndResume();
-
-        // change as connected
-        when(mockAccessPoint.isActive()).thenReturn(true);
-        boolean changed = mController.updateAccessPoint();
-
-        assertThat(changed).isTrue();
-    }
-
-    @Test
-    public void updateAccessPoint_returnTrueForChangeAsDisconnected() {
-        setUpForConnectedNetwork();
-
-        displayAndResume();
-
-        // change as disconnected
-        when(mockAccessPoint.isActive()).thenReturn(false);
-        boolean changed = mController.updateAccessPoint();
-
-        assertThat(changed).isTrue();
-    }
-
-    @Test
-    public void updateAccessPoint_returnTrueForAccessPointUpdated() {
-        setUpForConnectedNetwork();
-
-        displayAndResume();
-
-        // change as disconnected
-        when(mockAccessPoint.update(mockWifiConfig, mockWifiInfo, mockNetworkInfo))
-                .thenReturn(true);
-        boolean changed = mController.updateAccessPoint();
-
-        assertThat(changed).isTrue();
-    }
-
-    @Test
-    public void testRefreshRssiViews_shouldNotUpdateIfLevelIsSameForConnectedNetwork() {
-        setUpForConnectedNetwork();
-        displayAndResume();
-
-        mContext.sendBroadcast(new Intent(WifiManager.RSSI_CHANGED_ACTION));
-
-        verify(mockAccessPoint, times(3)).getLevel();
-        verify(mockIconInjector, times(1)).getIcon(anyInt());
-    }
-
-    @Test
-    public void testRefreshRssiViews_shouldUpdateOnLevelChangeForConnectedNetwork() {
-        setUpForConnectedNetwork();
-        displayAndResume();
-
-        when(mockAccessPoint.getLevel()).thenReturn(0);
-        mContext.sendBroadcast(new Intent(WifiManager.RSSI_CHANGED_ACTION));
-
-        verify(mockAccessPoint, times(4)).getLevel();
-        verify(mockIconInjector, times(2)).getIcon(anyInt());
-    }
-
-    @Test
-    public void testRefreshRssiViews_shouldNotUpdateForNotInRangeNetwork() {
-        setUpForNotInRangeNetwork();
-
-        displayAndResume();
-
-        when(mockAccessPoint.getLevel()).thenReturn(0);
-        mContext.sendBroadcast(new Intent(WifiManager.RSSI_CHANGED_ACTION));
-
-        verify(mockSignalStrengthPref, times(2)).setVisible(false);
-    }
-
-    @Test
-    public void testRedrawIconForHeader_shouldEnlarge() {
-        setUpForConnectedNetwork();
-        ArgumentCaptor<BitmapDrawable> drawableCaptor =
-                ArgumentCaptor.forClass(BitmapDrawable.class);
-        Drawable original = mContext.getDrawable(Utils.getWifiIconResource(LEVEL)).mutate();
-        when(mockIconInjector.getIcon(anyInt())).thenReturn(original);
-
-        displayAndResume();
-
-        verify(mockHeaderController, times(1)).setIcon(drawableCaptor.capture());
-
-        int expectedSize = mContext.getResources().getDimensionPixelSize(
-                R.dimen.wifi_detail_page_header_image_size);
-        BitmapDrawable icon = drawableCaptor.getValue();
-        assertThat(icon.getMinimumWidth()).isEqualTo(expectedSize);
-        assertThat(icon.getMinimumHeight()).isEqualTo(expectedSize);
-    }
-
-    @Test
-    public void testRedrawIconForHeader_shouldEnlargeForDisconnectedNetwork() {
-        setUpForDisconnectedNetwork();
-        ArgumentCaptor<BitmapDrawable> drawableCaptor =
-                ArgumentCaptor.forClass(BitmapDrawable.class);
-        Drawable original = mContext.getDrawable(Utils.getWifiIconResource(LEVEL)).mutate();
-        when(mockIconInjector.getIcon(anyInt())).thenReturn(original);
-
-        displayAndResume();
-
-        verify(mockHeaderController, times(1)).setIcon(drawableCaptor.capture());
-
-        int expectedSize = mContext.getResources().getDimensionPixelSize(
-                R.dimen.wifi_detail_page_header_image_size);
-        BitmapDrawable icon = drawableCaptor.getValue();
-        assertThat(icon.getMinimumWidth()).isEqualTo(expectedSize);
-        assertThat(icon.getMinimumHeight()).isEqualTo(expectedSize);
-    }
-
-    @Test
-    public void testRedrawIconForHeader_shouldNotEnlargeIfNotVectorDrawable() {
-        setUpForConnectedNetwork();
-        ArgumentCaptor<ColorDrawable> drawableCaptor =
-                ArgumentCaptor.forClass(ColorDrawable.class);
-
-        displayAndResume();
-
-        verify(mockHeaderController, times(1)).setIcon(drawableCaptor.capture());
-        ColorDrawable icon = drawableCaptor.getValue();
-        assertThat(icon).isNotNull();
-    }
-
-    @Test
-    public void checkMacTitle_whenPrivacyRandomizedMac_shouldBeRandom() {
-        setUpForDisconnectedNetwork();
-        mockWifiConfig.macRandomizationSetting = WifiConfiguration.RANDOMIZATION_PERSISTENT;
-        when(mockWifiConfig.getRandomizedMacAddress()).thenReturn(mockMacAddress);
-        when(mockMacAddress.toString()).thenReturn(RANDOMIZED_MAC_ADDRESS);
-
-        displayAndResume();
-
-        verify(mockMacAddressPref).setTitle(R.string.wifi_advanced_randomized_mac_address_title);
-    }
-
-    @Test
-    public void checkMacTitle_whenPrivacyDeviceMac_shouldBeFactory() {
-        setUpForDisconnectedNetwork();
-        mockWifiConfig.macRandomizationSetting = WifiConfiguration.RANDOMIZATION_NONE;
-        when(mockWifiConfig.getRandomizedMacAddress()).thenReturn(mockMacAddress);
-        when(mockWifiManager.getFactoryMacAddresses())
-                .thenReturn(new String[]{FACTORY_MAC_ADDRESS});
-
-        displayAndResume();
-
-        verify(mockMacAddressPref).setTitle(R.string.wifi_advanced_device_mac_address_title);
-    }
-
-    @Test
-    public void entityHeader_expiredPasspointR1_shouldHandleExpiration() {
-        when(mockAccessPoint.isPasspoint()).thenReturn(true);
-        when(mockAccessPoint.isPasspointConfigurationR1()).thenReturn(true);
-        when(mockAccessPoint.isExpired()).thenReturn(true);
-        setUpForDisconnectedNetwork();
-        String expireSummary = mContext.getResources().getString(
-                com.android.settingslib.R.string.wifi_passpoint_expired);
-
-        displayAndResume();
-
-        verify(mockButtonsPref, atLeastOnce()).setButton3Visible(false);
-        verify(mockHeaderController).setSummary(expireSummary);
-    }
-
-    private ActionButtonsPreference createMock() {
-        final ActionButtonsPreference pref = mock(ActionButtonsPreference.class);
-        when(pref.setButton1Text(anyInt())).thenReturn(pref);
-        when(pref.setButton1Icon(anyInt())).thenReturn(pref);
-        when(pref.setButton1Enabled(anyBoolean())).thenReturn(pref);
-        when(pref.setButton1Visible(anyBoolean())).thenReturn(pref);
-        when(pref.setButton1OnClickListener(any(View.OnClickListener.class))).thenReturn(pref);
-
-        when(pref.setButton2Text(anyInt())).thenReturn(pref);
-        when(pref.setButton2Icon(anyInt())).thenReturn(pref);
-        when(pref.setButton2Enabled(anyBoolean())).thenReturn(pref);
-        when(pref.setButton2Visible(anyBoolean())).thenReturn(pref);
-        when(pref.setButton2OnClickListener(any(View.OnClickListener.class))).thenReturn(pref);
-
-        when(pref.setButton3Text(anyInt())).thenReturn(pref);
-        when(pref.setButton3Icon(anyInt())).thenReturn(pref);
-        when(pref.setButton3Enabled(anyBoolean())).thenReturn(pref);
-        when(pref.setButton3Visible(anyBoolean())).thenReturn(pref);
-        when(pref.setButton3OnClickListener(any(View.OnClickListener.class))).thenReturn(pref);
-
-        when(pref.setButton4Text(anyInt())).thenReturn(pref);
-        when(pref.setButton4Icon(anyInt())).thenReturn(pref);
-        when(pref.setButton4Enabled(anyBoolean())).thenReturn(pref);
-        when(pref.setButton4Visible(anyBoolean())).thenReturn(pref);
-        when(pref.setButton4OnClickListener(any(View.OnClickListener.class))).thenReturn(pref);
-
-        return pref;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.java
deleted file mode 100644
index 30665e6..0000000
--- a/tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.wifi.details;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-
-import android.content.Context;
-import android.net.wifi.WifiConfiguration;
-
-import androidx.preference.DropDownPreference;
-
-import com.android.settings.R;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class WifiMeteredPreferenceControllerTest {
-
-    private static final int METERED_OVERRIDE_NONE = 0;
-    private static final int METERED_OVERRIDE_METERED = 1;
-    private static final int METERED_OVERRIDE_NOT_METERED = 2;
-
-    @Mock
-    private WifiConfiguration mWifiConfiguration;
-
-    private WifiMeteredPreferenceController mPreferenceController;
-    private Context mContext;
-    private DropDownPreference mDropDownPreference;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-
-        mPreferenceController = spy(
-                new WifiMeteredPreferenceController(mContext, mWifiConfiguration));
-        mDropDownPreference = new DropDownPreference(mContext);
-        mDropDownPreference.setEntries(R.array.wifi_metered_entries);
-        mDropDownPreference.setEntryValues(R.array.wifi_metered_values);
-    }
-
-    @Test
-    public void testUpdateState_wifiMetered_setCorrectValue() {
-        doReturn(METERED_OVERRIDE_METERED).when(mPreferenceController).getMeteredOverride();
-
-        mPreferenceController.updateState(mDropDownPreference);
-
-        assertThat(mDropDownPreference.getEntry()).isEqualTo("Treat as metered");
-    }
-
-    @Test
-    public void testUpdateState_wifiNotMetered_setCorrectValue() {
-        doReturn(METERED_OVERRIDE_NOT_METERED).when(mPreferenceController).getMeteredOverride();
-
-        mPreferenceController.updateState(mDropDownPreference);
-
-        assertThat(mDropDownPreference.getEntry()).isEqualTo("Treat as unmetered");
-    }
-
-    @Test
-    public void testUpdateState_wifiAuto_setCorrectValue() {
-        doReturn(METERED_OVERRIDE_NONE).when(mPreferenceController).getMeteredOverride();
-
-        mPreferenceController.updateState(mDropDownPreference);
-
-        assertThat(mDropDownPreference.getEntry()).isEqualTo("Detect automatically");
-    }
-
-    @Test
-    public void testController_resilientToNullConfig() {
-        mPreferenceController = spy(new WifiMeteredPreferenceController(mContext, null));
-
-        mPreferenceController.getMeteredOverride();
-        mPreferenceController.onPreferenceChange(mDropDownPreference, 1);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/details/WifiPrivacyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/details/WifiPrivacyPreferenceControllerTest.java
deleted file mode 100644
index 2e588b5..0000000
--- a/tests/robotests/src/com/android/settings/wifi/details/WifiPrivacyPreferenceControllerTest.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi.details;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-
-import android.content.Context;
-import android.net.wifi.WifiConfiguration;
-
-import androidx.preference.DropDownPreference;
-
-import com.android.settings.R;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class WifiPrivacyPreferenceControllerTest {
-
-    private static final int PRIVACY_RANDOMIZED = WifiConfiguration.RANDOMIZATION_PERSISTENT;
-    private static final int PRIVACY_TRUSTED = WifiConfiguration.RANDOMIZATION_NONE;
-
-    @Mock
-    private WifiConfiguration mWifiConfiguration;
-
-    private WifiPrivacyPreferenceController mPreferenceController;
-    private Context mContext;
-    private DropDownPreference mDropDownPreference;
-    private String[] perferenceString;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-
-        WifiPrivacyPreferenceController preferenceController = new WifiPrivacyPreferenceController(
-                mContext);
-        preferenceController.setWifiConfiguration(mWifiConfiguration);
-        mPreferenceController = spy(preferenceController);
-        mDropDownPreference = new DropDownPreference(mContext);
-        mDropDownPreference.setEntries(R.array.wifi_privacy_entries);
-        mDropDownPreference.setEntryValues(R.array.wifi_privacy_values);
-
-        perferenceString = mContext.getResources().getStringArray(R.array.wifi_privacy_entries);
-    }
-
-    @Test
-    public void testUpdateState_wifiPrivacy_setCorrectValue() {
-        doReturn(PRIVACY_TRUSTED).when(mPreferenceController).getRandomizationValue();
-
-        mPreferenceController.updateState(mDropDownPreference);
-
-        int prefValue = mPreferenceController.translateMacRandomizedValueToPrefValue(
-                PRIVACY_TRUSTED);
-        assertThat(mDropDownPreference.getEntry()).isEqualTo(perferenceString[prefValue]);
-    }
-
-    @Test
-    public void testUpdateState_wifiNotMetered_setCorrectValue() {
-        doReturn(PRIVACY_RANDOMIZED).when(mPreferenceController).getRandomizationValue();
-
-        mPreferenceController.updateState(mDropDownPreference);
-
-        int prefValue = mPreferenceController.translateMacRandomizedValueToPrefValue(
-                PRIVACY_RANDOMIZED);
-        assertThat(mDropDownPreference.getEntry()).isEqualTo(perferenceString[prefValue]);
-    }
-
-    @Test
-    public void testController_resilientToNullConfig() {
-        mPreferenceController = spy(new WifiPrivacyPreferenceController(mContext));
-
-        mPreferenceController.getRandomizationValue();
-        mPreferenceController.onPreferenceChange(mDropDownPreference, "1");
-    }
-
-    @Test
-    public void testUpdateState_isNotEphemeralNetwork_shouldBeSelectable() {
-        mPreferenceController.setIsEphemeral(false);
-        mPreferenceController.updateState(mDropDownPreference);
-
-        assertThat(mDropDownPreference.isSelectable()).isTrue();
-    }
-
-    @Test
-    public void testUpdateState_isEphemeralNetwork_shouldNotSelectable() {
-        mPreferenceController.setIsEphemeral(true);
-        mPreferenceController.updateState(mDropDownPreference);
-
-        assertThat(mDropDownPreference.isSelectable()).isFalse();
-    }
-
-    @Test
-    public void testUpdateState_isNotPasspointNetwork_shouldBeSelectable() {
-        mPreferenceController.setIsPasspoint(false);
-        mPreferenceController.updateState(mDropDownPreference);
-
-        assertThat(mDropDownPreference.isSelectable()).isTrue();
-    }
-
-    @Test
-    public void testUpdateState_isPasspointNetwork_shouldNotSelectable() {
-        mPreferenceController.setIsPasspoint(true);
-        mPreferenceController.updateState(mDropDownPreference);
-
-        assertThat(mDropDownPreference.isSelectable()).isFalse();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java b/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java
index 8d3405c..9aaaa43 100644
--- a/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java
+++ b/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java
@@ -53,10 +53,12 @@
 import android.net.RouteInfo;
 import android.net.Uri;
 import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiEnterpriseConfig;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.os.Handler;
 import android.provider.Settings;
+import android.telephony.TelephonyManager;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.ImageView;
@@ -175,6 +177,8 @@
     @Mock
     private Preference mMockSsidPref;
     @Mock
+    private Preference mMockEapSimSubscriptionPref;
+    @Mock
     private Preference mMockMacAddressPref;
     @Mock
     private Preference mMockIpAddressPref;
@@ -374,6 +378,8 @@
                 .thenReturn(mMockSecurityPref);
         when(mMockScreen.findPreference(WifiDetailPreferenceController2.KEY_SSID_PREF))
                 .thenReturn(mMockSsidPref);
+        when(mMockScreen.findPreference(WifiDetailPreferenceController2
+                .KEY_EAP_SIM_SUBSCRIPTION_PREF)).thenReturn(mMockEapSimSubscriptionPref);
         when(mMockScreen.findPreference(WifiDetailPreferenceController2.KEY_MAC_ADDRESS_PREF))
                 .thenReturn(mMockMacAddressPref);
         when(mMockScreen.findPreference(WifiDetailPreferenceController2.KEY_IP_ADDRESS_PREF))
@@ -1582,6 +1588,82 @@
         verify(mMockHeaderController).setSummary(expired);
     }
 
+    @Test
+    public void refreshEapSimSubscription_nonEapSecurity_invisibleEapSimSubscriptionPref() {
+        setUpForDisconnectedNetwork();
+        when(mMockWifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_NONE);
+
+        displayAndResume();
+
+        verify(mMockEapSimSubscriptionPref, times(1)).setVisible(false);
+
+        when(mMockWifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_OWE);
+
+        displayAndResume();
+
+        verify(mMockEapSimSubscriptionPref, times(2)).setVisible(false);
+
+        when(mMockWifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_PSK);
+
+        displayAndResume();
+
+        verify(mMockEapSimSubscriptionPref, times(3)).setVisible(false);
+
+        when(mMockWifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_SAE);
+
+        displayAndResume();
+
+        verify(mMockEapSimSubscriptionPref, times(4)).setVisible(false);
+        verify(mMockEapSimSubscriptionPref, never()).setVisible(true);
+    }
+
+    @Test
+    public void refreshEapSimSubscription_nonSimEapMethod_invisibleEapSimSubscriptionPref() {
+        setUpForDisconnectedNetwork();
+        when(mMockWifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_EAP);
+        final WifiConfiguration mockWifiConfiguration = mock(WifiConfiguration.class);
+        final WifiEnterpriseConfig mockWifiEnterpriseConfig = mock(WifiEnterpriseConfig.class);
+        when(mockWifiEnterpriseConfig.isAuthenticationSimBased()).thenReturn(false);
+        mockWifiConfiguration.enterpriseConfig = mockWifiEnterpriseConfig;
+        when(mMockWifiEntry.getWifiConfiguration()).thenReturn(mockWifiConfiguration);
+
+        displayAndResume();
+
+        verify(mMockEapSimSubscriptionPref, times(1)).setVisible(false);
+    }
+
+    @Test
+    public void refreshEapSimSubscription_simEapMethod_visibleEapSimSubscriptionPref() {
+        setUpForDisconnectedNetwork();
+        when(mMockWifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_EAP);
+        final WifiConfiguration mockWifiConfiguration = mock(WifiConfiguration.class);
+        final WifiEnterpriseConfig mockWifiEnterpriseConfig = mock(WifiEnterpriseConfig.class);
+        when(mockWifiEnterpriseConfig.isAuthenticationSimBased()).thenReturn(true);
+        mockWifiConfiguration.enterpriseConfig = mockWifiEnterpriseConfig;
+        when(mMockWifiEntry.getWifiConfiguration()).thenReturn(mockWifiConfiguration);
+
+        displayAndResume();
+
+        verify(mMockEapSimSubscriptionPref).setVisible(true);
+    }
+
+    @Test
+    public void refreshEapSimSubscription_unknownCarrierId_noSimEapSimSubscriptionPref() {
+        setUpForDisconnectedNetwork();
+        when(mMockWifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_EAP);
+        final WifiConfiguration mockWifiConfiguration = mock(WifiConfiguration.class);
+        mockWifiConfiguration.carrierId = TelephonyManager.UNKNOWN_CARRIER_ID;
+        final WifiEnterpriseConfig mockWifiEnterpriseConfig = mock(WifiEnterpriseConfig.class);
+        when(mockWifiEnterpriseConfig.isAuthenticationSimBased()).thenReturn(true);
+        mockWifiConfiguration.enterpriseConfig = mockWifiEnterpriseConfig;
+        when(mMockWifiEntry.getWifiConfiguration()).thenReturn(mockWifiConfiguration);
+
+        displayAndResume();
+
+        verify(mMockEapSimSubscriptionPref).setVisible(true);
+        verify(mMockEapSimSubscriptionPref).setSummary(R.string.wifi_no_related_sim_card);
+    }
+
     private ActionButtonsPreference createMock() {
         final ActionButtonsPreference pref = mock(ActionButtonsPreference.class);
         when(pref.setButton1Text(anyInt())).thenReturn(pref);
diff --git a/tests/robotests/src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2Test.java b/tests/robotests/src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2Test.java
new file mode 100644
index 0000000..4b1a8ca
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2Test.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wifi.details2;
+
+import static com.android.settings.wifi.WifiSettings.WIFI_DIALOG_ID;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.settings.SettingsEnums;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+@RunWith(RobolectricTestRunner.class)
+public class WifiNetworkDetailsFragment2Test {
+
+    private WifiNetworkDetailsFragment2 mFragment;
+
+    @Before
+    public void setUp() {
+        mFragment = new WifiNetworkDetailsFragment2();
+    }
+
+    @Test
+    public void getMetricsCategory_shouldReturnWifiNetworkDetails() {
+        assertThat(mFragment.getMetricsCategory()).isEqualTo(SettingsEnums.WIFI_NETWORK_DETAILS);
+    }
+
+    @Test
+    public void getDialogMetricsCategory_withCorrectId_shouldReturnDialogWifiApEdit() {
+        assertThat(mFragment.getDialogMetricsCategory(WIFI_DIALOG_ID)).isEqualTo(
+                SettingsEnums.DIALOG_WIFI_AP_EDIT);
+    }
+
+    @Test
+    public void getDialogMetricsCategory_withWrongId_shouldReturnZero() {
+        assertThat(mFragment.getDialogMetricsCategory(-1 /* dialogId */)).isEqualTo(0);
+    }
+
+    @Test
+    public void onCreateOptionsMenu_shouldSetCorrectIcon() {
+        final Menu menu = mock(Menu.class);
+        final MenuItem menuItem = mock(MenuItem.class);
+        doReturn(menuItem).when(menu).add(anyInt(), eq(Menu.FIRST), anyInt(), anyInt());
+
+        mFragment.onCreateOptionsMenu(menu, mock(MenuInflater.class));
+
+        verify(menuItem).setIcon(com.android.internal.R.drawable.ic_mode_edit);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/wifi/dpp/WifiDppUtilsTest.java b/tests/robotests/src/com/android/settings/wifi/dpp/WifiDppUtilsTest.java
index 694088a..d8bcb59 100644
--- a/tests/robotests/src/com/android/settings/wifi/dpp/WifiDppUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/dpp/WifiDppUtilsTest.java
@@ -27,9 +27,7 @@
 import android.net.wifi.WifiConfiguration.KeyMgmt;
 import android.net.wifi.WifiManager;
 
-import com.android.settingslib.wifi.AccessPoint;
-
-import java.util.BitSet;
+import com.android.wifitrackerlib.WifiEntry;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -40,6 +38,8 @@
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.shadows.ShadowApplication;
 
+import java.util.BitSet;
+
 @RunWith(RobolectricTestRunner.class)
 public class WifiDppUtilsTest {
 
@@ -47,7 +47,7 @@
     private WifiManager mWifiManager;
 
     @Mock
-    private AccessPoint mAccessPoint;
+    private WifiEntry mWifiEntry;
 
     @Mock
     private WifiConfiguration mWifiConfiguration;
@@ -66,16 +66,16 @@
     @Test
     public void getConfiguratorQrCodeScannerIntentOrNull_hiddenSsidNetwork_hasHiddenSsidExtra() {
         when(mWifiManager.isEasyConnectSupported()).thenReturn(true);
-        when(mAccessPoint.isPasspoint()).thenReturn(false);
-        when(mAccessPoint.getSecurity()).thenReturn(AccessPoint.SECURITY_PSK);
-        when(mAccessPoint.getConfig()).thenReturn(mWifiConfiguration);
+        when(mWifiEntry.canEasyConnect()).thenReturn(true);
+        when(mWifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_PSK);
+        when(mWifiEntry.getWifiConfiguration()).thenReturn(mWifiConfiguration);
         mWifiConfiguration.SSID = "GuestNetwork";
         mWifiConfiguration.allowedKeyManagement = new BitSet();
         mWifiConfiguration.allowedKeyManagement.set(KeyMgmt.WPA_PSK);
         mWifiConfiguration.hiddenSSID = true;
 
         Intent intent = WifiDppUtils
-                .getConfiguratorQrCodeScannerIntentOrNull(mContext, mWifiManager, mAccessPoint);
+                .getConfiguratorQrCodeScannerIntentOrNull(mContext, mWifiManager, mWifiEntry);
 
         assertThat(intent.getBooleanExtra(WifiDppUtils.EXTRA_WIFI_HIDDEN_SSID, false))
                 .isEqualTo(true);
diff --git a/tests/robotests/src/com/android/settings/wifi/dpp/WifiNetworkListFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/dpp/WifiNetworkListFragmentTest.java
new file mode 100644
index 0000000..70f2b1a
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/wifi/dpp/WifiNetworkListFragmentTest.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wifi.dpp;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiManager;
+import android.os.HandlerThread;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.test.InstrumentationRegistry;
+
+import com.android.settingslib.wifi.WifiEntryPreference;
+import com.android.wifitrackerlib.SavedNetworkTracker;
+import com.android.wifitrackerlib.WifiEntry;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+
+import java.util.Arrays;
+
+@RunWith(RobolectricTestRunner.class)
+public class WifiNetworkListFragmentTest {
+    private WifiNetworkListFragment mWifiNetworkListFragment;
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(InstrumentationRegistry.getTargetContext());
+        mWifiNetworkListFragment = spy(new WifiNetworkListFragment());
+        doReturn(mContext).when(mWifiNetworkListFragment).getContext();
+        mWifiNetworkListFragment.mWifiManager = mock(WifiManager.class);
+        mWifiNetworkListFragment.mSavedNetworkTracker = mock(SavedNetworkTracker.class);
+        mWifiNetworkListFragment.mPreferenceGroup = mock(PreferenceCategory.class);
+        mWifiNetworkListFragment.mAddPreference = mock(Preference.class);
+        mWifiNetworkListFragment.mOnChooseNetworkListener =
+                mock(WifiNetworkListFragment.OnChooseNetworkListener.class);
+    }
+
+    @Test
+    public void onActivityResult_addNetworkRequestOk_shouldSaveNetwork() {
+        final WifiConfiguration wifiConfig = new WifiConfiguration();
+        final Intent intent = new Intent();
+        intent.putExtra(WifiNetworkListFragment.WIFI_CONFIG_KEY, wifiConfig);
+
+        mWifiNetworkListFragment.onActivityResult(WifiNetworkListFragment.ADD_NETWORK_REQUEST,
+                Activity.RESULT_OK, intent);
+
+        verify(mWifiNetworkListFragment.mWifiManager).save(eq(wifiConfig), any());
+    }
+
+    @Test
+    public void onSavedWifiEntriesChanged_noSavedWifiEntry_onlyAddNetworkPreference() {
+        when(mWifiNetworkListFragment.mSavedNetworkTracker.getSavedWifiEntries())
+                .thenReturn(Arrays.asList());
+
+        mWifiNetworkListFragment.onSavedWifiEntriesChanged();
+
+        verify(mWifiNetworkListFragment.mPreferenceGroup).addPreference(
+                mWifiNetworkListFragment.mAddPreference);
+    }
+
+    @Test
+    public void onSavedWifiEntriesChanged_openSavedWifiEntry_onlyAddNetworkPreference() {
+        final WifiEntry wifiEntry = mock(WifiEntry.class);
+        when(wifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_NONE);
+        when(mWifiNetworkListFragment.mSavedNetworkTracker.getSavedWifiEntries())
+                .thenReturn(Arrays.asList(wifiEntry));
+
+        mWifiNetworkListFragment.onSavedWifiEntriesChanged();
+
+        verify(mWifiNetworkListFragment.mPreferenceGroup).addPreference(
+                mWifiNetworkListFragment.mAddPreference);
+    }
+
+    @Test
+    public void onSavedWifiEntriesChanged_pskSavedWifiEntry_add2Preferences() {
+        final WifiEntry wifiEntry = mock(WifiEntry.class);
+        when(wifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_PSK);
+        when(mWifiNetworkListFragment.mSavedNetworkTracker.getSavedWifiEntries())
+                .thenReturn(Arrays.asList(wifiEntry));
+
+        mWifiNetworkListFragment.onSavedWifiEntriesChanged();
+
+        verify(mWifiNetworkListFragment.mPreferenceGroup, times(2)).addPreference(any());
+    }
+
+    @Test
+    public void onSavedWifiEntriesChanged_saeSavedWifiEntry_add2Preferences() {
+        final WifiEntry wifiEntry = mock(WifiEntry.class);
+        when(wifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_SAE);
+        when(mWifiNetworkListFragment.mSavedNetworkTracker.getSavedWifiEntries())
+                .thenReturn(Arrays.asList(wifiEntry));
+
+        mWifiNetworkListFragment.onSavedWifiEntriesChanged();
+
+        verify(mWifiNetworkListFragment.mPreferenceGroup, times(2)).addPreference(any());
+    }
+
+    @Test
+    public void onPreferenceClick_validWifiEntryPreference_onChooseNetwork() {
+        final WifiEntry wifiEntry = mock(WifiEntry.class);
+        when(wifiEntry.getSecurityString(true /* concise */)).thenReturn("WPA3");
+        final WifiConfiguration wifiConfig = mock(WifiConfiguration.class);
+        when(wifiConfig.getPrintableSsid()).thenReturn("ssid");
+        when(wifiEntry.getWifiConfiguration()).thenReturn(wifiConfig);
+        final WifiEntryPreference preference = new WifiEntryPreference(mContext, wifiEntry);
+
+        mWifiNetworkListFragment.onPreferenceClick(preference);
+
+        verify(mWifiNetworkListFragment.mOnChooseNetworkListener).onChooseNetwork(any());
+    }
+
+    @Test
+    public void onDestroy_quitWorkerThread() {
+        mWifiNetworkListFragment.mWorkerThread = mock(HandlerThread.class);
+
+        try {
+            mWifiNetworkListFragment.onDestroyView();
+        } catch (IllegalArgumentException e) {
+            // Ignore the exception from super class.
+        }
+
+        verify(mWifiNetworkListFragment.mWorkerThread).quit();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java
index 9731689..10d76d3 100644
--- a/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java
@@ -106,12 +106,12 @@
         mController.displayPreference(mScreen);
         verify(mWifiDirectPreference).setEnabled(true);
 
-        Intent dummyIntent = new Intent();
-        mController.mReceiver.onReceive(mContext, dummyIntent);
+        Intent fakeIntent = new Intent();
+        mController.mReceiver.onReceive(mContext, fakeIntent);
         verify(mWifiDirectPreference, times(2)).setEnabled(true);
 
         when(mWifiManager.isWifiEnabled()).thenReturn(false);
-        mController.mReceiver.onReceive(mContext, dummyIntent);
+        mController.mReceiver.onReceive(mContext, fakeIntent);
         verify(mWifiDirectPreference).setEnabled(false);
     }
 
@@ -136,12 +136,12 @@
     public void updateState_withLocationDisabled_preferenceShouldBeDisable() {
         when(mWifiManager.isWifiEnabled()).thenReturn(true);
         when(mLocationManager.isLocationEnabled()).thenReturn(true);
-        Intent dummyIntent = new Intent();
+        Intent fakeIntent = new Intent();
         mController.displayPreference(mScreen);
         verify(mWifiDirectPreference).setEnabled(true);
 
         when(mLocationManager.isLocationEnabled()).thenReturn(false);
-        mController.mLocationReceiver.onReceive(mContext, dummyIntent);
+        mController.mLocationReceiver.onReceive(mContext, fakeIntent);
         verify(mWifiDirectPreference).setEnabled(false);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsPreferenceControllerTest.java
deleted file mode 100644
index 483e259..0000000
--- a/tests/robotests/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsPreferenceControllerTest.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi.savedaccesspoints;
-
-import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiManager;
-
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
-
-import com.android.settings.testutils.shadow.ShadowAccessPoint;
-import com.android.settings.testutils.shadow.ShadowWifiManager;
-import com.android.settingslib.wifi.AccessPointPreference;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(shadows = {ShadowWifiManager.class})
-public class SavedAccessPointsPreferenceControllerTest {
-
-    @Mock
-    private PreferenceScreen mPreferenceScreen;
-    @Mock
-    private PreferenceCategory mPreferenceCategory;
-
-    private Context mContext;
-    private WifiManager mWifiManager;
-    private SavedAccessPointsWifiSettings mSettings;
-    private SavedAccessPointsPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
-        mWifiManager = mContext.getSystemService(WifiManager.class);
-        mSettings = spy(new SavedAccessPointsWifiSettings());
-        mController = spy(new SavedAccessPointsPreferenceController(mContext, "test_key"));
-        mController.setHost(mSettings);
-
-        when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
-                .thenReturn(mPreferenceCategory);
-        when(mPreferenceCategory.getContext()).thenReturn(mContext);
-    }
-
-    @Test
-    public void getAvailability_noSavedAccessPoint_shouldNotAvailable() {
-        mController.mAccessPoints = new ArrayList<>();
-
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
-    }
-
-    @Test
-    public void getAvailability_shouldRefreshSavedAccessPoints() {
-        mController.getAvailabilityStatus();
-
-        verify(mController).refreshSavedAccessPoints();
-    }
-
-    @Test
-    @Config(shadows = ShadowAccessPoint.class)
-    public void displayPreference_oneAccessPoint_shouldListNonSubscribedAPs() {
-        final WifiConfiguration config = new WifiConfiguration();
-        config.SSID = "SSID";
-        config.BSSID = "BSSID";
-        config.networkId = 2;
-        mWifiManager.addNetwork(config);
-
-        final ArgumentCaptor<AccessPointPreference> captor =
-                ArgumentCaptor.forClass(AccessPointPreference.class);
-        mController.displayPreference(mPreferenceScreen);
-
-        verify(mPreferenceCategory).addPreference(captor.capture());
-
-        final AccessPointPreference pref = captor.getValue();
-        assertThat(pref.getTitle()).isEqualTo(config.SSID);
-    }
-
-    @Test
-    @Config(shadows = ShadowAccessPoint.class)
-    public void displayPreference_onePasspoint_shouldNotListSubscribedAPs() {
-        mWifiManager.addOrUpdatePasspointConfiguration(
-                SubscribedAccessPointsPreferenceControllerTest.createMockPasspointConfiguration());
-
-        mController.displayPreference(mPreferenceScreen);
-
-        verify(mPreferenceCategory, never()).addPreference(any(AccessPointPreference.class));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsWifiSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsWifiSettingsTest.java
deleted file mode 100644
index 923f05e..0000000
--- a/tests/robotests/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsWifiSettingsTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi.savedaccesspoints;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
-import com.android.settingslib.core.AbstractPreferenceController;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-
-@RunWith(RobolectricTestRunner.class)
-public class SavedAccessPointsWifiSettingsTest {
-
-    @Mock
-    private SubscribedAccessPointsPreferenceController mSubscribedApController;
-    @Mock
-    private SavedAccessPointsPreferenceController mSavedApController;
-
-    private TestFragment mSettings;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mSettings = spy(new TestFragment());
-
-        doReturn(mSubscribedApController).when(mSettings)
-                .use(SubscribedAccessPointsPreferenceController.class);
-        doReturn(mSavedApController).when(mSettings)
-                .use(SavedAccessPointsPreferenceController.class);
-    }
-
-    @Test
-    public void verifyConstants() {
-        assertThat(mSettings.getMetricsCategory()).isEqualTo(MetricsEvent.WIFI_SAVED_ACCESS_POINTS);
-        assertThat(mSettings.getPreferenceScreenResId())
-                .isEqualTo(R.xml.wifi_display_saved_access_points);
-    }
-
-    public static class TestFragment extends SavedAccessPointsWifiSettings {
-
-        public <T extends AbstractPreferenceController> T use(Class<T> clazz) {
-            return super.use(clazz);
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/savedaccesspoints/SubscribedAccessPointsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/savedaccesspoints/SubscribedAccessPointsPreferenceControllerTest.java
deleted file mode 100644
index 74f94e9..0000000
--- a/tests/robotests/src/com/android/settings/wifi/savedaccesspoints/SubscribedAccessPointsPreferenceControllerTest.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi.savedaccesspoints;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.net.wifi.EAPConstants;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiManager;
-import android.net.wifi.hotspot2.PasspointConfiguration;
-import android.net.wifi.hotspot2.pps.Credential;
-import android.net.wifi.hotspot2.pps.HomeSp;
-
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
-
-import com.android.settings.testutils.shadow.ShadowAccessPoint;
-import com.android.settings.testutils.shadow.ShadowWifiManager;
-import com.android.settingslib.wifi.AccessPointPreference;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(shadows = {ShadowWifiManager.class})
-public class SubscribedAccessPointsPreferenceControllerTest {
-
-    @Mock
-    private PreferenceScreen mPreferenceScreen;
-    @Mock
-    private PreferenceCategory mPreferenceCategory;
-
-    private Context mContext;
-    private WifiManager mWifiManager;
-    private SavedAccessPointsWifiSettings mSettings;
-    private SubscribedAccessPointsPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
-        mWifiManager = mContext.getSystemService(WifiManager.class);
-        mSettings = spy(new SavedAccessPointsWifiSettings());
-        mController = spy(new SubscribedAccessPointsPreferenceController(mContext, "test_key"));
-        mController.setHost(mSettings);
-
-        when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
-                .thenReturn(mPreferenceCategory);
-        when(mPreferenceCategory.getContext()).thenReturn(mContext);
-    }
-
-    @Test
-    @Config(shadows = ShadowAccessPoint.class)
-    public void displayPreference_oneAccessPoint_shouldNotListNonSubscribedAPs() {
-        final WifiConfiguration config = new WifiConfiguration();
-        config.SSID = "SSID";
-        config.BSSID = "BSSID";
-        config.networkId = 2;
-        mWifiManager.addNetwork(config);
-
-        mController.displayPreference(mPreferenceScreen);
-
-        verify(mPreferenceCategory, never()).addPreference(any(AccessPointPreference.class));
-    }
-
-    @Test
-    @Config(shadows = ShadowAccessPoint.class)
-    public void displayPreference_onePasspoint_shouldListSubscribedAPs() {
-        mWifiManager.addOrUpdatePasspointConfiguration(createMockPasspointConfiguration());
-
-        mController.displayPreference(mPreferenceScreen);
-
-        final ArgumentCaptor<AccessPointPreference> captor =
-                ArgumentCaptor.forClass(AccessPointPreference.class);
-        verify(mPreferenceCategory).addPreference(captor.capture());
-
-        final AccessPointPreference pref = captor.getValue();
-        assertThat(pref.getTitle()).isEqualTo("TESTPASSPOINT");
-    }
-
-    public static PasspointConfiguration createMockPasspointConfiguration() {
-        final PasspointConfiguration config = new PasspointConfiguration();
-        final HomeSp homeSp = new HomeSp();
-        homeSp.setFqdn("FQDN");
-        homeSp.setFriendlyName("TESTPASSPOINT");
-        config.setHomeSp(homeSp);
-        final Credential.SimCredential simCredential = new Credential.SimCredential();
-        final Credential credential = new Credential();
-        credential.setRealm("test.example.com");
-        simCredential.setImsi("12345*");
-        simCredential.setEapType(EAPConstants.EAP_SIM);
-        credential.setSimCredential(simCredential);
-        config.setCredential(credential);
-        return config;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/savedaccesspoints2/SavedAccessPointsPreferenceController2Test.java b/tests/robotests/src/com/android/settings/wifi/savedaccesspoints2/SavedAccessPointsPreferenceController2Test.java
index acc6543..7b7a3b1 100644
--- a/tests/robotests/src/com/android/settings/wifi/savedaccesspoints2/SavedAccessPointsPreferenceController2Test.java
+++ b/tests/robotests/src/com/android/settings/wifi/savedaccesspoints2/SavedAccessPointsPreferenceController2Test.java
@@ -21,8 +21,12 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -119,4 +123,23 @@
 
         assertThat(mPreferenceCategory.getPreferenceCount()).isEqualTo(0);
     }
+
+    @Test
+    public void onPreferenceClick_shouldCallShowWifiPage() {
+        mContext = spy(RuntimeEnvironment.application);
+        doNothing().when(mContext).startActivity(any());
+        doReturn(mContext).when(mSettings).getContext();
+
+        final String title = "ssid_title";
+        final String key = "key";
+        final WifiEntry mockWifiEntry = mock(WifiEntry.class);
+        when(mockWifiEntry.getTitle()).thenReturn(title);
+        when(mockWifiEntry.getKey()).thenReturn(key);
+        final WifiEntryPreference preference = new WifiEntryPreference(mContext, mockWifiEntry);
+        preference.setKey(key);
+
+        mController.onPreferenceClick(preference);
+
+        verify(mSettings, times(1)).showWifiPage(key, title);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/wifi/savedaccesspoints2/SavedAccessPointsWifiSettings2Test.java b/tests/robotests/src/com/android/settings/wifi/savedaccesspoints2/SavedAccessPointsWifiSettings2Test.java
index ab1b51c..657d3a7 100644
--- a/tests/robotests/src/com/android/settings/wifi/savedaccesspoints2/SavedAccessPointsWifiSettings2Test.java
+++ b/tests/robotests/src/com/android/settings/wifi/savedaccesspoints2/SavedAccessPointsWifiSettings2Test.java
@@ -18,8 +18,18 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import android.content.Context;
+import android.os.Bundle;
+
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
@@ -30,7 +40,9 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
 
 @RunWith(RobolectricTestRunner.class)
 public class SavedAccessPointsWifiSettings2Test {
@@ -41,11 +53,15 @@
     private SavedAccessPointsPreferenceController2 mSavedApController;
 
     private TestFragment mSettings;
+    private Context mContext;
+    private FragmentActivity mActivity;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
         mSettings = spy(new TestFragment());
+        mActivity = Robolectric.setupActivity(FragmentActivity.class);
 
         doReturn(mSubscribedApController).when(mSettings)
                 .use(SubscribedAccessPointsPreferenceController2.class);
@@ -60,6 +76,54 @@
                 .isEqualTo(R.xml.wifi_display_saved_access_points2);
     }
 
+    @Test
+    public void getTag_shouldReturnRightTag() {
+        assertThat(mSettings.getLogTag()).isEqualTo(SavedAccessPointsWifiSettings2.TAG);
+    }
+
+    @Test
+    public void onAttach_shouldCallSavedControllerSetHost() {
+        mSettings.onAttach(mContext);
+
+        verify(mSavedApController, times(1)).setHost(any());
+    }
+
+    @Test
+    public void onAttach_shouldCallSubscriptionControllerSetHost() {
+        mSettings.onAttach(mContext);
+
+        verify(mSubscribedApController, times(1)).setHost(any());
+    }
+
+    @Test
+    public void onCreate_shouldNewSavedNetworkTracker() {
+        mSettings = new TestFragment();
+        final FragmentManager fragmentManager = mActivity.getSupportFragmentManager();
+        final FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
+        fragmentTransaction.add(mSettings, null /* tag */);
+        fragmentTransaction.commit();
+        final Bundle bundle = new Bundle();
+
+        mSettings.onCreate(bundle);
+
+        assertThat(mSettings.mSavedNetworkTracker).isNotNull();
+    }
+
+    @Test
+    public void onDestroy_shouldTerminateWorkerThread() {
+        mSettings = new TestFragment();
+        final FragmentManager fragmentManager = mActivity.getSupportFragmentManager();
+        final FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
+        fragmentTransaction.add(mSettings, null /* tag */);
+        fragmentTransaction.commit();
+        final Bundle bundle = new Bundle();
+        mSettings.onCreate(bundle);
+
+        mSettings.onDestroy();
+
+        assertThat(mSettings.mWorkerThread.getState()).isEqualTo(Thread.State.TERMINATED);
+    }
+
     public static class TestFragment extends SavedAccessPointsWifiSettings2 {
 
         public <T extends AbstractPreferenceController> T use(Class<T> clazz) {
diff --git a/tests/robotests/src/com/android/settings/wifi/savedaccesspoints2/SubscribedAccessPointsPreferenceController2Test.java b/tests/robotests/src/com/android/settings/wifi/savedaccesspoints2/SubscribedAccessPointsPreferenceController2Test.java
new file mode 100644
index 0000000..93323fb
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/wifi/savedaccesspoints2/SubscribedAccessPointsPreferenceController2Test.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wifi.savedaccesspoints2;
+
+import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+import java.util.ArrayList;
+
+@RunWith(RobolectricTestRunner.class)
+public class SubscribedAccessPointsPreferenceController2Test {
+
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+    @Mock
+    private PreferenceCategory mPreferenceCategory;
+
+    private Context mContext;
+    private SavedAccessPointsWifiSettings2 mSettings;
+    private SubscribedAccessPointsPreferenceController2 mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mSettings = spy(new SavedAccessPointsWifiSettings2());
+        mController = spy(new SubscribedAccessPointsPreferenceController2(mContext, "test_key"));
+        mController.setHost(mSettings);
+
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+                .thenReturn(mPreferenceCategory);
+        when(mPreferenceCategory.getContext()).thenReturn(mContext);
+    }
+
+    @Test
+    public void getAvailability_noSubscripbedAccessPoint_shouldNotAvailable() {
+        mController.mWifiEntries = new ArrayList<>();
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+    }
+}
+
diff --git a/tests/robotests/src/com/android/settings/wifi/slice/ConnectToWifiHandlerTest.java b/tests/robotests/src/com/android/settings/wifi/slice/ConnectToWifiHandlerTest.java
index ac1384f..829ec8f 100644
--- a/tests/robotests/src/com/android/settings/wifi/slice/ConnectToWifiHandlerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/slice/ConnectToWifiHandlerTest.java
@@ -26,95 +26,69 @@
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiConfiguration.NetworkSelectionStatus;
-import android.net.wifi.WifiManager;
+import android.content.Intent;
 
-import com.android.settings.testutils.shadow.ShadowWifiManager;
-import com.android.settingslib.wifi.AccessPoint;
+import com.android.settings.wifi.WifiDialogActivity;
+import com.android.wifitrackerlib.WifiEntry;
+import com.android.wifitrackerlib.WifiEntry.ConnectCallback;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(shadows = ShadowWifiManager.class)
 public class ConnectToWifiHandlerTest {
 
     private static final String AP_SSID = "\"ap\"";
     private Context mContext;
     private ConnectToWifiHandler mHandler;
-    private WifiConfiguration mWifiConfig;
     @Mock
-    private AccessPoint mAccessPoint;
+    private WifiScanWorker mWifiScanWorker;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
 
-        mContext = RuntimeEnvironment.application;
-        mHandler = new ConnectToWifiHandler();
-        mWifiConfig = spy(new WifiConfiguration());
-        mWifiConfig.SSID = AP_SSID;
-        doReturn(mWifiConfig).when(mAccessPoint).getConfig();
+        mContext = spy(RuntimeEnvironment.application);
+        mHandler = spy(new ConnectToWifiHandler());
+        doReturn(mWifiScanWorker).when(mHandler).getWifiScanWorker(any());
     }
 
     @Test
-    public void connect_shouldConnectToUnsavedOpenNetwork() {
-        when(mAccessPoint.isSaved()).thenReturn(false);
-        when(mAccessPoint.getSecurity()).thenReturn(AccessPoint.SECURITY_NONE);
+    public void onReceive_nonNullKeyAndUri_shouldConnectWifintry() {
+        final Intent intent = new Intent();
+        final String key = "key";
+        intent.putExtra(ConnectToWifiHandler.KEY_CHOSEN_WIFIENTRY_KEY, key);
+        intent.putExtra(ConnectToWifiHandler.KEY_WIFI_SLICE_URI,
+                com.android.settings.slices.CustomSliceRegistry.WIFI_SLICE_URI);
+        final WifiEntry wifiEntry = mock(WifiEntry.class);
+        when(mWifiScanWorker.getWifiEntry(key)).thenReturn(wifiEntry);
 
-        mHandler.connect(mContext, mAccessPoint);
+        mHandler.onReceive(mContext, intent);
 
-        assertThat(ShadowWifiManager.get().savedWifiConfig.SSID).isEqualTo(AP_SSID);
+        verify(wifiEntry).connect(any());
     }
 
     @Test
-    public void connect_shouldStartOsuProvisioning() {
-        when(mAccessPoint.isSaved()).thenReturn(false);
-        when(mAccessPoint.isOsuProvider()).thenReturn(true);
+    public void onConnectResult_failNoConfig_shouldStartActivity() {
+        final String key = "key";
+        final WifiEntry wifiEntry = mock(WifiEntry.class);
+        when(wifiEntry.getKey()).thenReturn(key);
+        final ConnectToWifiHandler.WifiEntryConnectCallback callback =
+                spy(new ConnectToWifiHandler.WifiEntryConnectCallback(mContext, wifiEntry));
 
-        mHandler.connect(mContext, mAccessPoint);
+        callback.onConnectResult(ConnectCallback.CONNECT_STATUS_FAILURE_NO_CONFIG);
 
-        verify(mAccessPoint).startOsuProvisioning(any(WifiManager.ActionListener.class));
-    }
-
-
-    @Test
-    public void connect_shouldConnectWithPasspointProvider() {
-        when(mAccessPoint.isSaved()).thenReturn(false);
-        when(mAccessPoint.isPasspoint()).thenReturn(true);
-
-        mHandler.connect(mContext, mAccessPoint);
-
-        assertThat(ShadowWifiManager.get().savedWifiConfig.SSID).isEqualTo(AP_SSID);
-    }
-
-    @Test
-    public void connect_shouldConnectToSavedSecuredNetwork() {
-        when(mAccessPoint.isSaved()).thenReturn(true);
-        when(mAccessPoint.getSecurity()).thenReturn(AccessPoint.SECURITY_PSK);
-        final NetworkSelectionStatus status = mock(NetworkSelectionStatus.class);
-        when(status.hasEverConnected()).thenReturn(true);
-        when(mWifiConfig.getNetworkSelectionStatus()).thenReturn(status);
-
-        mHandler.connect(mContext, mAccessPoint);
-
-        assertThat(ShadowWifiManager.get().savedWifiConfig.SSID).isEqualTo(AP_SSID);
-    }
-
-    @Test
-    public void connect_shouldNotConnectToUnsavedSecuredNetwork() {
-        when(mAccessPoint.isSaved()).thenReturn(false);
-        when(mAccessPoint.getSecurity()).thenReturn(AccessPoint.SECURITY_PSK);
-
-        mHandler.connect(mContext, mAccessPoint);
-
-        assertThat(ShadowWifiManager.get().savedWifiConfig).isNull();
+        final ArgumentCaptor<Intent> argument = ArgumentCaptor.forClass(Intent.class);
+        verify(mContext).startActivity(argument.capture());
+        assertThat(argument.getValue().getStringExtra(WifiDialogActivity.KEY_CHOSEN_WIFIENTRY_KEY))
+                .isEqualTo(key);
+        assertThat(argument.getValue().getFlags() & Intent.FLAG_ACTIVITY_NEW_TASK)
+                .isEqualTo(Intent.FLAG_ACTIVITY_NEW_TASK);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/wifi/slice/ContextualWifiScanWorkerTest.java b/tests/robotests/src/com/android/settings/wifi/slice/ContextualWifiScanWorkerTest.java
deleted file mode 100644
index 0e52520..0000000
--- a/tests/robotests/src/com/android/settings/wifi/slice/ContextualWifiScanWorkerTest.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.wifi.slice;
-
-import static com.android.settings.slices.CustomSliceRegistry.CONTEXTUAL_WIFI_SLICE_URI;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-
-import android.content.Context;
-import android.content.Intent;
-import android.net.ConnectivityManager;
-import android.net.ConnectivityManager.NetworkCallback;
-import android.net.Network;
-import android.net.wifi.WifiManager;
-import android.os.UserHandle;
-
-import com.android.settings.testutils.shadow.ShadowWifiManager;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(shadows = {
-        ShadowWifiManager.class,
-        WifiScanWorkerTest.ShadowWifiTracker.class,
-})
-public class ContextualWifiScanWorkerTest {
-
-    private Context mContext;
-    private WifiManager mWifiManager;
-    private ConnectivityManager mConnectivityManager;
-    private ContextualWifiScanWorker mWifiScanWorker;
-    private ConnectToWifiHandler mConnectToWifiHandler;
-
-    @Before
-    public void setUp() {
-        mContext = spy(RuntimeEnvironment.application);
-        mWifiManager = mContext.getSystemService(WifiManager.class);
-        mWifiManager.setWifiEnabled(true);
-
-        mConnectivityManager = mContext.getSystemService(ConnectivityManager.class);
-        mWifiScanWorker = new ContextualWifiScanWorker(mContext, CONTEXTUAL_WIFI_SLICE_URI);
-        mConnectToWifiHandler = new ConnectToWifiHandler();
-    }
-
-    @After
-    public void tearDown() {
-        mWifiScanWorker.clearClickedWifi();
-    }
-
-    @Test
-    public void NetworkCallback_onCapabilitiesChanged_sliceIsUnpinned_shouldSendBroadcast() {
-        final Intent intent = WifiScanWorkerTest.getIntentWithAccessPoint("ap1");
-        WifiScanWorkerTest.setConnectionInfoSSID("ap1");
-        final Network network = mConnectivityManager.getActiveNetwork();
-        mWifiScanWorker.registerNetworkCallback(network);
-        final NetworkCallback callback = mWifiScanWorker.mNetworkCallback;
-
-        mWifiScanWorker.onSlicePinned();
-        mConnectToWifiHandler.onReceive(mContext, intent);
-        mWifiScanWorker.onSliceUnpinned();
-        callback.onCapabilitiesChanged(network,
-                WifiSliceTest.makeCaptivePortalNetworkCapabilities());
-
-        verify(mContext).sendBroadcastAsUser(any(Intent.class), eq(UserHandle.CURRENT));
-    }
-
-    @Test
-    public void NetworkCallback_onCapabilitiesChanged_newSession_shouldNotSendBroadcast() {
-        final Intent intent = WifiScanWorkerTest.getIntentWithAccessPoint("ap1");
-        WifiScanWorkerTest.setConnectionInfoSSID("ap1");
-        final Network network = mConnectivityManager.getActiveNetwork();
-        mWifiScanWorker.registerNetworkCallback(network);
-
-        mConnectToWifiHandler.onReceive(mContext, intent);
-        ContextualWifiScanWorker.newVisibleUiSession();
-        mWifiScanWorker.mNetworkCallback.onCapabilitiesChanged(network,
-                WifiSliceTest.makeCaptivePortalNetworkCapabilities());
-
-        verify(mContext, never()).sendBroadcastAsUser(any(Intent.class), eq(UserHandle.CURRENT));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/slice/WifiScanWorkerTest.java b/tests/robotests/src/com/android/settings/wifi/slice/WifiScanWorkerTest.java
index 3319543..395048c 100644
--- a/tests/robotests/src/com/android/settings/wifi/slice/WifiScanWorkerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/slice/WifiScanWorkerTest.java
@@ -17,216 +17,89 @@
 package com.android.settings.wifi.slice;
 
 import static com.android.settings.slices.CustomSliceRegistry.WIFI_SLICE_URI;
-import static com.android.settings.wifi.WifiDialogActivity.KEY_ACCESS_POINT_STATE;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.net.ConnectivityManager;
-import android.net.ConnectivityManager.NetworkCallback;
-import android.net.Network;
-import android.net.NetworkInfo;
-import android.net.NetworkInfo.DetailedState;
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
-import android.os.Bundle;
-import android.os.UserHandle;
+import androidx.lifecycle.Lifecycle;
 
-import com.android.settings.slices.ShadowSliceBackgroundWorker;
-import com.android.settings.testutils.shadow.ShadowWifiManager;
-import com.android.settingslib.wifi.AccessPoint;
-import com.android.settingslib.wifi.WifiTracker;
+import com.android.wifitrackerlib.WifiEntry;
+import com.android.wifitrackerlib.WifiPickerTracker;
 
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-import org.robolectric.shadows.ShadowNetworkInfo;
 
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.List;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(shadows = {ShadowSliceBackgroundWorker.class, ShadowWifiManager.class,
-        WifiScanWorkerTest.ShadowWifiTracker.class})
 public class WifiScanWorkerTest {
 
-    private Context mContext;
-    private ContentResolver mResolver;
-    private WifiManager mWifiManager;
-    private ConnectivityManager mConnectivityManager;
     private WifiScanWorker mWifiScanWorker;
-    private ConnectToWifiHandler mConnectToWifiHandler;
+    @Mock
+    WifiPickerTracker mWifiPickerTracker;
 
     @Before
     public void setUp() {
-        mContext = spy(RuntimeEnvironment.application);
-        mResolver = mock(ContentResolver.class);
-        doReturn(mResolver).when(mContext).getContentResolver();
-        mWifiManager = mContext.getSystemService(WifiManager.class);
-        mWifiManager.setWifiEnabled(true);
+        MockitoAnnotations.initMocks(this);
 
-        mConnectivityManager = mContext.getSystemService(ConnectivityManager.class);
-        mWifiScanWorker = new WifiScanWorker(mContext, WIFI_SLICE_URI);
-        mConnectToWifiHandler = new ConnectToWifiHandler();
-    }
-
-    @After
-    public void tearDown() {
-        mWifiScanWorker.clearClickedWifi();
+        mWifiScanWorker = new WifiScanWorker(RuntimeEnvironment.application, WIFI_SLICE_URI);
+        mWifiScanWorker.mWifiPickerTracker = mWifiPickerTracker;
     }
 
     @Test
-    public void onWifiStateChanged_shouldNotifyChange() {
-        mWifiScanWorker.onWifiStateChanged(WifiManager.WIFI_STATE_DISABLED);
-
-        verify(mResolver).notifyChange(WIFI_SLICE_URI, null);
+    public void onConstructor_shouldBeInCreatedState() {
+        assertThat(mWifiScanWorker.getLifecycle().getCurrentState())
+                .isEqualTo(Lifecycle.State.CREATED);
     }
 
     @Test
-    public void AccessPointList_sameState_shouldBeTheSame() {
-        final AccessPoint ap1 = createAccessPoint(DetailedState.CONNECTED);
-        final AccessPoint ap2 = createAccessPoint(DetailedState.CONNECTED);
-
-        assertThat(mWifiScanWorker.areListsTheSame(Arrays.asList(ap1), Arrays.asList(ap2)))
-                .isTrue();
-    }
-
-    @Test
-    public void AccessPointList_differentState_shouldBeDifferent() {
-        final AccessPoint ap1 = createAccessPoint(DetailedState.CONNECTING);
-        final AccessPoint ap2 = createAccessPoint(DetailedState.CONNECTED);
-
-        assertThat(mWifiScanWorker.areListsTheSame(Arrays.asList(ap1), Arrays.asList(ap2)))
-                .isFalse();
-    }
-
-    @Test
-    public void AccessPointList_differentListLength_shouldBeDifferent() {
-        final AccessPoint ap1 = createAccessPoint(DetailedState.CONNECTED);
-        final AccessPoint ap2 = createAccessPoint(DetailedState.CONNECTED);
-        final List<AccessPoint> list = new ArrayList<>();
-        list.add(ap1);
-        list.add(ap2);
-
-        assertThat(mWifiScanWorker.areListsTheSame(list, Arrays.asList(ap1))).isFalse();
-    }
-
-    @Test
-    public void NetworkCallback_onCapabilitiesChanged_shouldNotifyChange() {
-        final Network network = mConnectivityManager.getActiveNetwork();
-        mWifiScanWorker.registerNetworkCallback(network);
-
-        mWifiScanWorker.mNetworkCallback.onCapabilitiesChanged(network,
-                WifiSliceTest.makeCaptivePortalNetworkCapabilities());
-
-        verify(mResolver).notifyChange(WIFI_SLICE_URI, null);
-    }
-
-    @Test
-    public void NetworkCallback_onCapabilitiesChanged_isClickedWifi_shouldSendBroadcast() {
-        final Intent intent = getIntentWithAccessPoint("ap1");
-        setConnectionInfoSSID("ap1");
-        final Network network = mConnectivityManager.getActiveNetwork();
-        mWifiScanWorker.registerNetworkCallback(network);
-
-        mConnectToWifiHandler.onReceive(mContext, intent);
-        mWifiScanWorker.mNetworkCallback.onCapabilitiesChanged(network,
-                WifiSliceTest.makeCaptivePortalNetworkCapabilities());
-
-        verify(mContext).sendBroadcastAsUser(any(Intent.class), eq(UserHandle.CURRENT));
-    }
-
-    @Test
-    public void NetworkCallback_onCapabilitiesChanged_isNotClickedWifi_shouldNotSendBroadcast() {
-        final Intent intent = getIntentWithAccessPoint("ap1");
-        setConnectionInfoSSID("ap2");
-        final Network network = mConnectivityManager.getActiveNetwork();
-        mWifiScanWorker.registerNetworkCallback(network);
-
-        mConnectToWifiHandler.onReceive(mContext, intent);
-        mWifiScanWorker.mNetworkCallback.onCapabilitiesChanged(network,
-                WifiSliceTest.makeCaptivePortalNetworkCapabilities());
-
-        verify(mContext, never()).sendBroadcastAsUser(any(Intent.class), eq(UserHandle.CURRENT));
-    }
-
-    @Test
-    public void NetworkCallback_onCapabilitiesChanged_neverClickWifi_shouldNotSendBroadcast() {
-        setConnectionInfoSSID("ap1");
-        final Network network = mConnectivityManager.getActiveNetwork();
-        mWifiScanWorker.registerNetworkCallback(network);
-
-        mWifiScanWorker.mNetworkCallback.onCapabilitiesChanged(network,
-                WifiSliceTest.makeCaptivePortalNetworkCapabilities());
-
-        verify(mContext, never()).sendBroadcastAsUser(any(Intent.class), eq(UserHandle.CURRENT));
-    }
-
-    @Test
-    public void NetworkCallback_onCapabilitiesChanged_sliceIsUnpinned_shouldNotSendBroadcast() {
-        final Intent intent = getIntentWithAccessPoint("ap1");
-        setConnectionInfoSSID("ap1");
-        final Network network = mConnectivityManager.getActiveNetwork();
-        mWifiScanWorker.registerNetworkCallback(network);
-        final NetworkCallback callback = mWifiScanWorker.mNetworkCallback;
-
+    public void onSlicePinned_shouldBeInResumedState() {
         mWifiScanWorker.onSlicePinned();
-        mConnectToWifiHandler.onReceive(mContext, intent);
+
+        assertThat(mWifiScanWorker.getLifecycle().getCurrentState())
+                .isEqualTo(Lifecycle.State.RESUMED);
+    }
+
+    @Test
+    public void onSliceUnpinned_shouldBeInCreatedState() {
         mWifiScanWorker.onSliceUnpinned();
-        callback.onCapabilitiesChanged(network,
-                WifiSliceTest.makeCaptivePortalNetworkCapabilities());
 
-        verify(mContext, never()).sendBroadcastAsUser(any(Intent.class), eq(UserHandle.CURRENT));
+        assertThat(mWifiScanWorker.getLifecycle().getCurrentState())
+                .isEqualTo(Lifecycle.State.CREATED);
     }
 
-    static Intent getIntentWithAccessPoint(String ssid) {
-        final Bundle savedState = new Bundle();
-        savedState.putString("key_ssid", ssid);
-        return new Intent().putExtra(KEY_ACCESS_POINT_STATE, savedState);
+    @Test
+    public void close_shouldBeInDestroyedState() {
+        mWifiScanWorker.close();
+
+        assertThat(mWifiScanWorker.getLifecycle().getCurrentState())
+                .isEqualTo(Lifecycle.State.DESTROYED);
     }
 
-    static void setConnectionInfoSSID(String ssid) {
-        final WifiInfo wifiInfo = mock(WifiInfo.class);
-        when(wifiInfo.getSSID()).thenReturn(ssid);
-        ShadowWifiManager.get().setConnectionInfo(wifiInfo);
+    @Test
+    public void getWifiEntry_connectedWifiKey_shouldGetConnectedWifi() {
+        final String key = "key";
+        final WifiEntry connectedWifiEntry = mock(WifiEntry.class);
+        when(connectedWifiEntry.getKey()).thenReturn(key);
+        when(mWifiPickerTracker.getConnectedWifiEntry()).thenReturn(connectedWifiEntry);
+
+        assertThat(mWifiScanWorker.getWifiEntry(key)).isEqualTo(connectedWifiEntry);
     }
 
-    private AccessPoint createAccessPoint(String ssid, DetailedState detailedState) {
-        final NetworkInfo info = ShadowNetworkInfo.newInstance(detailedState, 1 /* type */,
-                0 /*subType */, true /* isAvailable */, true /* isConnected */);
-        final Bundle savedState = new Bundle();
-        savedState.putString("key_ssid", ssid);
-        savedState.putParcelable("key_networkinfo", info);
-        return new AccessPoint(mContext, savedState);
-    }
+    @Test
+    public void getWifiEntry_reachableWifiKey_shouldGetReachableWifi() {
+        final String key = "key";
+        final WifiEntry reachableWifiEntry = mock(WifiEntry.class);
+        when(reachableWifiEntry.getKey()).thenReturn(key);
+        when(mWifiPickerTracker.getWifiEntries()).thenReturn(Arrays.asList(reachableWifiEntry));
 
-    private AccessPoint createAccessPoint(DetailedState detailedState) {
-        return createAccessPoint("ap", detailedState);
-    }
-
-    @Implements(WifiTracker.class)
-    public static class ShadowWifiTracker {
-        @Implementation
-        public void onStart() {
-            // do nothing
-        }
+        assertThat(mWifiScanWorker.getWifiEntry(key)).isEqualTo(reachableWifiEntry);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/wifi/slice/WifiSliceTest.java b/tests/robotests/src/com/android/settings/wifi/slice/WifiSliceTest.java
index ad74a32..5431540 100644
--- a/tests/robotests/src/com/android/settings/wifi/slice/WifiSliceTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/slice/WifiSliceTest.java
@@ -23,17 +23,14 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
 
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
-import android.net.ConnectivityManager;
-import android.net.NetworkCapabilities;
-import android.net.NetworkInfo;
 import android.net.Uri;
 import android.net.wifi.WifiManager;
 
@@ -49,7 +46,8 @@
 import com.android.settings.R;
 import com.android.settings.slices.SliceBackgroundWorker;
 import com.android.settings.testutils.SliceTester;
-import com.android.settingslib.wifi.AccessPoint;
+import com.android.wifitrackerlib.WifiEntry;
+import com.android.wifitrackerlib.WifiEntry.ConnectedState;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -74,7 +72,6 @@
     private Context mContext;
     private ContentResolver mResolver;
     private WifiManager mWifiManager;
-    private ConnectivityManager mConnectivityManager;
     private WifiSlice mWifiSlice;
 
     @Before
@@ -88,9 +85,6 @@
         SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);
         mWifiManager.setWifiEnabled(true);
 
-        mConnectivityManager = spy(mContext.getSystemService(ConnectivityManager.class));
-        doReturn(mConnectivityManager).when(mContext).getSystemService(ConnectivityManager.class);
-
         mWifiSlice = new WifiSlice(mContext);
     }
 
@@ -138,33 +132,42 @@
                 mContext.getString(R.string.wifi_empty_list_wifi_on));
     }
 
-    private AccessPoint createAccessPoint(String name, boolean active, boolean reachable) {
-        final AccessPoint accessPoint = mock(AccessPoint.class);
-        doReturn(name).when(accessPoint).getTitle();
-        doReturn(active).when(accessPoint).isActive();
-        doReturn(reachable).when(accessPoint).isReachable();
-        if (active) {
-            final NetworkInfo networkInfo = mock(NetworkInfo.class);
-            doReturn(networkInfo).when(accessPoint).getNetworkInfo();
-            doReturn(NetworkInfo.State.CONNECTED).when(networkInfo).getState();
-        }
-        return accessPoint;
+    private WifiSliceItem createWifiSliceItem(String title, @ConnectedState int connectedState) {
+        final WifiEntry wifiEntry = mock(WifiEntry.class);
+        when(wifiEntry.getTitle()).thenReturn(title);
+        when(wifiEntry.getKey()).thenReturn("key");
+        when(wifiEntry.getConnectedState()).thenReturn(connectedState);
+        when(wifiEntry.getLevel()).thenReturn(WifiEntry.WIFI_LEVEL_MAX);
+        return new WifiSliceItem(mContext, wifiEntry);
     }
 
-    private void setWorkerResults(AccessPoint... accessPoints) {
-        final ArrayList<AccessPoint> results = new ArrayList<>();
-        for (AccessPoint ap : accessPoints) {
-            results.add(ap);
+    private void setWorkerResults(WifiSliceItem... wifiSliceItems) {
+        final ArrayList<WifiSliceItem> results = new ArrayList<>();
+        for (WifiSliceItem wifiSliceItem : wifiSliceItems) {
+            results.add(wifiSliceItem);
         }
         final SliceBackgroundWorker worker = SliceBackgroundWorker.getInstance(mWifiSlice.getUri());
         doReturn(results).when(worker).getResults();
     }
 
     @Test
-    public void getWifiSlice_noReachableAp_shouldReturnLoadingRow() {
+    public void getWifiSlice_oneConnectedAp_shouldReturnLoadingRow() {
+        setWorkerResults(createWifiSliceItem(AP1_NAME, WifiEntry.CONNECTED_STATE_CONNECTED));
+
+        final Slice wifiSlice = mWifiSlice.getSlice();
+        final List<SliceItem> sliceItems = wifiSlice.getItems();
+
+        SliceTester.assertAnySliceItemContainsTitle(sliceItems, AP1_NAME);
+        // Has scanning text
+        SliceTester.assertAnySliceItemContainsSubtitle(sliceItems,
+                mContext.getString(R.string.wifi_empty_list_wifi_on));
+    }
+
+    @Test
+    public void getWifiSlice_oneConnectedApAndOneDisconnectedAp_shouldReturnLoadingRow() {
         setWorkerResults(
-                createAccessPoint(AP1_NAME, false, false),
-                createAccessPoint(AP2_NAME, false, false));
+                createWifiSliceItem(AP1_NAME, WifiEntry.CONNECTED_STATE_CONNECTED),
+                createWifiSliceItem(AP2_NAME, WifiEntry.CONNECTED_STATE_DISCONNECTED));
 
         final Slice wifiSlice = mWifiSlice.getSlice();
         final List<SliceItem> sliceItems = wifiSlice.getItems();
@@ -177,8 +180,8 @@
     }
 
     @Test
-    public void getWifiSlice_oneActiveAp_shouldReturnLoadingRow() {
-        setWorkerResults(createAccessPoint(AP1_NAME, true, true));
+    public void getWifiSlice_oneDisconnectedAp_shouldReturnLoadingRow() {
+        setWorkerResults(createWifiSliceItem(AP1_NAME, WifiEntry.CONNECTED_STATE_DISCONNECTED));
 
         final Slice wifiSlice = mWifiSlice.getSlice();
         final List<SliceItem> sliceItems = wifiSlice.getItems();
@@ -190,40 +193,11 @@
     }
 
     @Test
-    public void getWifiSlice_oneActiveApAndOneUnreachableAp_shouldReturnLoadingRow() {
+    public void getWifiSlice_apReachExpandedCount_shouldNotReturnLoadingRow() {
         setWorkerResults(
-                createAccessPoint(AP1_NAME, true, true),
-                createAccessPoint(AP2_NAME, false, false));
-
-        final Slice wifiSlice = mWifiSlice.getSlice();
-        final List<SliceItem> sliceItems = wifiSlice.getItems();
-
-        SliceTester.assertAnySliceItemContainsTitle(sliceItems, AP1_NAME);
-        SliceTester.assertAnySliceItemContainsTitle(sliceItems, AP2_NAME);
-        // Has scanning text
-        SliceTester.assertAnySliceItemContainsSubtitle(sliceItems,
-                mContext.getString(R.string.wifi_empty_list_wifi_on));
-    }
-
-    @Test
-    public void getWifiSlice_oneReachableAp_shouldReturnLoadingRow() {
-        setWorkerResults(createAccessPoint(AP1_NAME, false, true));
-
-        final Slice wifiSlice = mWifiSlice.getSlice();
-        final List<SliceItem> sliceItems = wifiSlice.getItems();
-
-        SliceTester.assertAnySliceItemContainsTitle(sliceItems, AP1_NAME);
-        // Has scanning text
-        SliceTester.assertAnySliceItemContainsSubtitle(sliceItems,
-                mContext.getString(R.string.wifi_empty_list_wifi_on));
-    }
-
-    @Test
-    public void getWifiSlice_allReachableAps_shouldNotReturnLoadingRow() {
-        setWorkerResults(
-                createAccessPoint(AP1_NAME, false, true),
-                createAccessPoint(AP2_NAME, false, true),
-                createAccessPoint(AP3_NAME, false, true));
+                createWifiSliceItem(AP1_NAME, WifiEntry.CONNECTED_STATE_DISCONNECTED),
+                createWifiSliceItem(AP2_NAME, WifiEntry.CONNECTED_STATE_DISCONNECTED),
+                createWifiSliceItem(AP3_NAME, WifiEntry.CONNECTED_STATE_DISCONNECTED));
 
         final Slice wifiSlice = mWifiSlice.getSlice();
         final List<SliceItem> sliceItems = wifiSlice.getItems();
@@ -237,29 +211,6 @@
     }
 
     @Test
-    public void getWifiSlice_isCaptivePortal_shouldHaveCaptivePortalItems() {
-        setWorkerResults(createAccessPoint(AP1_NAME, true, true));
-        doReturn(makeCaptivePortalNetworkCapabilities()).when(mConnectivityManager)
-                .getNetworkCapabilities(any());
-        final IconCompat expectedIcon = IconCompat.createWithResource(mContext,
-                R.drawable.ic_settings_accent);
-
-        final Slice wifiSlice = mWifiSlice.getSlice();
-        final List<SliceItem> sliceItems = wifiSlice.getItems();
-
-        SliceTester.assertAnySliceItemContainsTitle(sliceItems, AP1_NAME);
-        SliceTester.assertAnySliceItemContainsIcon(sliceItems, expectedIcon);
-    }
-
-    static NetworkCapabilities makeCaptivePortalNetworkCapabilities() {
-        final NetworkCapabilities nc = new NetworkCapabilities();
-        nc.clearAll();
-        nc.addTransportType(NetworkCapabilities.TRANSPORT_WIFI);
-        nc.addCapability(NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL);
-        return nc;
-    }
-
-    @Test
     public void handleUriChange_updatesWifi() {
         final Intent intent = mWifiSlice.getIntent();
         intent.putExtra(android.app.slice.Slice.EXTRA_TOGGLE_STATE, true);
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java
index b62f1ba..920582f 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java
@@ -31,7 +31,7 @@
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settings.widget.PrimarySwitchPreference;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
@@ -66,7 +66,7 @@
     private WifiTetherPreferenceController mController;
     private Lifecycle mLifecycle;
     private LifecycleOwner mLifecycleOwner;
-    private MasterSwitchPreference mPreference;
+    private PrimarySwitchPreference mPreference;
 
     @Before
     public void setUp() {
@@ -76,7 +76,7 @@
         mLifecycleOwner = () -> mLifecycle;
         mLifecycle = new Lifecycle(mLifecycleOwner);
         FakeFeatureFactory.setupForTest();
-        mPreference = new MasterSwitchPreference(RuntimeEnvironment.application);
+        mPreference = new PrimarySwitchPreference(RuntimeEnvironment.application);
         when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE))
                 .thenReturn(mConnectivityManager);
         when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java
index e996b2d..b41616b 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java
@@ -45,6 +45,7 @@
 import com.android.settings.testutils.shadow.ShadowWifiManager;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -84,6 +85,7 @@
     }
 
     @Test
+    @Ignore
     public void wifiTetherNonIndexableKeys_tetherAvailable_keysNotReturned() {
         FeatureFlagUtils.setEnabled(mContext, FeatureFlags.TETHER_ALL_IN_ONE, false);
         // To let TetherUtil.isTetherAvailable return true, select one of the combinations
diff --git a/tests/unit/Android.bp b/tests/unit/Android.bp
index 583b46e..7556cbe 100644
--- a/tests/unit/Android.bp
+++ b/tests/unit/Android.bp
@@ -17,6 +17,7 @@
         "androidx.test.espresso.core",
         "androidx.test.espresso.contrib-nodeps",
         "androidx.test.espresso.intents-nodeps",
+        "androidx.test.ext.junit",
         "mockito-target-minus-junit4",
         "platform-test-annotations",
         "truth-prebuilt",
diff --git a/tests/unit/AndroidManifest.xml b/tests/unit/AndroidManifest.xml
index c387067..c5f082d 100644
--- a/tests/unit/AndroidManifest.xml
+++ b/tests/unit/AndroidManifest.xml
@@ -31,6 +31,7 @@
     <application>
         <uses-library android:name="android.test.runner" />
         <activity android:name="com.android.settings.tests.BluetoothRequestPermissionTest"
+            android:exported="true"
             android:label="Bluetooth Perm Test" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -38,7 +39,8 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name="Operator" android:label="Operator Hook Test" >
+        <activity android:name="Operator" android:label="Operator Hook Test"
+            android:exported="true">
             <intent-filter>
                 <action android:name="com.android.settings.OPERATOR_APPLICATION_SETTING" />
             </intent-filter>
@@ -46,7 +48,8 @@
             <meta-data android:name="com.android.settings.summary" android:resource="@string/operator_settings_summary" />
             <meta-data android:name="com.android.settings.icon" android:resource="@drawable/ic_settings_applications" />
         </activity>
-        <activity android:name="Manufacturer" android:label="Manufacturer Hook Test" >
+        <activity android:name="Manufacturer" android:label="Manufacturer Hook Test"
+            android:exported="true">
             <intent-filter>
                 <action android:name="com.android.settings.MANUFACTURER_APPLICATION_SETTING" />
             </intent-filter>
@@ -55,7 +58,8 @@
             <meta-data android:name="com.android.settings.icon" android:resource="@drawable/ic_settings_applications" />
         </activity>
 
-        <service android:name="com.android.settings.accounts.TestAuthService">
+        <service android:name="com.android.settings.accounts.TestAuthService"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.accounts.AccountAuthenticator" />
             </intent-filter>
diff --git a/tests/unit/src/com/android/settings/core/SettingsGatewayTest.java b/tests/unit/src/com/android/settings/core/SettingsGatewayTest.java
index 7d03bba..f879876 100644
--- a/tests/unit/src/com/android/settings/core/SettingsGatewayTest.java
+++ b/tests/unit/src/com/android/settings/core/SettingsGatewayTest.java
@@ -21,6 +21,7 @@
 import static android.content.pm.PackageManager.MATCH_DISABLED_COMPONENTS;
 
 import static com.android.settings.SettingsActivity.META_DATA_KEY_FRAGMENT_CLASS;
+
 import static com.google.common.truth.Truth.assertThat;
 
 import static junit.framework.Assert.fail;
@@ -88,11 +89,11 @@
     @Presubmit
     public void publicFragmentMustAppearInSettingsGateway()
             throws PackageManager.NameNotFoundException {
-        final List<String> whitelistedFragment = new ArrayList<>();
+        final List<String> allowlistedFragment = new ArrayList<>();
         final StringBuilder error = new StringBuilder();
 
         for (String fragment : SettingsGateway.ENTRY_FRAGMENTS) {
-            whitelistedFragment.add(fragment);
+            allowlistedFragment.add(fragment);
         }
         final PackageInfo pi = mPackageManager.getPackageInfo(mPackageName,
                 GET_META_DATA | MATCH_DISABLED_COMPONENTS | GET_ACTIVITIES);
@@ -106,7 +107,7 @@
             final String fragmentName = metaData.getString(META_DATA_KEY_FRAGMENT_CLASS);
 
             assertThat(fragmentName).isNotNull();
-            if (!whitelistedFragment.contains(fragmentName)) {
+            if (!allowlistedFragment.contains(fragmentName)) {
                 error.append("SettingsGateway.ENTRY_FRAGMENTS must contain " + fragmentName
                         + " because this fragment is used in manifest for " + activity.name)
                         .append("\n");
diff --git a/tests/unit/src/com/android/settings/core/UniquePreferenceTest.java b/tests/unit/src/com/android/settings/core/UniquePreferenceTest.java
index 9ed1c91..ddd00a2 100644
--- a/tests/unit/src/com/android/settings/core/UniquePreferenceTest.java
+++ b/tests/unit/src/com/android/settings/core/UniquePreferenceTest.java
@@ -56,7 +56,7 @@
     private static final List<String> IGNORE_PREF_TYPES = Arrays.asList(
             "com.android.settingslib.widget.FooterPreference");
 
-    private static final List<String> WHITELISTED_DUPLICATE_KEYS = Arrays.asList(
+    private static final List<String> ALLOWLISTED_DUPLICATE_KEYS = Arrays.asList(
             "owner_info_settings",          // Lock screen message in security - multiple xml files
                                             // contain this because security page is constructed by
                                             // combining small xml chunks. Eventually the page
@@ -185,7 +185,7 @@
                     nullKeyClasses.add(className);
                     continue;
                 }
-                if (uniqueKeys.contains(key) && !WHITELISTED_DUPLICATE_KEYS.contains(key)) {
+                if (uniqueKeys.contains(key) && !ALLOWLISTED_DUPLICATE_KEYS.contains(key)) {
                     Log.e(TAG, "Every preference key must unique; found "
                             + " in " + className
                             + " / " + key);
@@ -209,7 +209,7 @@
                 nullKeyClasses.add(className);
                 continue;
             }
-            if (uniqueKeys.contains(raw.key) && !WHITELISTED_DUPLICATE_KEYS.contains(raw.key)) {
+            if (uniqueKeys.contains(raw.key) && !ALLOWLISTED_DUPLICATE_KEYS.contains(raw.key)) {
                 Log.e(TAG, "Every SearchIndexableRaw key must unique; found " + raw.key
                         + " in " + className);
                 duplicatedKeys.add(raw.key);
diff --git a/tests/unit/src/com/android/settings/deviceinfo/OWNERS b/tests/unit/src/com/android/settings/deviceinfo/OWNERS
new file mode 100644
index 0000000..ce702a7
--- /dev/null
+++ b/tests/unit/src/com/android/settings/deviceinfo/OWNERS
@@ -0,0 +1 @@
+include /src/com/android/settings/deviceinfo/OWNERS
diff --git a/tests/unit/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java
new file mode 100644
index 0000000..1d6a624
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java
@@ -0,0 +1,170 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.Looper;
+import android.provider.Settings;
+import android.provider.SettingsSlicesContract;
+
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.AirplaneModeEnabler;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.RestrictedSwitchPreference;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+public class AirplaneModePreferenceControllerTest {
+
+    private static final int ON = 1;
+    private static final int OFF = 0;
+
+    @Mock
+    private PackageManager mPackageManager;
+    @Mock
+    private AirplaneModeEnabler mAirplaneModeEnabler;
+    private Context mContext;
+    private ContentResolver mResolver;
+    private PreferenceManager mPreferenceManager;
+    private PreferenceScreen mScreen;
+    private RestrictedSwitchPreference mPreference;
+    private AirplaneModePreferenceController mController;
+
+    @Before
+    public void setUp() {
+        if (Looper.myLooper() == null) {
+            Looper.prepare();
+        }
+
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        mResolver = mContext.getContentResolver();
+        doReturn(mPackageManager).when(mContext).getPackageManager();
+        mController = new AirplaneModePreferenceController(mContext,
+                SettingsSlicesContract.KEY_AIRPLANE_MODE);
+
+        mPreferenceManager = new PreferenceManager(mContext);
+        mScreen = mPreferenceManager.createPreferenceScreen(mContext);
+        mPreference = new RestrictedSwitchPreference(mContext);
+        mPreference.setKey(SettingsSlicesContract.KEY_AIRPLANE_MODE);
+        mScreen.addPreference(mPreference);
+        mController.setFragment(null);
+    }
+
+    @Test
+    public void getSliceUri_shouldUsePlatformAuthority() {
+        assertThat(mController.getSliceUri().getAuthority())
+                .isEqualTo(SettingsSlicesContract.AUTHORITY);
+    }
+
+    @Test
+    public void getAvailabilityStatus_hasLeanbackFeature_shouldNotBeAvailable() {
+        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)).thenReturn(true);
+
+        assertThat(mController.getAvailabilityStatus())
+                .isNotEqualTo(BasePreferenceController.AVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_noLeanbackFeature_shouldBeAvailable() {
+        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)).thenReturn(false);
+
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.AVAILABLE);
+    }
+
+    @Test
+    public void setChecked_setAirplaneModeEnabler_setCheckedTrue() {
+        // Set airplane mode ON by setChecked
+        mController.setAirplaneModeEnabler(mAirplaneModeEnabler);
+
+        assertThat(mController.setChecked(true)).isTrue();
+    }
+
+    @Test
+    public void setChecked_isAirplaneModeOnAndSetCheckedTrue_shouldReturnFalse() {
+        // Set airplane mode ON by setChecked
+        mController.setAirplaneModeEnabler(mAirplaneModeEnabler);
+        // Check return value if set same status.
+        when(mAirplaneModeEnabler.isAirplaneModeOn()).thenReturn(true);
+
+        assertThat(mController.setChecked(true)).isFalse();
+    }
+
+    @Test
+    public void setChecked_setChecked_isAirplaneModeOnAndSetCheckedTrue_shouldReturnTrue() {
+        // Set airplane mode ON by setChecked
+        mController.setAirplaneModeEnabler(mAirplaneModeEnabler);
+        // Check return value if set same status.
+        when(mAirplaneModeEnabler.isAirplaneModeOn()).thenReturn(true);
+
+        // Set to OFF
+        assertThat(mController.setChecked(false)).isTrue();
+    }
+
+    @Test
+    public void isChecked_airplaneModeTurnOff_returnFalse() {
+        // Set airplane mode ON
+        Settings.Global.putInt(mResolver, Settings.Global.AIRPLANE_MODE_ON, ON);
+
+        mController.displayPreference(mScreen);
+        mController.onStart();
+
+        Settings.Global.putInt(mResolver, Settings.Global.AIRPLANE_MODE_ON, OFF);
+        assertThat(mController.isChecked()).isFalse();
+    }
+
+    @Test
+    public void testPreferenceUI_airplaneModeTurnOn_updatesCorrectly() {
+        // Airplane mode default off
+        Settings.Global.putInt(mResolver, Settings.Global.AIRPLANE_MODE_ON, OFF);
+
+        mController.displayPreference(mScreen);
+        mController.onStop();
+        mController.onAirplaneModeChanged(true);
+
+        assertThat(mPreference.isChecked()).isTrue();
+    }
+
+    @Test
+    public void isSliceable_returnsTrue() {
+        assertThat(mController.isSliceable()).isTrue();
+    }
+
+    @Test
+    public void isPublicSlice_returnsTrue() {
+        assertThat(mController.isPublicSlice()).isTrue();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/DataConnectivityListenerTest.java b/tests/unit/src/com/android/settings/network/DataConnectivityListenerTest.java
new file mode 100644
index 0000000..f2db2ef
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/DataConnectivityListenerTest.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.settings.network;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.net.Network;
+import android.net.NetworkCapabilities;
+import android.net.NetworkRequest;
+import android.os.Handler;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.network.telephony.DataConnectivityListener;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+public class DataConnectivityListenerTest {
+    @Mock
+    private DataConnectivityListener.Client mClient;
+    @Mock
+    private ConnectivityManager mConnectivityManager;
+    @Mock
+    private Network mActiveNetwork;
+
+    private Context mContext;
+    private DataConnectivityListener mListener;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        when(mContext.getSystemService(ConnectivityManager.class)).thenReturn(mConnectivityManager);
+        when(mConnectivityManager.getActiveNetwork()).thenReturn(mActiveNetwork);
+        mListener = new DataConnectivityListener(mContext, mClient);
+    }
+
+    @Test
+    public void registerNetworkCallback_listenerNotStart_doesNotRegister() {
+        verify(mConnectivityManager, never()).registerNetworkCallback(any(NetworkRequest.class),
+                any(ConnectivityManager.NetworkCallback.class), any(Handler.class));
+    }
+
+    @Test
+    public void registerNetworkCallback_listenerStart_doesRegister() {
+        mListener.start();
+        verify(mConnectivityManager).registerNetworkCallback(any(NetworkRequest.class),
+                eq(mListener), any(Handler.class));
+    }
+
+    @Test
+    public void onCapabilitiesChanged_notActiveNetwork_noCallback() {
+        Network changedNetwork = mock(Network.class);
+
+        mListener.onCapabilitiesChanged(changedNetwork, null);
+
+        verify(mClient, never()).onDataConnectivityChange();
+    }
+
+    @Test
+    public void onCapabilitiesChanged_activeNetwork_onDataConnectivityChangeFires() {
+        mListener.onCapabilitiesChanged(mActiveNetwork, null);
+
+        verify(mClient).onDataConnectivityChange();
+    }
+
+    @Test
+    public void onLosing_notActiveNetwork_onDataConnectivityChangeFires() {
+        Network changedNetwork = mock(Network.class);
+
+        mListener.onLosing(changedNetwork, 500);
+
+        verify(mClient).onDataConnectivityChange();
+    }
+
+    @Test
+    public void onLosing_activeNetwork_onDataConnectivityChangeFires() {
+        mListener.onLosing(mActiveNetwork, 500);
+
+        verify(mClient).onDataConnectivityChange();
+    }
+
+    @Test
+    public void onLost_notActiveNetwork_onDataConnectivityChangeFires() {
+        Network changedNetwork = mock(Network.class);
+
+        mListener.onLost(changedNetwork);
+
+        verify(mClient).onDataConnectivityChange();
+    }
+
+    @Test
+    public void onLost_activeNetwork_onDataConnectivityChangeFires() {
+        mListener.onLost(mActiveNetwork);
+
+        verify(mClient).onDataConnectivityChange();
+    }
+}
\ No newline at end of file
diff --git a/tests/unit/src/com/android/settings/network/GlobalSettingsChangeListenerTest.java b/tests/unit/src/com/android/settings/network/GlobalSettingsChangeListenerTest.java
new file mode 100644
index 0000000..49cf60b
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/GlobalSettingsChangeListenerTest.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import android.content.Context;
+import android.os.Looper;
+import android.provider.Settings;
+
+import androidx.lifecycle.Lifecycle;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+public class GlobalSettingsChangeListenerTest {
+
+    @Mock
+    private Lifecycle mLifecycle;
+
+    private Context mContext;
+    private TestListener mTestListener;
+
+    private static final String SETTINGS_FIELD = Settings.Global.AIRPLANE_MODE_ON;
+
+    public class TestListener extends GlobalSettingsChangeListener {
+        TestListener(Looper looper, Context context, String field) {
+            super(looper, context, field);
+        }
+        @Override
+        public void onChanged(String field) {}
+    }
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        mTestListener = spy(new TestListener(Looper.getMainLooper(), mContext, SETTINGS_FIELD));
+
+        doNothing().when(mLifecycle).addObserver(mTestListener);
+        doNothing().when(mLifecycle).removeObserver(mTestListener);
+    }
+
+    /*
+     * The method onChange is override from {@link ContentObserver}, and when the content change
+     * occurs will be called. And the method onChanged is subclass from
+     * {@link GlobalSettingsChangeListener}, it will be called when the onChange be called.
+     */
+    @Test
+    public void whenChanged_onChangedBeenCalled() {
+        mTestListener.onChange(false);
+
+        verify(mTestListener, times(1)).onChanged(SETTINGS_FIELD);
+    }
+
+    @Test
+    public void whenNotifyChangeBasedOnLifecycle_onStopEvent_onChangedNotCalled() {
+        mTestListener.notifyChangeBasedOn(mLifecycle);
+        mTestListener.onStart();
+
+        mTestListener.onChange(false);
+        verify(mTestListener, times(1)).onChanged(SETTINGS_FIELD);
+
+        mTestListener.onStop();
+
+        mTestListener.onChange(false);
+        verify(mTestListener, times(1)).onChanged(SETTINGS_FIELD);
+
+        mTestListener.onStart();
+
+        mTestListener.onChange(false);
+        verify(mTestListener, times(2)).onChanged(SETTINGS_FIELD);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/MobileDataEnabledListenerTest.java b/tests/unit/src/com/android/settings/network/MobileDataEnabledListenerTest.java
new file mode 100644
index 0000000..190dc3d
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/MobileDataEnabledListenerTest.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+
+import android.content.Context;
+import android.net.Uri;
+import android.provider.Settings;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+public class MobileDataEnabledListenerTest {
+    private static final int SUB_ID_ONE = 111;
+    private static final int SUB_ID_TWO = 222;
+
+    @Mock
+    private MobileDataEnabledListener.Client mClient;
+
+    private Context mContext;
+    private MobileDataEnabledListener mListener;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = ApplicationProvider.getApplicationContext();
+        mListener = new MobileDataEnabledListener(mContext, mClient);
+    }
+
+    @Test
+    public void onMobileDataEnabledChange_firesCorrectly() {
+        mListener.start(SUB_ID_ONE);
+        final Uri uri = Settings.Global.getUriFor(Settings.Global.MOBILE_DATA + SUB_ID_ONE);
+
+        mContext.getContentResolver().notifyChange(uri, null);
+
+        verify(mClient).onMobileDataEnabledChange();
+    }
+
+    @Test
+    public void onMobileDataEnabledChange_doesNotFireAfterStop() {
+        mListener.start(SUB_ID_ONE);
+        mListener.stop();
+        final Uri uri = Settings.Global.getUriFor(Settings.Global.MOBILE_DATA + SUB_ID_ONE);
+
+        mContext.getContentResolver().notifyChange(uri, null);
+
+        verify(mClient, never()).onMobileDataEnabledChange();
+    }
+
+    @Test
+    public void onMobileDataEnabledChange_changedToDifferentId_firesCorrectly() {
+        mListener.start(SUB_ID_ONE);
+        mListener.stop();
+        mListener.start(SUB_ID_TWO);
+        final Uri uri = Settings.Global.getUriFor(Settings.Global.MOBILE_DATA + SUB_ID_TWO);
+
+        mContext.getContentResolver().notifyChange(uri, null);
+
+        verify(mClient).onMobileDataEnabledChange();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/MobilePlanPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/MobilePlanPreferenceControllerTest.java
new file mode 100644
index 0000000..7938a99
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/MobilePlanPreferenceControllerTest.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.content.res.Resources;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class MobilePlanPreferenceControllerTest {
+
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+    }
+
+    @Test
+    public void testNoProvisionStringFormattedCorrectly() {
+        final String operator = "test_operator";
+
+        assertThat(resourceString("mobile_no_provisioning_url", operator))
+                .contains(operator);
+    }
+
+    public String resourceString(String name, Object value) {
+        final Resources res = mContext.getResources();
+        return res.getString(res.getIdentifier(name, "string", mContext.getPackageName()), value);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/NetworkDashboardFragmentTest.java b/tests/unit/src/com/android/settings/network/NetworkDashboardFragmentTest.java
new file mode 100644
index 0000000..4258b2c
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/NetworkDashboardFragmentTest.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.network;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.Instrumentation;
+import android.content.Context;
+import android.provider.SearchIndexableResource;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import com.android.settingslib.drawer.CategoryKey;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.List;
+
+@RunWith(AndroidJUnit4.class)
+public class NetworkDashboardFragmentTest {
+
+    private Context mContext;
+
+    private NetworkDashboardFragment mFragment;
+
+    @Before
+    public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+        final Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
+
+        instrumentation.runOnMainSync(() -> {
+            mFragment = new NetworkDashboardFragment();
+        });
+    }
+
+    @Test
+    public void getCategoryKey_isNetwork() {
+        assertThat(mFragment.getCategoryKey()).isEqualTo(CategoryKey.CATEGORY_NETWORK);
+    }
+
+    @Test
+    public void getXmlResourcesToIndex_shouldIncludeFragmentXml() {
+        final List<SearchIndexableResource> indexRes =
+                NetworkDashboardFragment.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
+                        mContext,
+                        true /* enabled */);
+
+        assertThat(indexRes).hasSize(1);
+        assertThat(indexRes.get(0).xmlResId).isEqualTo(mFragment.getPreferenceScreenResId());
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/OWNERS b/tests/unit/src/com/android/settings/network/OWNERS
new file mode 100644
index 0000000..6e4c4a4
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/OWNERS
@@ -0,0 +1 @@
+include /src/com/android/settings/network/OWNERS
diff --git a/tests/unit/src/com/android/settings/network/SubscriptionUtilTest.java b/tests/unit/src/com/android/settings/network/SubscriptionUtilTest.java
new file mode 100644
index 0000000..9e319fb
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/SubscriptionUtilTest.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.util.Arrays;
+import java.util.List;
+
+@RunWith(AndroidJUnit4.class)
+public class SubscriptionUtilTest {
+
+    private Context mContext;
+    @Mock
+    private SubscriptionManager mSubMgr;
+    @Mock
+    private TelephonyManager mTelMgr;
+
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubMgr);
+        when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelMgr);
+        when(mTelMgr.getUiccSlotsInfo()).thenReturn(null);
+    }
+
+    @Test
+    public void getAvailableSubscriptions_nullInfoFromSubscriptionManager_nonNullResult() {
+        when(mSubMgr.getAvailableSubscriptionInfoList()).thenReturn(null);
+
+        final List<SubscriptionInfo> subs = SubscriptionUtil.getAvailableSubscriptions(mContext);
+
+        assertThat(subs).isNotNull();
+        assertThat(subs).isEmpty();
+    }
+
+    @Test
+    public void getAvailableSubscriptions_oneSubscription_oneResult() {
+        final SubscriptionInfo info = mock(SubscriptionInfo.class);
+        when(mSubMgr.getAvailableSubscriptionInfoList()).thenReturn(Arrays.asList(info));
+
+        final List<SubscriptionInfo> subs = SubscriptionUtil.getAvailableSubscriptions(mContext);
+
+        assertThat(subs).isNotNull();
+        assertThat(subs).hasSize(1);
+    }
+
+    @Test
+    public void getAvailableSubscriptions_twoSubscriptions_twoResults() {
+        final SubscriptionInfo info1 = mock(SubscriptionInfo.class);
+        final SubscriptionInfo info2 = mock(SubscriptionInfo.class);
+        when(mSubMgr.getAvailableSubscriptionInfoList()).thenReturn(Arrays.asList(info1, info2));
+
+        final List<SubscriptionInfo> subs = SubscriptionUtil.getAvailableSubscriptions(mContext);
+
+        assertThat(subs).isNotNull();
+        assertThat(subs).hasSize(2);
+    }
+
+    @Test
+    public void getActiveSubscriptions_nullInfoFromSubscriptionManager_nonNullResult() {
+        when(mSubMgr.getActiveSubscriptionInfoList()).thenReturn(null);
+
+        final List<SubscriptionInfo> subs = SubscriptionUtil.getActiveSubscriptions(mSubMgr);
+
+        assertThat(subs).isNotNull();
+        assertThat(subs).isEmpty();
+    }
+
+    @Test
+    public void getActiveSubscriptions_oneSubscription_oneResult() {
+        final SubscriptionInfo info = mock(SubscriptionInfo.class);
+        when(mSubMgr.getActiveSubscriptionInfoList()).thenReturn(Arrays.asList(info));
+
+        final List<SubscriptionInfo> subs = SubscriptionUtil.getActiveSubscriptions(mSubMgr);
+
+        assertThat(subs).isNotNull();
+        assertThat(subs).hasSize(1);
+    }
+
+    @Test
+    public void getActiveSubscriptions_twoSubscriptions_twoResults() {
+        final SubscriptionInfo info1 = mock(SubscriptionInfo.class);
+        final SubscriptionInfo info2 = mock(SubscriptionInfo.class);
+        when(mSubMgr.getActiveSubscriptionInfoList()).thenReturn(
+                Arrays.asList(info1, info2));
+
+        final List<SubscriptionInfo> subs = SubscriptionUtil.getActiveSubscriptions(mSubMgr);
+
+        assertThat(subs).isNotNull();
+        assertThat(subs).hasSize(2);
+    }
+
+    @Test
+    public void isInactiveInsertedPSim_nullSubInfo_doesNotCrash() {
+        assertThat(SubscriptionUtil.isInactiveInsertedPSim(null)).isFalse();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java
new file mode 100644
index 0000000..264abd0
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java
@@ -0,0 +1,148 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.PersistableBundle;
+import android.provider.Settings;
+import android.telephony.CarrierConfigManager;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.network.ApnSettings;
+import com.android.settingslib.RestrictedPreference;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+public class ApnPreferenceControllerTest {
+    private static final int SUB_ID = 2;
+
+    @Mock
+    private TelephonyManager mTelephonyManager;
+    @Mock
+    private TelephonyManager mInvalidTelephonyManager;
+    @Mock
+    private SubscriptionManager mSubscriptionManager;
+    @Mock
+    private CarrierConfigManager mCarrierConfigManager;
+
+    private ApnPreferenceController mController;
+    private RestrictedPreference mPreference;
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
+        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
+        when(mContext.getSystemService(CarrierConfigManager.class)).thenReturn(
+                mCarrierConfigManager);
+        doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
+        doReturn(mInvalidTelephonyManager).when(mTelephonyManager).createForSubscriptionId(
+                SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+
+        mPreference = new RestrictedPreference(mContext);
+        mController = new ApnPreferenceController(mContext, "mobile_data");
+        mController.init(SUB_ID);
+        mController.setPreference(mPreference);
+        mController.mCarrierConfigManager = mCarrierConfigManager;
+        mPreference.setKey(mController.getPreferenceKey());
+    }
+
+    @Test
+    public void getAvailabilityStatus_apnSettingsNotSupported_returnUnavailable() {
+        doReturn(TelephonyManager.PHONE_TYPE_CDMA).when(mTelephonyManager).getPhoneType();
+        final PersistableBundle bundle = new PersistableBundle();
+        bundle.putBoolean(CarrierConfigManager.KEY_SHOW_APN_SETTING_CDMA_BOOL, false);
+        doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_apnSettingsSupportedWithCDMA_returnAvailable() {
+        doReturn(TelephonyManager.PHONE_TYPE_CDMA).when(mTelephonyManager).getPhoneType();
+        final PersistableBundle bundle = new PersistableBundle();
+        bundle.putBoolean(CarrierConfigManager.KEY_SHOW_APN_SETTING_CDMA_BOOL, true);
+        doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_apnSettingsSupportedWithGsm_returnAvailable() {
+        doReturn(TelephonyManager.PHONE_TYPE_GSM).when(mTelephonyManager).getPhoneType();
+        final PersistableBundle bundle = new PersistableBundle();
+        bundle.putBoolean(CarrierConfigManager.KEY_APN_EXPAND_BOOL, true);
+        doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_carrierConfigNull_returnUnavailable() {
+        doReturn(TelephonyManager.PHONE_TYPE_GSM).when(mTelephonyManager).getPhoneType();
+        when(mCarrierConfigManager.getConfigForSubId(SUB_ID)).thenReturn(null);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_hideCarrierNetworkSettings_returnUnavailable() {
+        doReturn(TelephonyManager.PHONE_TYPE_GSM).when(mTelephonyManager).getPhoneType();
+        final PersistableBundle bundle = new PersistableBundle();
+        bundle.putBoolean(CarrierConfigManager.KEY_APN_EXPAND_BOOL, true);
+        bundle.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL, true);
+        doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
+    public void handPreferenceTreeClick_fireIntent() {
+        ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
+        doNothing().when(mContext).startActivity(captor.capture());
+
+        mController.handlePreferenceTreeClick(mPreference);
+
+        final Intent intent = captor.getValue();
+        assertThat(intent.getAction()).isEqualTo(Settings.ACTION_APN_SETTINGS);
+        assertThat(intent.getIntExtra(ApnSettings.SUB_ID, 0)).isEqualTo(SUB_ID);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/telephony/DataServiceSetupPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/DataServiceSetupPreferenceControllerTest.java
new file mode 100644
index 0000000..8ec2960
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/DataServiceSetupPreferenceControllerTest.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.PersistableBundle;
+import android.provider.Settings;
+import android.telephony.CarrierConfigManager;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+
+import androidx.preference.Preference;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settingslib.RestrictedPreference;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+public class DataServiceSetupPreferenceControllerTest {
+    private static final int SUB_ID = 2;
+
+    private static final String SETUP_URL = "url://tmp_url:^1";
+
+    @Mock
+    private TelephonyManager mTelephonyManager;
+    @Mock
+    private TelephonyManager mInvalidTelephonyManager;
+    @Mock
+    private CarrierConfigManager mCarrierConfigManager;
+
+    private PersistableBundle mCarrierConfig;
+    private DataServiceSetupPreferenceController mController;
+    private Preference mPreference;
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
+        when(mContext.getSystemService(CarrierConfigManager.class)).thenReturn(mCarrierConfigManager);
+        doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
+        doReturn(mInvalidTelephonyManager).when(mTelephonyManager).createForSubscriptionId(
+                SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+        Settings.Global.putString(mContext.getContentResolver(),
+                Settings.Global.SETUP_PREPAID_DATA_SERVICE_URL, SETUP_URL);
+
+        mCarrierConfig = new PersistableBundle();
+        doReturn(mCarrierConfig).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
+
+        mPreference = new RestrictedPreference(mContext);
+        mController = new DataServiceSetupPreferenceController(mContext, "data_service_setup");
+        mController.init(SUB_ID);
+        mPreference.setKey(mController.getPreferenceKey());
+    }
+
+    @Test
+    public void getAvailabilityStatus_allConfigOn_returnAvailable() {
+        doReturn(true).when(mTelephonyManager).isLteCdmaEvdoGsmWcdmaEnabled();
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL,
+                false);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_missUrl_returnUnavailable() {
+        Settings.Global.putString(mContext.getContentResolver(),
+                Settings.Global.SETUP_PREPAID_DATA_SERVICE_URL, "");
+        doReturn(true).when(mTelephonyManager).isLteCdmaEvdoGsmWcdmaEnabled();
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL,
+                false);
+
+        mController = new DataServiceSetupPreferenceController(mContext, "data_service_setup");
+        mController.init(SUB_ID);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_notCdma_returnUnavailable() {
+        doReturn(false).when(mTelephonyManager).isLteCdmaEvdoGsmWcdmaEnabled();
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL,
+                false);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
+    public void handlePreferenceTreeClick_startActivity() {
+        ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
+        doNothing().when(mContext).startActivity(captor.capture());
+
+        mController.handlePreferenceTreeClick(mPreference);
+
+        final Intent intent = captor.getValue();
+        assertThat(intent.getAction()).isEqualTo(Intent.ACTION_VIEW);
+        assertThat(intent.getData()).isEqualTo(
+                Uri.parse(TextUtils.expandTemplate(SETUP_URL, "").toString()));
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/telephony/DisableSimFooterPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/DisableSimFooterPreferenceControllerTest.java
new file mode 100644
index 0000000..72feb30
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/DisableSimFooterPreferenceControllerTest.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.network.SubscriptionUtil;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.util.Arrays;
+
+@RunWith(AndroidJUnit4.class)
+public class DisableSimFooterPreferenceControllerTest {
+    private static final String PREF_KEY = "pref_key";
+    private static final int SUB_ID = 111;
+
+    @Mock
+    private SubscriptionInfo mInfo;
+
+    private Context mContext;
+    @Mock
+    private SubscriptionManager mSubscriptionManager;
+    private DisableSimFooterPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
+        when(mInfo.getSubscriptionId()).thenReturn(SUB_ID);
+        SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(mInfo));
+        mController = new DisableSimFooterPreferenceController(mContext, PREF_KEY);
+    }
+
+    @Test
+    public void isAvailable_noInit_notAvailable() {
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isAvailable_eSIM_notAvailable() {
+        when(mInfo.isEmbedded()).thenReturn(true);
+        mController.init(SUB_ID);
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isAvailable_pSIM_available_cannot_disable_pSIM() {
+        when(mInfo.isEmbedded()).thenReturn(false);
+        mController.init(SUB_ID);
+        doReturn(false).when(mSubscriptionManager).canDisablePhysicalSubscription();
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_pSIM_available_can_disable_pSIM() {
+        when(mInfo.isEmbedded()).thenReturn(false);
+        mController.init(SUB_ID);
+        doReturn(true).when(mSubscriptionManager).canDisablePhysicalSubscription();
+        assertThat(mController.isAvailable()).isFalse();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/telephony/EuiccPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/EuiccPreferenceControllerTest.java
new file mode 100644
index 0000000..f1ad2ff
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/EuiccPreferenceControllerTest.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.Intent;
+import android.telephony.TelephonyManager;
+import android.telephony.euicc.EuiccManager;
+
+import androidx.preference.Preference;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+
+@RunWith(AndroidJUnit4.class)
+public class EuiccPreferenceControllerTest {
+    private static final int SUB_ID = 2;
+
+    @Mock private TelephonyManager mTelephonyManager;
+
+    private EuiccPreferenceController mController;
+    private Preference mPreference;
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
+        when(mTelephonyManager.createForSubscriptionId(SUB_ID)).thenReturn(mTelephonyManager);
+
+        mPreference = new Preference(mContext);
+        mController = new EuiccPreferenceController(mContext, "euicc");
+        mController.init(SUB_ID);
+        mPreference.setKey(mController.getPreferenceKey());
+    }
+
+    @Test
+    public void handlePreferenceTreeClick_startActivity() {
+        ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
+        doNothing().when(mContext).startActivity(captor.capture());
+
+        mController.handlePreferenceTreeClick(mPreference);
+
+        assertThat(captor.getValue().getAction()).isEqualTo(
+                EuiccManager.ACTION_MANAGE_EMBEDDED_SUBSCRIPTIONS);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java b/tests/unit/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java
new file mode 100644
index 0000000..ee8157d
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java
@@ -0,0 +1,336 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.os.PersistableBundle;
+import android.provider.Settings;
+import android.telecom.PhoneAccountHandle;
+import android.telephony.CarrierConfigManager;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+@RunWith(AndroidJUnit4.class)
+public class MobileNetworkUtilsTest {
+    private static final String PACKAGE_NAME = "com.android.app";
+    private static final int SUB_ID_1 = 1;
+    private static final int SUB_ID_2 = 2;
+    private static final int SUB_ID_INVALID = -1;
+    private static final String PLMN_FROM_TELEPHONY_MANAGER_API = "testPlmn";
+    private static final String PLMN_FROM_SUB_ID_1 = "testPlmnSub1";
+    private static final String PLMN_FROM_SUB_ID_2 = "testPlmnSub2";
+
+    @Mock
+    private TelephonyManager mTelephonyManager;
+    @Mock
+    private TelephonyManager mTelephonyManager2;
+    @Mock
+    private SubscriptionManager mSubscriptionManager;
+    @Mock
+    private SubscriptionInfo mSubscriptionInfo1;
+    @Mock
+    private SubscriptionInfo mSubscriptionInfo2;
+    @Mock
+    private PackageManager mPackageManager;
+    @Mock
+    private ResolveInfo mResolveInfo;
+    @Mock
+    private CarrierConfigManager mCarrierConfigManager;
+
+    private Context mContext;
+    private PersistableBundle mCarrierConfig;
+    private PhoneAccountHandle mPhoneAccountHandle;
+    private ComponentName mComponentName;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
+        when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
+        when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
+        when(mTelephonyManager.createForSubscriptionId(SUB_ID_1)).thenReturn(mTelephonyManager);
+        when(mTelephonyManager.createForSubscriptionId(SUB_ID_2)).thenReturn(mTelephonyManager2);
+        when(mContext.getPackageManager()).thenReturn(mPackageManager);
+
+        when(mContext.getSystemService(CarrierConfigManager.class)).thenReturn(
+                mCarrierConfigManager);
+
+        mCarrierConfig = new PersistableBundle();
+        when(mCarrierConfigManager.getConfigForSubId(SUB_ID_1)).thenReturn(mCarrierConfig);
+
+        when(mSubscriptionInfo1.getSubscriptionId()).thenReturn(SUB_ID_1);
+        when(mSubscriptionInfo1.getCarrierName()).thenReturn(PLMN_FROM_SUB_ID_1);
+        when(mSubscriptionInfo2.getSubscriptionId()).thenReturn(SUB_ID_2);
+        when(mSubscriptionInfo2.getCarrierName()).thenReturn(PLMN_FROM_SUB_ID_2);
+
+        when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(
+                Arrays.asList(mSubscriptionInfo1, mSubscriptionInfo2));
+        when(mSubscriptionManager.getAccessibleSubscriptionInfoList()).thenReturn(
+                Arrays.asList(mSubscriptionInfo1, mSubscriptionInfo2));
+
+        when(mTelephonyManager.getNetworkOperatorName()).thenReturn(
+                PLMN_FROM_TELEPHONY_MANAGER_API);
+    }
+
+    @Test
+    public void setMobileDataEnabled_setEnabled_enabled() {
+        MobileNetworkUtils.setMobileDataEnabled(mContext, SUB_ID_1, true, false);
+
+        verify(mTelephonyManager).setDataEnabled(true);
+        verify(mTelephonyManager2, never()).setDataEnabled(anyBoolean());
+    }
+
+    @Test
+    public void setMobileDataEnabled_setDisabled_disabled() {
+        MobileNetworkUtils.setMobileDataEnabled(mContext, SUB_ID_2, true, false);
+
+        verify(mTelephonyManager2).setDataEnabled(true);
+        verify(mTelephonyManager, never()).setDataEnabled(anyBoolean());
+    }
+
+    @Test
+    public void setMobileDataEnabled_disableOtherSubscriptions() {
+        MobileNetworkUtils.setMobileDataEnabled(mContext, SUB_ID_1, true, true);
+
+        verify(mTelephonyManager).setDataEnabled(true);
+        verify(mTelephonyManager2).setDataEnabled(false);
+    }
+
+    @Test
+    public void buildConfigureIntent_nullHandle_returnNull() {
+        assertThat(MobileNetworkUtils.buildPhoneAccountConfigureIntent(mContext, null)).isNull();
+    }
+
+    @Test
+    public void buildConfigureIntent_noActivityHandleIntent_returnNull() {
+        when(mPackageManager.queryIntentActivities(nullable(Intent.class), anyInt()))
+                .thenReturn(new ArrayList<>());
+
+        assertThat(MobileNetworkUtils.buildPhoneAccountConfigureIntent(mContext,
+                mPhoneAccountHandle)).isNull();
+    }
+
+    @Test
+    public void buildConfigureIntent_hasActivityHandleIntent_returnIntent() {
+        mComponentName = new ComponentName(PACKAGE_NAME, "testClass");
+        mPhoneAccountHandle = new PhoneAccountHandle(mComponentName, "");
+        when(mPackageManager.queryIntentActivities(nullable(Intent.class), anyInt()))
+                .thenReturn(Arrays.asList(mResolveInfo));
+
+        assertThat(MobileNetworkUtils.buildPhoneAccountConfigureIntent(mContext,
+                mPhoneAccountHandle)).isNotNull();
+    }
+
+    @Test
+    public void isCdmaOptions_phoneTypeCdma_returnTrue() {
+        when(mTelephonyManager.getPhoneType()).thenReturn(TelephonyManager.PHONE_TYPE_CDMA);
+
+        assertThat(MobileNetworkUtils.isCdmaOptions(mContext, SUB_ID_1)).isTrue();
+    }
+
+    @Test
+    public void isCdmaOptions_worldModeWithGsmWcdma_returnTrue() {
+        when(mTelephonyManager.getPhoneType()).thenReturn(TelephonyManager.PHONE_TYPE_GSM);
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_WORLD_MODE_ENABLED_BOOL, true);
+
+        Settings.Global.putInt(mContext.getContentResolver(),
+                android.provider.Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID_1,
+                TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA);
+
+        assertThat(MobileNetworkUtils.isCdmaOptions(mContext, SUB_ID_1)).isTrue();
+    }
+
+    @Test
+    public void isCdmaOptions_carrierWorldModeWithoutHideCarrier_returnTrue() {
+        when(mTelephonyManager.getPhoneType()).thenReturn(TelephonyManager.PHONE_TYPE_GSM);
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL,
+                false);
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_WORLD_PHONE_BOOL, true);
+
+        assertThat(MobileNetworkUtils.isCdmaOptions(mContext, SUB_ID_1)).isTrue();
+    }
+
+    @Test
+    public void getSearchableSubscriptionId_oneActive_returnValid() {
+        when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(
+                Arrays.asList(mSubscriptionInfo1));
+        assertThat(MobileNetworkUtils.getSearchableSubscriptionId(mContext)).isEqualTo(SUB_ID_1);
+    }
+
+    @Test
+    public void getSearchableSubscriptionId_nonActive_returnInvalid() {
+        when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(new ArrayList<>());
+
+        assertThat(MobileNetworkUtils.getSearchableSubscriptionId(mContext))
+                .isEqualTo(SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+    }
+
+    @Test
+    public void shouldDisplayNetworkSelectOptions_HideCarrierNetwork_returnFalse() {
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL,
+                true);
+
+        assertThat(MobileNetworkUtils.shouldDisplayNetworkSelectOptions(mContext, SUB_ID_1))
+                .isFalse();
+    }
+
+    @Test
+    public void shouldDisplayNetworkSelectOptions_allCheckPass_returnTrue() {
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL,
+                false);
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_OPERATOR_SELECTION_EXPAND_BOOL, true);
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_CSP_ENABLED_BOOL, false);
+        when(mTelephonyManager.getPhoneType()).thenReturn(TelephonyManager.PHONE_TYPE_GSM);
+
+        assertThat(MobileNetworkUtils.shouldDisplayNetworkSelectOptions(mContext, SUB_ID_1))
+                .isTrue();
+    }
+
+    @Test
+    public void shouldSpeciallyUpdateGsmCdma_notWorldMode_returnFalse() {
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_WORLD_MODE_ENABLED_BOOL, false);
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_SUPPORT_TDSCDMA_BOOL, false);
+
+        assertThat(MobileNetworkUtils.shouldSpeciallyUpdateGsmCdma(mContext, SUB_ID_1)).isFalse();
+    }
+
+    @Test
+    public void shouldSpeciallyUpdateGsmCdma_supportTdscdma_returnFalse() {
+        when(mCarrierConfigManager.getConfig()).thenReturn(mCarrierConfig);
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_WORLD_MODE_ENABLED_BOOL, true);
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_SUPPORT_TDSCDMA_BOOL, true);
+
+        assertThat(MobileNetworkUtils.shouldSpeciallyUpdateGsmCdma(mContext, SUB_ID_1)).isFalse();
+    }
+
+    @Test
+    public void shouldSpeciallyUpdateGsmCdma_ModeLteTdscdmaGsm_returnTrue() {
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_WORLD_MODE_ENABLED_BOOL, true);
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_SUPPORT_TDSCDMA_BOOL, false);
+        Settings.Global.putInt(mContext.getContentResolver(),
+                android.provider.Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID_1,
+                TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_GSM);
+
+        assertThat(MobileNetworkUtils.shouldSpeciallyUpdateGsmCdma(mContext, SUB_ID_1)).isTrue();
+    }
+
+    @Test
+    public void shouldSpeciallyUpdateGsmCdma_ModeLteTdscdmaGsmWcdma_returnTrue() {
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_WORLD_MODE_ENABLED_BOOL, true);
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_SUPPORT_TDSCDMA_BOOL, false);
+        Settings.Global.putInt(mContext.getContentResolver(),
+                android.provider.Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID_1,
+                TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA);
+
+        assertThat(MobileNetworkUtils.shouldSpeciallyUpdateGsmCdma(mContext, SUB_ID_1)).isTrue();
+    }
+
+    @Test
+    public void shouldSpeciallyUpdateGsmCdma_ModeLteTdscdma_returnTrue() {
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_WORLD_MODE_ENABLED_BOOL, true);
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_SUPPORT_TDSCDMA_BOOL, false);
+        Settings.Global.putInt(mContext.getContentResolver(),
+                android.provider.Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID_1,
+                TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA);
+
+        assertThat(MobileNetworkUtils.shouldSpeciallyUpdateGsmCdma(mContext, SUB_ID_1)).isTrue();
+    }
+
+    @Test
+    public void shouldSpeciallyUpdateGsmCdma_ModeLteTdscdmaWcdma_returnTrue() {
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_WORLD_MODE_ENABLED_BOOL, true);
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_SUPPORT_TDSCDMA_BOOL, false);
+        Settings.Global.putInt(mContext.getContentResolver(),
+                android.provider.Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID_1,
+                TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_WCDMA);
+
+        assertThat(MobileNetworkUtils.shouldSpeciallyUpdateGsmCdma(mContext, SUB_ID_1)).isTrue();
+    }
+
+    @Test
+    public void shouldSpeciallyUpdateGsmCdma_ModeLteTdscdmaCdmaEvdoGsmWcdma_returnTrue() {
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_WORLD_MODE_ENABLED_BOOL, true);
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_SUPPORT_TDSCDMA_BOOL, false);
+        Settings.Global.putInt(mContext.getContentResolver(),
+                android.provider.Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID_1,
+                TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA);
+
+        assertThat(MobileNetworkUtils.shouldSpeciallyUpdateGsmCdma(mContext, SUB_ID_1)).isTrue();
+    }
+
+    @Test
+    public void shouldSpeciallyUpdateGsmCdma_ModeLteCdmaEvdoGsmWcdma_returnTrue() {
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_WORLD_MODE_ENABLED_BOOL, true);
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_SUPPORT_TDSCDMA_BOOL, false);
+        Settings.Global.putInt(mContext.getContentResolver(),
+                android.provider.Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID_1,
+                TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA);
+
+        assertThat(MobileNetworkUtils.shouldSpeciallyUpdateGsmCdma(mContext, SUB_ID_1)).isTrue();
+    }
+
+    @Test
+    public void getCurrentCarrierNameForDisplay_withoutValidSubId_returnNetworkOperatorName() {
+        assertThat(MobileNetworkUtils.getCurrentCarrierNameForDisplay(
+                mContext, SUB_ID_INVALID)).isEqualTo(PLMN_FROM_TELEPHONY_MANAGER_API);
+    }
+
+    @Test
+    public void getCurrentCarrierNameForDisplay_withValidSubId_returnCurrentCarrierName() {
+        assertThat(MobileNetworkUtils.getCurrentCarrierNameForDisplay(
+                mContext, SUB_ID_1)).isEqualTo(PLMN_FROM_SUB_ID_1);
+        assertThat(MobileNetworkUtils.getCurrentCarrierNameForDisplay(
+                mContext, SUB_ID_2)).isEqualTo(PLMN_FROM_SUB_ID_2);
+    }
+
+    @Test
+    public void getCurrentCarrierNameForDisplay_withoutSubId_returnNotNull() {
+        assertThat(MobileNetworkUtils.getCurrentCarrierNameForDisplay(
+                mContext)).isNotNull();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/telephony/NrDisabledInDsdsFooterPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/NrDisabledInDsdsFooterPreferenceControllerTest.java
new file mode 100644
index 0000000..0cbc263
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/NrDisabledInDsdsFooterPreferenceControllerTest.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+public class NrDisabledInDsdsFooterPreferenceControllerTest {
+    private static final String PREF_KEY = "pref_key";
+    private static final int SUB_ID = 111;
+
+    private Context mContext;
+    @Mock
+    private TelephonyManager mTelephonyManager;
+    @Mock
+    private SubscriptionManager mSubscriptionManager;
+    private NrDisabledInDsdsFooterPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        doReturn(mTelephonyManager).when(mContext).getSystemService(Context.TELEPHONY_SERVICE);
+        doReturn(mSubscriptionManager).when(mContext).getSystemService(
+                Context.TELEPHONY_SUBSCRIPTION_SERVICE);
+        doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(anyInt());
+        mController = new NrDisabledInDsdsFooterPreferenceController(mContext, PREF_KEY);
+    }
+
+    @Test
+    public void isAvailable_noInit_notAvailable() {
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isAvailable_dataOnAndDsdsAnd5GSupported_Available() {
+        when(mTelephonyManager.getSupportedRadioAccessFamily())
+                .thenReturn(TelephonyManager.NETWORK_TYPE_BITMASK_NR);
+        when(mSubscriptionManager.getActiveSubscriptionIdList()).thenReturn(new int[] {1, 2});
+        when(mTelephonyManager.isDataEnabled()).thenReturn(true);
+        mController.init(SUB_ID);
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_5gNotSupported_notAvailable() {
+        when(mTelephonyManager.getSupportedRadioAccessFamily())
+                .thenReturn(TelephonyManager.NETWORK_TYPE_BITMASK_LTE);
+        when(mSubscriptionManager.getActiveSubscriptionIdList()).thenReturn(new int[] {1, 2});
+        when(mTelephonyManager.isDataEnabled()).thenReturn(true);
+        mController.init(SUB_ID);
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isAvailable_mobileDataOff_notAvailable() {
+        when(mTelephonyManager.getSupportedRadioAccessFamily())
+                .thenReturn(TelephonyManager.NETWORK_TYPE_BITMASK_NR);
+        when(mSubscriptionManager.getActiveSubscriptionIdList()).thenReturn(new int[] {1, 2});
+        when(mTelephonyManager.isDataEnabled()).thenReturn(false);
+        mController.init(SUB_ID);
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isAvailable_singleSimMode_notAvailable() {
+        when(mTelephonyManager.getSupportedRadioAccessFamily())
+                .thenReturn(TelephonyManager.NETWORK_TYPE_BITMASK_NR);
+        when(mSubscriptionManager.getActiveSubscriptionIdList()).thenReturn(new int[] {1});
+        when(mTelephonyManager.isDataEnabled()).thenReturn(true);
+        mController.init(SUB_ID);
+        assertThat(mController.isAvailable()).isFalse();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceControllerTest.java
new file mode 100644
index 0000000..f975055
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceControllerTest.java
@@ -0,0 +1,181 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
+import static com.android.settings.network.telephony.MobileNetworkUtils.getRafFromNetworkType;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.PersistableBundle;
+import android.provider.Settings;
+import android.telephony.CarrierConfigManager;
+import android.telephony.ServiceState;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import androidx.preference.ListPreference;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.R;
+import com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+public class PreferredNetworkModePreferenceControllerTest {
+    private static final int SUB_ID = 2;
+
+    @Mock
+    private TelephonyManager mTelephonyManager;
+    @Mock
+    private TelephonyManager mInvalidTelephonyManager;
+    @Mock
+    private CarrierConfigManager mCarrierConfigManager;
+    @Mock
+    private ServiceState mServiceState;
+
+    private PersistableBundle mPersistableBundle;
+    private PreferredNetworkModePreferenceController mController;
+    private ListPreference mPreference;
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
+        when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
+        when(mContext.getSystemService(CarrierConfigManager.class)).thenReturn(mCarrierConfigManager);
+
+        doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
+        doReturn(mInvalidTelephonyManager).when(mTelephonyManager).createForSubscriptionId(
+                SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+        doReturn(mServiceState).when(mTelephonyManager).getServiceState();
+        mPersistableBundle = new PersistableBundle();
+        doReturn(mPersistableBundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
+
+        mPreference = new ListPreference(mContext);
+        mController = new PreferredNetworkModePreferenceController(mContext, "mobile_data");
+        mController.init(SUB_ID);
+        mPreference.setKey(mController.getPreferenceKey());
+    }
+
+    @After
+    public void tearDown() {
+        Settings.Global.putInt(
+            mContext.getContentResolver(), Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID, 0);
+    }
+
+    @Test
+    public void getAvailabilityStatus_hideCarrierNetworkSettings_returnUnavailable() {
+        mPersistableBundle.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL,
+                true);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_worldPhone_returnAvailable() {
+        mPersistableBundle.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL,
+                false);
+        mPersistableBundle.putBoolean(CarrierConfigManager.KEY_WORLD_PHONE_BOOL, true);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_hidePreferredNetworkType_returnUnavailable() {
+        mPersistableBundle.putBoolean(CarrierConfigManager.KEY_HIDE_PREFERRED_NETWORK_TYPE_BOOL,
+                true);
+
+        when(mServiceState.getState()).thenReturn(ServiceState.STATE_OUT_OF_SERVICE);
+        when(mServiceState.getDataRegistrationState()).thenReturn(
+                ServiceState.STATE_OUT_OF_SERVICE);
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+
+        when(mServiceState.getState()).thenReturn(ServiceState.STATE_IN_SERVICE);
+        when(mServiceState.getDataRegistrationState()).thenReturn(ServiceState.STATE_IN_SERVICE);
+
+        when(mServiceState.getRoaming()).thenReturn(false);
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+
+        when(mServiceState.getRoaming()).thenReturn(true);
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
+    public void updateState_updateByNetworkMode() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID,
+                TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_GSM_WCDMA);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.getValue()).isEqualTo(
+                String.valueOf(TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_GSM_WCDMA));
+        assertThat(mPreference.getSummary()).isEqualTo(
+                resourceString("preferred_network_mode_tdscdma_gsm_wcdma_summary"));
+    }
+
+    @Test
+    public void onPreferenceChange_updateSuccess() {
+        doReturn(true).when(mTelephonyManager).setPreferredNetworkTypeBitmask(
+                getRafFromNetworkType(TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA));
+
+        mController.onPreferenceChange(mPreference,
+                String.valueOf(TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA));
+
+        assertThat(Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID, 0)).isEqualTo(
+                TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA);
+    }
+
+    @Test
+    public void onPreferenceChange_updateFail() {
+        doReturn(false).when(mTelephonyManager).setPreferredNetworkTypeBitmask(
+            getRafFromNetworkType(TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA));
+
+        mController.onPreferenceChange(mPreference,
+                String.valueOf(TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA));
+
+        assertThat(Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID, 0)).isNotEqualTo(
+                TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA);
+    }
+
+    public int resourceId(String type, String name) {
+        return mContext.getResources().getIdentifier(name, type, mContext.getPackageName());
+    }
+
+    public String resourceString(String name) {
+        return mContext.getResources().getString(resourceId("string", name));
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/telephony/TelephonyBasePreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/TelephonyBasePreferenceControllerTest.java
new file mode 100644
index 0000000..4fb31f2
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/TelephonyBasePreferenceControllerTest.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.util.Arrays;
+
+@RunWith(AndroidJUnit4.class)
+public class TelephonyBasePreferenceControllerTest {
+    private static final int VALID_SUB_ID = 1;
+
+    @Mock
+    private SubscriptionManager mSubscriptionManager;
+    @Mock
+    private SubscriptionInfo mSubscriptionInfo;
+
+    private TestPreferenceController mPreferenceController;
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        when(mContext.getSystemService(SubscriptionManager.class))
+                .thenReturn(mSubscriptionManager);
+        when(mSubscriptionInfo.getSubscriptionId()).thenReturn(VALID_SUB_ID);
+        mPreferenceController = new TestPreferenceController(mContext, "prefKey");
+    }
+
+    @Test
+    public void isAvailable_validSubIdSet_returnTrue() {
+        mPreferenceController.init(VALID_SUB_ID);
+
+        assertThat(mPreferenceController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_noIdSetHoweverHasDefaultOne_returnTrue() {
+        when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(
+                Arrays.asList(mSubscriptionInfo));
+
+        assertThat(mPreferenceController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_noDefaultAndNoSet_returnFalse() {
+        assertThat(mPreferenceController.isAvailable()).isFalse();
+    }
+
+    /**
+     * Test preference controller for {@link TelephonyBasePreferenceController}
+     */
+    public class TestPreferenceController extends TelephonyBasePreferenceController {
+        public TestPreferenceController(Context context, String prefKey) {
+            super(context, prefKey);
+        }
+
+        public void init(int subId) {
+            mSubId = subId;
+        }
+
+        @Override
+        public int getAvailabilityStatus(int subId) {
+            return subId == VALID_SUB_ID ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+        }
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/telephony/TelephonyTogglePreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/TelephonyTogglePreferenceControllerTest.java
new file mode 100644
index 0000000..e80a76e
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/TelephonyTogglePreferenceControllerTest.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class TelephonyTogglePreferenceControllerTest {
+
+    private Context mContext;
+    private FakeTelephonyToggle mFakeTelephonyToggle;
+
+    @Before
+    public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+        mFakeTelephonyToggle = new FakeTelephonyToggle(mContext, "key");
+    }
+
+    @Test
+    public void isSliceable_byDefault_shouldReturnFalse() {
+        assertThat(mFakeTelephonyToggle.isSliceable()).isFalse();
+    }
+
+    private static class FakeTelephonyToggle extends TelephonyTogglePreferenceController {
+
+        private FakeTelephonyToggle(Context context, String preferenceKey) {
+            super(context, preferenceKey);
+        }
+
+        @Override
+        public boolean isChecked() {
+            return false;
+        }
+
+        @Override
+        public boolean setChecked(boolean isChecked) {
+            return false;
+        }
+
+        @Override
+        public int getAvailabilityStatus(int subId) {
+            return 0;
+        }
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceControllerTest.java
new file mode 100644
index 0000000..98c71f59d
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceControllerTest.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony.gsm;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.ProgressDialog;
+import android.content.Context;
+import android.os.PersistableBundle;
+import android.telephony.CarrierConfigManager;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import androidx.lifecycle.Lifecycle;
+import androidx.preference.SwitchPreference;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+public class AutoSelectPreferenceControllerTest {
+    private static final int SUB_ID = 2;
+    private static final String OPERATOR_NAME = "T-mobile";
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private TelephonyManager mTelephonyManager;
+    @Mock
+    private SubscriptionManager mSubscriptionManager;
+    @Mock
+    private CarrierConfigManager mCarrierConfigManager;
+    @Mock
+    private ProgressDialog mProgressDialog;
+    @Mock
+    private Lifecycle mLifecycle;
+
+    private PersistableBundle mCarrierConfig;
+    private AutoSelectPreferenceController mController;
+    private SwitchPreference mSwitchPreference;
+    private Context mContext;
+
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(ApplicationProvider.getApplicationContext());
+
+        when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
+        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
+        when(mContext.getSystemService(CarrierConfigManager.class)).thenReturn(
+            mCarrierConfigManager);
+        when(mTelephonyManager.createForSubscriptionId(SUB_ID)).thenReturn(mTelephonyManager);
+
+        mCarrierConfig = new PersistableBundle();
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_ONLY_AUTO_SELECT_IN_HOME_NETWORK_BOOL,
+            true);
+        when(mCarrierConfigManager.getConfigForSubId(SUB_ID)).thenReturn(mCarrierConfig);
+
+        mSwitchPreference = new SwitchPreference(mContext);
+        mController = new AutoSelectPreferenceController(mContext, "auto_select");
+        mController.mProgressDialog = mProgressDialog;
+        mController.mSwitchPreference = mSwitchPreference;
+        mController.init(mLifecycle, SUB_ID);
+    }
+
+    @Test
+    public void setChecked_isChecked_showProgressDialog() {
+        when(mTelephonyManager.getNetworkSelectionMode()).thenReturn(
+            TelephonyManager.NETWORK_SELECTION_MODE_AUTO);
+
+        assertThat(mController.setChecked(true)).isFalse();
+
+        verify(mProgressDialog).show();
+        verify(mTelephonyManager).setNetworkSelectionModeAutomatic();
+    }
+
+    @Test
+    public void updateState_isRoaming_enabled() {
+        when(mTelephonyManager.getServiceState().getRoaming()).thenReturn(true);
+
+        mController.updateState(mSwitchPreference);
+
+        assertThat(mSwitchPreference.isEnabled()).isTrue();
+    }
+
+    @Test
+    public void updateState_notRoamingWithAutoSelectOn_disabled() {
+        when(mTelephonyManager.getServiceState().getRoaming()).thenReturn(false);
+        doReturn(OPERATOR_NAME).when(mTelephonyManager).getSimOperatorName();
+
+        mController.updateState(mSwitchPreference);
+
+        assertThat(mSwitchPreference.isEnabled()).isFalse();
+        assertThat(mSwitchPreference.getSummary()).isEqualTo(
+            resourceString("manual_mode_disallowed_summary",
+                mTelephonyManager.getSimOperatorName()));
+    }
+
+    @Test
+    public void init_carrierConfigNull_shouldNotCrash() {
+        when(mCarrierConfigManager.getConfigForSubId(SUB_ID)).thenReturn(null);
+
+        // Should not crash
+        mController.init(mLifecycle, SUB_ID);
+    }
+
+    public int resourceId(String type, String name) {
+        return mContext.getResources().getIdentifier(name, type, mContext.getPackageName());
+    }
+
+    public String resourceString(String name, Object value) {
+        return mContext.getResources().getString(resourceId("string", name), value);
+    }
+}
\ No newline at end of file
diff --git a/tests/unit/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceControllerTest.java
new file mode 100644
index 0000000..c204e0e
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceControllerTest.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony.gsm;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.PersistableBundle;
+import android.telephony.CarrierConfigManager;
+import android.telephony.ServiceState;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import androidx.lifecycle.Lifecycle;
+import androidx.preference.Preference;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.util.Arrays;
+
+@RunWith(AndroidJUnit4.class)
+public class OpenNetworkSelectPagePreferenceControllerTest {
+    private static final int SUB_ID = 2;
+    private static final String OPERATOR_NAME = "T-mobile";
+
+    @Mock
+    private TelephonyManager mTelephonyManager;
+    @Mock
+    private SubscriptionManager mSubscriptionManager;
+    @Mock
+    private CarrierConfigManager mCarrierConfigManager;
+    @Mock
+    private ServiceState mServiceState;
+    @Mock
+    private SubscriptionInfo mSubscriptionInfo;
+    @Mock
+    private Lifecycle mLifecycle;
+
+    private PersistableBundle mCarrierConfig;
+    private OpenNetworkSelectPagePreferenceController mController;
+    private Preference mPreference;
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(ApplicationProvider.getApplicationContext());
+
+        when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
+        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
+        when(mContext.getSystemService(CarrierConfigManager.class)).thenReturn(
+                mCarrierConfigManager);
+        when(mTelephonyManager.createForSubscriptionId(SUB_ID)).thenReturn(mTelephonyManager);
+        when(mTelephonyManager.getServiceState()).thenReturn(mServiceState);
+
+        mCarrierConfig = new PersistableBundle();
+        when(mCarrierConfigManager.getConfigForSubId(SUB_ID)).thenReturn(mCarrierConfig);
+
+        when(mSubscriptionInfo.getSubscriptionId()).thenReturn(SUB_ID);
+        when(mSubscriptionInfo.getCarrierName()).thenReturn(OPERATOR_NAME);
+
+        when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(
+                Arrays.asList(mSubscriptionInfo));
+        when(mSubscriptionManager.getAccessibleSubscriptionInfoList()).thenReturn(
+                Arrays.asList(mSubscriptionInfo));
+
+        when(mTelephonyManager.getNetworkOperatorName()).thenReturn(OPERATOR_NAME);
+
+        mPreference = new Preference(mContext);
+        mController = new OpenNetworkSelectPagePreferenceController(mContext,
+                "open_network_select");
+        mController.init(mLifecycle, SUB_ID);
+    }
+
+    @Test
+    public void updateState_modeAuto_disabled() {
+        when(mTelephonyManager.getNetworkSelectionMode()).thenReturn(
+                TelephonyManager.NETWORK_SELECTION_MODE_AUTO);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.isEnabled()).isFalse();
+    }
+
+    @Test
+    public void getSummary_inService_returnOperatorName() {
+        when(mServiceState.getState()).thenReturn(ServiceState.STATE_IN_SERVICE);
+
+        assertThat(mController.getSummary()).isEqualTo(OPERATOR_NAME);
+    }
+
+    @Test
+    public void getSummary_notInService_returnDisconnect() {
+        when(mServiceState.getState()).thenReturn(ServiceState.STATE_OUT_OF_SERVICE);
+
+        assertThat(mController.getSummary()).isEqualTo(resourceString("network_disconnected"));
+    }
+
+    public int resourceId(String type, String name) {
+        return mContext.getResources().getIdentifier(name, type, mContext.getPackageName());
+    }
+
+    public String resourceString(String name) {
+        return mContext.getResources().getString(resourceId("string", name));
+    }
+}
diff --git a/tests/unit/src/com/android/settings/notification/app/ChannelListPreferenceControllerTest.java b/tests/unit/src/com/android/settings/notification/app/ChannelListPreferenceControllerTest.java
new file mode 100644
index 0000000..b54782c
--- /dev/null
+++ b/tests/unit/src/com/android/settings/notification/app/ChannelListPreferenceControllerTest.java
@@ -0,0 +1,395 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.notification.app;
+
+import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
+import static android.app.NotificationManager.IMPORTANCE_HIGH;
+import static android.app.NotificationManager.IMPORTANCE_NONE;
+
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertFalse;
+import static junit.framework.TestCase.assertNotNull;
+import static junit.framework.TestCase.assertNull;
+import static junit.framework.TestCase.assertTrue;
+
+import android.app.Instrumentation;
+import android.app.NotificationChannel;
+import android.app.NotificationChannelGroup;
+import android.content.Context;
+
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.SmallTest;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import com.android.settings.notification.NotificationBackend;
+import com.android.settings.notification.NotificationBackend.NotificationsSentState;
+import com.android.settings.widget.PrimarySwitchPreference;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(AndroidJUnit4.class)
+@SmallTest
+public class ChannelListPreferenceControllerTest {
+    private Context mContext;
+    private NotificationBackend mBackend;
+    private NotificationBackend.AppRow mAppRow;
+    private ChannelListPreferenceController mController;
+    private PreferenceManager mPreferenceManager;
+    private PreferenceScreen mPreferenceScreen;
+    private PreferenceCategory mGroupList;
+
+    @Before
+    public void setUp() throws Exception {
+        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
+        mContext = instrumentation.getTargetContext();
+
+        instrumentation.runOnMainSync(() -> {
+            mBackend = new NotificationBackend();
+            mAppRow = mBackend.loadAppRow(mContext,
+                    mContext.getPackageManager(), mContext.getApplicationInfo());
+            mController = new ChannelListPreferenceController(mContext, mBackend);
+            mController.onResume(mAppRow, null, null, null, null, null);
+            mPreferenceManager = new PreferenceManager(mContext);
+            mPreferenceScreen = mPreferenceManager.createPreferenceScreen(mContext);
+            mGroupList = new PreferenceCategory(mContext);
+            mPreferenceScreen.addPreference(mGroupList);
+        });
+    }
+
+    @Test
+    @UiThreadTest
+    public void testUpdateFullList_incrementalUpdates() {
+        // Start by testing the case with no groups or channels
+        List<NotificationChannelGroup> inGroups = new ArrayList<>();
+        mController.updateFullList(mGroupList, inGroups);
+        {
+            assertEquals(1, mGroupList.getPreferenceCount());
+            assertEquals("zeroCategories", mGroupList.getPreference(0).getKey());
+        }
+
+        // Test that adding a group clears the zero category and adds everything
+        NotificationChannelGroup inGroup1 = new NotificationChannelGroup("group1", "Group 1");
+        inGroup1.addChannel(new NotificationChannel("ch1a", "Channel 1A", IMPORTANCE_DEFAULT));
+        inGroups.add(inGroup1);
+        mController.updateFullList(mGroupList, inGroups);
+        {
+            assertEquals(1, mGroupList.getPreferenceCount());
+            PreferenceGroup group1 = (PreferenceGroup) mGroupList.getPreference(0);
+            assertEquals("group1", group1.getKey());
+            assertEquals(2, group1.getPreferenceCount());
+            assertNull(group1.getPreference(0).getKey());
+            assertEquals("All \"Group 1\" notifications", group1.getPreference(0).getTitle());
+            assertEquals("ch1a", group1.getPreference(1).getKey());
+            assertEquals("Channel 1A", group1.getPreference(1).getTitle());
+        }
+
+        // Test that adding a channel works -- no dupes or omissions
+        inGroup1.addChannel(new NotificationChannel("ch1b", "Channel 1B", IMPORTANCE_DEFAULT));
+        mController.updateFullList(mGroupList, inGroups);
+        {
+            assertEquals(1, mGroupList.getPreferenceCount());
+            PreferenceGroup group1 = (PreferenceGroup) mGroupList.getPreference(0);
+            assertEquals("group1", group1.getKey());
+            assertEquals(3, group1.getPreferenceCount());
+            assertNull(group1.getPreference(0).getKey());
+            assertEquals("All \"Group 1\" notifications", group1.getPreference(0).getTitle());
+            assertEquals("ch1a", group1.getPreference(1).getKey());
+            assertEquals("Channel 1A", group1.getPreference(1).getTitle());
+            assertEquals("ch1b", group1.getPreference(2).getKey());
+            assertEquals("Channel 1B", group1.getPreference(2).getTitle());
+        }
+
+        // Test that renaming a channel does in fact rename the preferences
+        inGroup1.getChannels().get(1).setName("Channel 1B - Renamed");
+        mController.updateFullList(mGroupList, inGroups);
+        {
+            assertEquals(1, mGroupList.getPreferenceCount());
+            PreferenceGroup group1 = (PreferenceGroup) mGroupList.getPreference(0);
+            assertEquals("group1", group1.getKey());
+            assertEquals(3, group1.getPreferenceCount());
+            assertNull(group1.getPreference(0).getKey());
+            assertEquals("All \"Group 1\" notifications", group1.getPreference(0).getTitle());
+            assertEquals("ch1a", group1.getPreference(1).getKey());
+            assertEquals("Channel 1A", group1.getPreference(1).getTitle());
+            assertEquals("ch1b", group1.getPreference(2).getKey());
+            assertEquals("Channel 1B - Renamed", group1.getPreference(2).getTitle());
+        }
+
+        // Test that adding a group works and results in the correct sorting.
+        NotificationChannelGroup inGroup0 = new NotificationChannelGroup("group0", "Group 0");
+        inGroup0.addChannel(new NotificationChannel("ch0b", "Channel 0B", IMPORTANCE_DEFAULT));
+        // NOTE: updateFullList takes a List which has been sorted, so we insert at 0 for this check
+        inGroups.add(0, inGroup0);
+        mController.updateFullList(mGroupList, inGroups);
+        {
+            assertEquals(2, mGroupList.getPreferenceCount());
+            PreferenceGroup group0 = (PreferenceGroup) mGroupList.getPreference(0);
+            assertEquals("group0", group0.getKey());
+            assertEquals(2, group0.getPreferenceCount());
+            assertNull(group0.getPreference(0).getKey());
+            assertEquals("All \"Group 0\" notifications", group0.getPreference(0).getTitle());
+            assertEquals("ch0b", group0.getPreference(1).getKey());
+            assertEquals("Channel 0B", group0.getPreference(1).getTitle());
+            PreferenceGroup group1 = (PreferenceGroup) mGroupList.getPreference(1);
+            assertEquals("group1", group1.getKey());
+            assertEquals(3, group1.getPreferenceCount());
+            assertNull(group1.getPreference(0).getKey());
+            assertEquals("All \"Group 1\" notifications", group1.getPreference(0).getTitle());
+            assertEquals("ch1a", group1.getPreference(1).getKey());
+            assertEquals("Channel 1A", group1.getPreference(1).getTitle());
+            assertEquals("ch1b", group1.getPreference(2).getKey());
+            assertEquals("Channel 1B - Renamed", group1.getPreference(2).getTitle());
+        }
+
+        // Test that adding a channel that comes before another works and has correct ordering.
+        // NOTE: the channels within a group are sorted inside updateFullList.
+        inGroup0.addChannel(new NotificationChannel("ch0a", "Channel 0A", IMPORTANCE_DEFAULT));
+        mController.updateFullList(mGroupList, inGroups);
+        {
+            assertEquals(2, mGroupList.getPreferenceCount());
+            PreferenceGroup group0 = (PreferenceGroup) mGroupList.getPreference(0);
+            assertEquals("group0", group0.getKey());
+            assertEquals(3, group0.getPreferenceCount());
+            assertNull(group0.getPreference(0).getKey());
+            assertEquals("All \"Group 0\" notifications", group0.getPreference(0).getTitle());
+            assertEquals("ch0a", group0.getPreference(1).getKey());
+            assertEquals("Channel 0A", group0.getPreference(1).getTitle());
+            assertEquals("ch0b", group0.getPreference(2).getKey());
+            assertEquals("Channel 0B", group0.getPreference(2).getTitle());
+            PreferenceGroup group1 = (PreferenceGroup) mGroupList.getPreference(1);
+            assertEquals("group1", group1.getKey());
+            assertEquals(3, group1.getPreferenceCount());
+            assertNull(group1.getPreference(0).getKey());
+            assertEquals("All \"Group 1\" notifications", group1.getPreference(0).getTitle());
+            assertEquals("ch1a", group1.getPreference(1).getKey());
+            assertEquals("Channel 1A", group1.getPreference(1).getTitle());
+            assertEquals("ch1b", group1.getPreference(2).getKey());
+            assertEquals("Channel 1B - Renamed", group1.getPreference(2).getTitle());
+        }
+
+        // Test that the "Other" group works.
+        // Also test a simultaneous addition and deletion.
+        inGroups.remove(inGroup0);
+        NotificationChannelGroup inGroupOther = new NotificationChannelGroup(null, null);
+        inGroupOther.addChannel(new NotificationChannel("chXa", "Other A", IMPORTANCE_DEFAULT));
+        inGroupOther.addChannel(new NotificationChannel("chXb", "Other B", IMPORTANCE_DEFAULT));
+        inGroups.add(inGroupOther);
+        mController.updateFullList(mGroupList, inGroups);
+        {
+            assertEquals(2, mGroupList.getPreferenceCount());
+            PreferenceGroup group1 = (PreferenceGroup) mGroupList.getPreference(0);
+            assertEquals("group1", group1.getKey());
+            assertEquals(3, group1.getPreferenceCount());
+            assertNull(group1.getPreference(0).getKey());
+            assertEquals("All \"Group 1\" notifications", group1.getPreference(0).getTitle());
+            assertEquals("ch1a", group1.getPreference(1).getKey());
+            assertEquals("Channel 1A", group1.getPreference(1).getTitle());
+            assertEquals("ch1b", group1.getPreference(2).getKey());
+            assertEquals("Channel 1B - Renamed", group1.getPreference(2).getTitle());
+            PreferenceGroup groupOther = (PreferenceGroup) mGroupList.getPreference(1);
+            assertEquals("categories", groupOther.getKey());
+            assertEquals(2, groupOther.getPreferenceCount());
+            assertEquals("chXa", groupOther.getPreference(0).getKey());
+            assertEquals("Other A", groupOther.getPreference(0).getTitle());
+            assertEquals("chXb", groupOther.getPreference(1).getKey());
+            assertEquals("Other B", groupOther.getPreference(1).getTitle());
+        }
+
+        // Test that the removal of a channel works.
+        inGroupOther.getChannels().remove(0);
+        mController.updateFullList(mGroupList, inGroups);
+        {
+            assertEquals(2, mGroupList.getPreferenceCount());
+            PreferenceGroup group1 = (PreferenceGroup) mGroupList.getPreference(0);
+            assertEquals("group1", group1.getKey());
+            assertEquals(3, group1.getPreferenceCount());
+            assertNull(group1.getPreference(0).getKey());
+            assertEquals("All \"Group 1\" notifications", group1.getPreference(0).getTitle());
+            assertEquals("ch1a", group1.getPreference(1).getKey());
+            assertEquals("Channel 1A", group1.getPreference(1).getTitle());
+            assertEquals("ch1b", group1.getPreference(2).getKey());
+            assertEquals("Channel 1B - Renamed", group1.getPreference(2).getTitle());
+            PreferenceGroup groupOther = (PreferenceGroup) mGroupList.getPreference(1);
+            assertEquals("categories", groupOther.getKey());
+            assertEquals(1, groupOther.getPreferenceCount());
+            assertEquals("chXb", groupOther.getPreference(0).getKey());
+            assertEquals("Other B", groupOther.getPreference(0).getTitle());
+        }
+
+        // Test that we go back to the empty state when clearing all groups and channels.
+        inGroups.clear();
+        mController.updateFullList(mGroupList, inGroups);
+        {
+            assertEquals(1, mGroupList.getPreferenceCount());
+            assertEquals("zeroCategories", mGroupList.getPreference(0).getKey());
+        }
+    }
+
+
+    @Test
+    @UiThreadTest
+    public void testUpdateFullList_groupBlockedChange() {
+        List<NotificationChannelGroup> inGroups = new ArrayList<>();
+        NotificationChannelGroup inGroup = new NotificationChannelGroup("group", "My Group");
+        inGroup.addChannel(new NotificationChannel("channelA", "Channel A", IMPORTANCE_DEFAULT));
+        inGroup.addChannel(new NotificationChannel("channelB", "Channel B", IMPORTANCE_NONE));
+        inGroups.add(inGroup);
+
+        // Test that the group is initially showing all preferences
+        mController.updateFullList(mGroupList, inGroups);
+        {
+            assertEquals(1, mGroupList.getPreferenceCount());
+            PreferenceGroup group = (PreferenceGroup) mGroupList.getPreference(0);
+            assertEquals("group", group.getKey());
+            assertEquals(3, group.getPreferenceCount());
+            SwitchPreference groupBlockPref = (SwitchPreference) group.getPreference(0);
+            assertNull(groupBlockPref.getKey());
+            assertEquals("All \"My Group\" notifications", groupBlockPref.getTitle());
+            assertTrue(groupBlockPref.isChecked());
+            PrimarySwitchPreference channelAPref = (PrimarySwitchPreference) group.getPreference(1);
+            assertEquals("channelA", channelAPref.getKey());
+            assertEquals("Channel A", channelAPref.getTitle());
+            assertEquals(Boolean.TRUE, channelAPref.getCheckedState());
+            PrimarySwitchPreference channelBPref = (PrimarySwitchPreference) group.getPreference(2);
+            assertEquals("channelB", channelBPref.getKey());
+            assertEquals("Channel B", channelBPref.getTitle());
+            assertEquals(Boolean.FALSE, channelBPref.getCheckedState());
+        }
+
+        // Test that when a group is blocked, the list removes its individual channel preferences
+        inGroup.setBlocked(true);
+        mController.updateFullList(mGroupList, inGroups);
+        {
+            assertEquals(1, mGroupList.getPreferenceCount());
+            PreferenceGroup group = (PreferenceGroup) mGroupList.getPreference(0);
+            assertEquals("group", group.getKey());
+            assertEquals(1, group.getPreferenceCount());
+            SwitchPreference groupBlockPref = (SwitchPreference) group.getPreference(0);
+            assertNull(groupBlockPref.getKey());
+            assertEquals("All \"My Group\" notifications", groupBlockPref.getTitle());
+            assertFalse(groupBlockPref.isChecked());
+        }
+
+        // Test that when a group is unblocked, the list adds its individual channel preferences
+        inGroup.setBlocked(false);
+        mController.updateFullList(mGroupList, inGroups);
+        {
+            assertEquals(1, mGroupList.getPreferenceCount());
+            PreferenceGroup group = (PreferenceGroup) mGroupList.getPreference(0);
+            assertEquals("group", group.getKey());
+            assertEquals(3, group.getPreferenceCount());
+            SwitchPreference groupBlockPref = (SwitchPreference) group.getPreference(0);
+            assertNull(groupBlockPref.getKey());
+            assertEquals("All \"My Group\" notifications", groupBlockPref.getTitle());
+            assertTrue(groupBlockPref.isChecked());
+            PrimarySwitchPreference channelAPref = (PrimarySwitchPreference) group.getPreference(1);
+            assertEquals("channelA", channelAPref.getKey());
+            assertEquals("Channel A", channelAPref.getTitle());
+            assertEquals(Boolean.TRUE, channelAPref.getCheckedState());
+            PrimarySwitchPreference channelBPref = (PrimarySwitchPreference) group.getPreference(2);
+            assertEquals("channelB", channelBPref.getKey());
+            assertEquals("Channel B", channelBPref.getTitle());
+            assertEquals(Boolean.FALSE, channelBPref.getCheckedState());
+        }
+    }
+
+    @Test
+    @UiThreadTest
+    public void testUpdateFullList_channelUpdates() {
+        List<NotificationChannelGroup> inGroups = new ArrayList<>();
+        NotificationChannelGroup inGroup = new NotificationChannelGroup("group", "Group");
+        NotificationChannel channelA =
+                new NotificationChannel("channelA", "Channel A", IMPORTANCE_HIGH);
+        NotificationChannel channelB =
+                new NotificationChannel("channelB", "Channel B", IMPORTANCE_NONE);
+        inGroup.addChannel(channelA);
+        inGroup.addChannel(channelB);
+        inGroups.add(inGroup);
+
+        NotificationsSentState sentA = new NotificationsSentState();
+        sentA.avgSentDaily = 2;
+        sentA.avgSentWeekly = 10;
+        NotificationsSentState sentB = new NotificationsSentState();
+        sentB.avgSentDaily = 0;
+        sentB.avgSentWeekly = 2;
+        mAppRow.sentByChannel.put("channelA", sentA);
+
+        // Test that the channels' properties are reflected in the preference
+        mController.updateFullList(mGroupList, inGroups);
+        {
+            assertEquals(1, mGroupList.getPreferenceCount());
+            PreferenceGroup group = (PreferenceGroup) mGroupList.getPreference(0);
+            assertEquals("group", group.getKey());
+            assertEquals(3, group.getPreferenceCount());
+            assertNull(group.getPreference(0).getKey());
+            assertEquals("All \"Group\" notifications", group.getPreference(0).getTitle());
+            PrimarySwitchPreference channelAPref = (PrimarySwitchPreference) group.getPreference(1);
+            assertEquals("channelA", channelAPref.getKey());
+            assertEquals("Channel A", channelAPref.getTitle());
+            assertEquals(Boolean.TRUE, channelAPref.getCheckedState());
+            assertEquals("~2 notifications per day", channelAPref.getSummary());
+            assertNotNull(channelAPref.getIcon());
+            PrimarySwitchPreference channelBPref = (PrimarySwitchPreference) group.getPreference(2);
+            assertEquals("channelB", channelBPref.getKey());
+            assertEquals("Channel B", channelBPref.getTitle());
+            assertEquals(Boolean.FALSE, channelBPref.getCheckedState());
+            assertNull(channelBPref.getSummary());
+            assertNull(channelBPref.getIcon());
+        }
+
+        channelA.setImportance(IMPORTANCE_NONE);
+        channelB.setImportance(IMPORTANCE_DEFAULT);
+
+        mAppRow.sentByChannel.remove("channelA");
+        mAppRow.sentByChannel.put("channelB", sentB);
+
+        // Test that changing the channels' properties correctly updates the preference
+        mController.updateFullList(mGroupList, inGroups);
+        {
+            assertEquals(1, mGroupList.getPreferenceCount());
+            PreferenceGroup group = (PreferenceGroup) mGroupList.getPreference(0);
+            assertEquals("group", group.getKey());
+            assertEquals(3, group.getPreferenceCount());
+            assertNull(group.getPreference(0).getKey());
+            assertEquals("All \"Group\" notifications", group.getPreference(0).getTitle());
+            PrimarySwitchPreference channelAPref = (PrimarySwitchPreference) group.getPreference(1);
+            assertEquals("channelA", channelAPref.getKey());
+            assertEquals("Channel A", channelAPref.getTitle());
+            assertEquals(Boolean.FALSE, channelAPref.getCheckedState());
+            assertNull(channelAPref.getSummary());
+            assertNull(channelAPref.getIcon());
+            PrimarySwitchPreference channelBPref = (PrimarySwitchPreference) group.getPreference(2);
+            assertEquals("channelB", channelBPref.getKey());
+            assertEquals("Channel B", channelBPref.getTitle());
+            assertEquals(Boolean.TRUE, channelBPref.getCheckedState());
+            assertEquals("~2 notifications per week", channelBPref.getSummary());
+            assertNotNull(channelBPref.getIcon());
+        }
+    }
+
+}
diff --git a/tests/unit/src/com/android/settings/sim/OWNERS b/tests/unit/src/com/android/settings/sim/OWNERS
new file mode 100644
index 0000000..273597e
--- /dev/null
+++ b/tests/unit/src/com/android/settings/sim/OWNERS
@@ -0,0 +1 @@
+include /src/com/android/settings/sim/OWNERS
diff --git a/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java b/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
index bc8a52a..4c9b3c5 100644
--- a/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
+++ b/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
@@ -15,31 +15,27 @@
  */
 package com.android.settings.wifi;
 
+import static androidx.test.InstrumentationRegistry.getInstrumentation;
 import static androidx.test.espresso.Espresso.onView;
 import static androidx.test.espresso.assertion.ViewAssertions.doesNotExist;
 import static androidx.test.espresso.assertion.ViewAssertions.matches;
 import static androidx.test.espresso.matcher.ViewMatchers.Visibility.VISIBLE;
 import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
 import static androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility;
-import static androidx.test.espresso.matcher.ViewMatchers.withId;
 import static androidx.test.espresso.matcher.ViewMatchers.withText;
 
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.startsWith;
-import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
 import android.content.Intent;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiConfiguration.NetworkSelectionStatus;
-import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.provider.Settings;
+import android.support.test.uiautomator.UiDevice;
 
 import androidx.fragment.app.Fragment;
 import androidx.test.InstrumentationRegistry;
@@ -48,11 +44,8 @@
 
 import com.android.settings.Settings.WifiSettingsActivity;
 import com.android.settingslib.utils.ThreadUtils;
-import com.android.settingslib.wifi.AccessPoint;
-import com.android.settingslib.wifi.TestAccessPointBuilder;
-import com.android.settingslib.wifi.WifiTracker;
-import com.android.settingslib.wifi.WifiTracker.WifiListener;
-import com.android.settingslib.wifi.WifiTrackerFactory;
+import com.android.wifitrackerlib.WifiEntry;
+import com.android.wifitrackerlib.WifiPickerTracker;
 
 import com.google.common.collect.Lists;
 
@@ -63,36 +56,28 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
-import java.nio.charset.StandardCharsets;
 import java.util.List;
 
 @RunWith(AndroidJUnit4.class)
 public class WifiSettingsUiTest {
-    private static final String TEST_SSID = "\"Test Ssid\"";
-    private static final String TEST_UNQUOTED_SSID = "Test Ssid";
-    private static final String TEST_BSSID = "0a:08:5c:67:89:00";
-    private static final int TEST_RSSI = 123;
-    private static final int TEST_NETWORK_ID = 1;
+    private static final String TEST_SSID = "Test Ssid";
+    private static final String TEST_KEY = "Test Key";
 
     // Keys used to lookup resources by name (see the resourceId/resourceString helper methods).
-    private static final String ID = "id";
     private static final String STRING = "string";
     private static final String WIFI_CONFIGURE_SETTINGS_PREFERENCE_TITLE =
             "wifi_configure_settings_preference_title";
     private static final String WIFI_SAVED_ACCESS_POINTS_LABEL = "wifi_saved_access_points_label";
     private static final String WIFI_EMPTY_LIST_WIFI_OFF = "wifi_empty_list_wifi_off";
     private static final String WIFI_DISPLAY_STATUS_CONNECTED = "wifi_display_status_connected";
-    private static final String WIFI_PASSWORD = "wifi_password";
-    private static final String WIFI_SHOW_PASSWORD = "wifi_show_password";
-    private static final String PASSWORD_LAYOUT = "password_layout";
-    private static final String PASSWORD = "password";
 
     @Mock
-    private WifiTracker mWifiTracker;
+    private WifiPickerTracker mWifiTracker;
     @Mock
-    private WifiManager mWifiManager;
+    private WifiPickerTracker.WifiPickerTrackerCallback mWifiListener;
+
     private Context mContext;
-    private WifiListener mWifiListener;
+    private UiDevice mDevice;
 
     @Rule
     public ActivityTestRule<WifiSettingsActivity> mActivityRule =
@@ -102,8 +87,7 @@
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mContext = InstrumentationRegistry.getTargetContext();
-        WifiTrackerFactory.setTestingWifiTracker(mWifiTracker);
-        when(mWifiTracker.getManager()).thenReturn(mWifiManager);
+        mDevice = UiDevice.getInstance(getInstrumentation());
     }
 
     /**
@@ -121,33 +105,6 @@
         return mContext.getResources().getString(resourceId(STRING, name));
     }
 
-    private void setupConnectedAccessPoint() {
-        WifiConfiguration config = new WifiConfiguration();
-        config.SSID = TEST_SSID;
-        config.BSSID = TEST_BSSID;
-        config.networkId = TEST_NETWORK_ID;
-        WifiInfo wifiInfo = new WifiInfo.Builder()
-                .setSsid(TEST_UNQUOTED_SSID.getBytes(StandardCharsets.UTF_8))
-                .setBssid(TEST_BSSID)
-                .setRssi(TEST_RSSI)
-                .setNetworkId(TEST_NETWORK_ID)
-                .build();
-        NetworkInfo networkInfo = new NetworkInfo(ConnectivityManager.TYPE_WIFI, 0, null, null);
-        networkInfo.setDetailedState(NetworkInfo.DetailedState.CONNECTED, null, null);
-        AccessPoint accessPoint = new AccessPoint(mContext, config);
-        accessPoint.update(config, wifiInfo, networkInfo);
-
-        assertThat(accessPoint.getSsidStr()).isEqualTo(TEST_UNQUOTED_SSID);
-        assertThat(accessPoint.getBssid()).isEqualTo(TEST_BSSID);
-        assertThat(accessPoint.getNetworkInfo()).isNotNull();
-        assertThat(accessPoint.isActive()).isTrue();
-        assertThat(accessPoint.getSettingsSummary()).isEqualTo(
-                resourceString(WIFI_DISPLAY_STATUS_CONNECTED));
-
-        when(mWifiTracker.getAccessPoints()).thenReturn(
-                Lists.asList(accessPoint, new AccessPoint[] {}));
-    }
-
     /** Launch the activity via an Intent with a String extra. */
     private void launchActivity(String extraName, String extraValue) {
         Intent intent = new Intent(Settings.ACTION_WIFI_SETTINGS);
@@ -156,11 +113,10 @@
         }
         mActivityRule.launchActivity(intent);
 
-        verify(mWifiTracker).getManager();
-
         List<Fragment> fragments =
                 mActivityRule.getActivity().getSupportFragmentManager().getFragments();
         assertThat(fragments.size()).isEqualTo(1);
+        ((WifiSettings) fragments.get(0)).mWifiPickerTracker = mWifiTracker;
         mWifiListener = (WifiSettings) fragments.get(0);
         assertThat(mWifiListener).isNotNull();
     }
@@ -171,13 +127,7 @@
     }
 
     private void setWifiState(int wifiState) {
-        when(mWifiManager.getWifiState()).thenReturn(wifiState);
-        when(mWifiManager.isWifiEnabled()).thenReturn(wifiState == WifiManager.WIFI_STATE_ENABLED);
-    }
-
-    private void callOnWifiStateChanged(int state) {
-        mActivityRule.getActivity().getMainThreadHandler()
-                .post(() -> mWifiListener.onWifiStateChanged(state));
+        when(mWifiTracker.getWifiState()).thenReturn(wifiState);
     }
 
     @Test
@@ -210,28 +160,32 @@
         when(mWifiTracker.getNumSavedNetworks()).thenReturn(1);
 
         launchActivity();
+        mActivityRule.getActivity().getMainThreadHandler()
+                .post(() -> mWifiListener.onNumSavedNetworksChanged());
 
         onView(allOf(withText(resourceId(STRING, WIFI_SAVED_ACCESS_POINTS_LABEL)),
                 withEffectiveVisibility(VISIBLE))).check(matches(isDisplayed()));
     }
 
     @Test
-    public void onDisableWifi_seeOffMessage() {
+    public void onWifiStateChanged_wifiDisabled_seeOffMessage() {
         setWifiState(WifiManager.WIFI_STATE_DISABLED);
 
         launchActivity();
-        callOnWifiStateChanged(WifiManager.WIFI_STATE_DISABLED);
+        mActivityRule.getActivity().getMainThreadHandler()
+                .post(() -> mWifiListener.onWifiStateChanged());
 
         onView(withText(startsWith(resourceString(WIFI_EMPTY_LIST_WIFI_OFF)))).check(
                 matches(isDisplayed()));
     }
 
     @Test
-    public void onEnableWifi_shouldNotSeeOffMessage() {
+    public void onWifiStateChanged_wifiEnabled_shouldNotSeeOffMessage() {
         setWifiState(WifiManager.WIFI_STATE_ENABLED);
 
         launchActivity();
-        callOnWifiStateChanged(WifiManager.WIFI_STATE_ENABLED);
+        mActivityRule.getActivity().getMainThreadHandler()
+                .post(() -> mWifiListener.onWifiStateChanged());
 
         onView(withText(startsWith(resourceString(WIFI_EMPTY_LIST_WIFI_OFF)))).check(
                 doesNotExist());
@@ -240,94 +194,55 @@
     @Test
     public void onConnected_shouldSeeConnectedMessage() {
         setWifiState(WifiManager.WIFI_STATE_ENABLED);
-        setupConnectedAccessPoint();
-        when(mWifiTracker.isConnected()).thenReturn(true);
+        final WifiEntry wifiEntry = mock(WifiEntry.class);
+        when(wifiEntry.getConnectedState()).thenReturn(WifiEntry.CONNECTED_STATE_CONNECTED);
+        when(wifiEntry.getSummary(false /* concise */))
+                .thenReturn(resourceString(WIFI_DISPLAY_STATUS_CONNECTED));
+        when(wifiEntry.getKey()).thenReturn(TEST_KEY);
+        when(mWifiTracker.getConnectedWifiEntry()).thenReturn(wifiEntry);
 
         launchActivity();
+        ThreadUtils.postOnMainThread(() -> mWifiListener.onWifiEntriesChanged());
+        mDevice.waitForIdle();
 
         onView(withText(resourceString(WIFI_DISPLAY_STATUS_CONNECTED))).check(
                 matches(isDisplayed()));
     }
 
     @Test
-    public void changingSecurityStateOnApShouldNotCauseMultipleListItems() {
+    public void changingSecurityStateOnAp_ShouldNotCauseMultipleListItems() {
         setWifiState(WifiManager.WIFI_STATE_ENABLED);
-        TestAccessPointBuilder builder = new TestAccessPointBuilder(mContext)
-                .setSsid(TEST_SSID)
-                .setSecurity(AccessPoint.SECURITY_NONE)
-                .setRssi(TEST_RSSI);
-        AccessPoint open = builder.build();
 
-        builder.setSecurity(AccessPoint.SECURITY_EAP);
-        AccessPoint eap = builder.build();
+        final WifiEntry openWifiEntry = mock(WifiEntry.class);
+        when(openWifiEntry.getTitle()).thenReturn(TEST_SSID);
+        when(openWifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_NONE);
 
-        builder.setSecurity(AccessPoint.SECURITY_WEP);
-        AccessPoint wep = builder.build();
+        final WifiEntry eapWifiEntry = mock(WifiEntry.class);
+        when(eapWifiEntry.getTitle()).thenReturn(TEST_SSID);
+        when(eapWifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_EAP);
 
-        // Return a different security state each time getAccessPoints is invoked
-        when(mWifiTracker.getAccessPoints())
-                .thenReturn(Lists.newArrayList(open))
-                .thenReturn(Lists.newArrayList(eap))
-                .thenReturn(Lists.newArrayList(wep));
+        final WifiEntry wepWifiEntry = mock(WifiEntry.class);
+        when(wepWifiEntry.getTitle()).thenReturn(TEST_SSID);
+        when(wepWifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_WEP);
+
+        // Return a different security state each time getWifiEntries is invoked
+        when(mWifiTracker.getWifiEntries())
+                .thenReturn(Lists.newArrayList(openWifiEntry))
+                .thenReturn(Lists.newArrayList(eapWifiEntry))
+                .thenReturn(Lists.newArrayList(wepWifiEntry));
 
         launchActivity();
 
+        ThreadUtils.postOnMainThread(() -> mWifiListener.onWifiEntriesChanged());
+        mDevice.waitForIdle();
         onView(withText(TEST_SSID)).check(matches(isDisplayed()));
 
-        ThreadUtils.postOnMainThread(() -> mWifiListener.onAccessPointsChanged());
+        ThreadUtils.postOnMainThread(() -> mWifiListener.onWifiEntriesChanged());
+        mDevice.waitForIdle();
         onView(withText(TEST_SSID)).check(matches(isDisplayed()));
 
-        ThreadUtils.postOnMainThread(() -> mWifiListener.onAccessPointsChanged());
+        ThreadUtils.postOnMainThread(() -> mWifiListener.onWifiEntriesChanged());
+        mDevice.waitForIdle();
         onView(withText(TEST_SSID)).check(matches(isDisplayed()));
     }
-
-    @Test
-    public void wrongPasswordSavedNetwork() {
-        setWifiState(WifiManager.WIFI_STATE_ENABLED);
-
-        // Set up an AccessPoint that is disabled due to incorrect password.
-        WifiConfiguration config = new WifiConfiguration();
-        config.SSID = TEST_SSID;
-        config.BSSID = TEST_BSSID;
-        config.networkId = TEST_NETWORK_ID;
-        config.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA_PSK);
-
-        NetworkSelectionStatus selectionStatus = new NetworkSelectionStatus.Builder()
-                .setNetworkSelectionDisableReason(
-                        NetworkSelectionStatus.DISABLED_BY_WRONG_PASSWORD)
-                .setNetworkSelectionStatus(
-                        NetworkSelectionStatus.NETWORK_SELECTION_TEMPORARY_DISABLED)
-                .build();
-        config.setNetworkSelectionStatus(selectionStatus);
-
-        WifiInfo wifiInfo = new WifiInfo.Builder()
-                .setSsid(TEST_UNQUOTED_SSID.getBytes(StandardCharsets.UTF_8))
-                .setBssid(TEST_BSSID)
-                .setRssi(TEST_RSSI)
-                .setNetworkId(TEST_NETWORK_ID)
-                .build();
-        AccessPoint accessPoint = new AccessPoint(mContext, config);
-        accessPoint.update(config, wifiInfo, null);
-
-        // Make sure we've set up our access point correctly.
-        assertThat(accessPoint.getSsidStr()).isEqualTo(TEST_UNQUOTED_SSID);
-        assertThat(accessPoint.getBssid()).isEqualTo(TEST_BSSID);
-        assertThat(accessPoint.isActive()).isFalse();
-        assertThat(accessPoint.getConfig()).isNotNull();
-        NetworkSelectionStatus networkStatus = accessPoint.getConfig().getNetworkSelectionStatus();
-        assertThat(networkStatus).isNotNull();
-        assertThat(networkStatus.getNetworkSelectionStatus())
-                .isEqualTo(NetworkSelectionStatus.NETWORK_SELECTION_TEMPORARY_DISABLED);
-        assertThat(networkStatus.getNetworkSelectionDisableReason()).isEqualTo(
-                NetworkSelectionStatus.DISABLED_BY_WRONG_PASSWORD);
-
-        when(mWifiTracker.getAccessPoints()).thenReturn(Lists.newArrayList(accessPoint));
-        launchActivity(WifiSettings.EXTRA_START_CONNECT_SSID, accessPoint.getSsidStr());
-
-        // Make sure that the password dialog is visible.
-        onView(withText(resourceId(STRING, WIFI_PASSWORD))).check(matches(isDisplayed()));
-        onView(withText(resourceId(STRING, WIFI_SHOW_PASSWORD))).check(matches(isDisplayed()));
-        onView(withId(resourceId(ID, PASSWORD_LAYOUT))).check(matches(isDisplayed()));
-        onView(withId(resourceId(ID, PASSWORD))).check(matches(isDisplayed()));
-    }
 }
diff --git a/tests/unit/src/com/android/settings/wifi/calling/OWNERS b/tests/unit/src/com/android/settings/wifi/calling/OWNERS
new file mode 100644
index 0000000..b592652
--- /dev/null
+++ b/tests/unit/src/com/android/settings/wifi/calling/OWNERS
@@ -0,0 +1 @@
+include /src/com/android/settings/wifi/calling/OWNERS
diff --git a/tests/unit/src/com/android/settings/wifi/dpp/WifiNetworkListFragmentTest.java b/tests/unit/src/com/android/settings/wifi/dpp/WifiNetworkListFragmentTest.java
deleted file mode 100644
index fec0c6f..0000000
--- a/tests/unit/src/com/android/settings/wifi/dpp/WifiNetworkListFragmentTest.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi.dpp;
-
-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.assertion.ViewAssertions.matches;
-import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static androidx.test.espresso.matcher.ViewMatchers.withText;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.Intent;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-import android.net.Uri;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
-import android.provider.Settings;
-
-import androidx.fragment.app.Fragment;
-import androidx.test.InstrumentationRegistry;
-import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
-
-import com.android.settingslib.wifi.AccessPoint;
-import com.android.settingslib.wifi.WifiTracker;
-import com.android.settingslib.wifi.WifiTrackerFactory;
-
-import com.google.common.collect.Lists;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-
-@RunWith(AndroidJUnit4.class)
-public class WifiNetworkListFragmentTest {
-    private static final String TEST_SSID = "\"Test Ssid\"";
-    private static final String TEST_UNQUOTED_SSID = "Test Ssid";
-    private static final String TEST_BSSID = "0a:08:5c:67:89:00";
-    private static final int TEST_RSSI = 123;
-    private static final int TEST_NETWORK_ID = 1;
-
-    private static final String TEST_DPP_URL = "DPP:C:81/1;I:DPP_TESTER;K:"
-        + "MDkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDIgADUysZxnwRFGQR7Fepipjl84TG/dQR07es91iOB3PkPOk=;;";
-
-    // Keys used to lookup resources by name (see the resourceId/resourceString helper methods).
-    private static final String ID = "id";
-    private static final String STRING = "string";
-    private static final String WIFI_DISPLAY_STATUS_CONNECTED = "wifi_display_status_connected";
-
-    @Mock
-    private WifiTracker mWifiTracker;
-    @Mock
-    private WifiManager mWifiManager;
-
-    private WifiNetworkListFragment mWifiNetworkListFragment;
-    private Context mContext;
-
-    @Rule
-    public ActivityTestRule<WifiDppConfiguratorActivity> mActivityRule = new ActivityTestRule<>(
-            WifiDppConfiguratorActivity.class, true);
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = InstrumentationRegistry.getTargetContext();
-        WifiTrackerFactory.setTestingWifiTracker(mWifiTracker);
-        when(mWifiTracker.getManager()).thenReturn(mWifiManager);
-    }
-
-    private void callOnWifiStateChanged(int state) {
-        mActivityRule.getActivity().getMainThreadHandler()
-                .post(() -> mWifiNetworkListFragment.onWifiStateChanged(state));
-    }
-
-    /** Launch the activity via an Intent with data Uri */
-    private void launchActivity(String uriString) {
-        final Intent intent = new Intent(Settings.ACTION_PROCESS_WIFI_EASY_CONNECT_URI);
-        intent.setData(Uri.parse(uriString));
-        mActivityRule.launchActivity(intent);
-
-        List<Fragment> fragments =
-                mActivityRule.getActivity().getSupportFragmentManager().getFragments();
-        assertThat(fragments.size()).isEqualTo(1);
-        List<Fragment> childFragments = fragments.get(0).getChildFragmentManager().getFragments();
-        assertThat(childFragments.size()).isEqualTo(1);
-        mWifiNetworkListFragment = (WifiNetworkListFragment) childFragments.get(0);
-        assertThat(mWifiNetworkListFragment).isNotNull();
-    }
-
-    private int resourceId(String type, String name) {
-        return mContext.getResources().getIdentifier(name, type, mContext.getPackageName());
-    }
-
-    /** Similar to {@link #resourceId}, but for accessing R.string.<name> values. */
-    private String resourceString(String name) {
-        return mContext.getResources().getString(resourceId(STRING, name));
-    }
-
-    private void setWifiState(int wifiState) {
-        when(mWifiManager.getWifiState()).thenReturn(wifiState);
-        when(mWifiManager.isWifiEnabled()).thenReturn(wifiState == WifiManager.WIFI_STATE_ENABLED);
-    }
-
-    private void setupConnectedAccessPoint() {
-        final WifiConfiguration config = new WifiConfiguration();
-        config.SSID = TEST_SSID;
-        config.BSSID = TEST_BSSID;
-        config.networkId = TEST_NETWORK_ID;
-        config.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA_PSK);
-        final WifiInfo wifiInfo = new WifiInfo.Builder()
-                .setSsid(TEST_UNQUOTED_SSID.getBytes(StandardCharsets.UTF_8))
-                .setBssid(TEST_BSSID)
-                .setRssi(TEST_RSSI)
-                .setNetworkId(TEST_NETWORK_ID)
-                .build();
-        final NetworkInfo networkInfo = new NetworkInfo(ConnectivityManager.TYPE_WIFI, 0, null, null);
-        networkInfo.setDetailedState(NetworkInfo.DetailedState.CONNECTED, null, null);
-        final AccessPoint accessPoint = new AccessPoint(mContext, config);
-        accessPoint.update(config, wifiInfo, networkInfo);
-
-        assertThat(accessPoint.getSsidStr()).isEqualTo(TEST_UNQUOTED_SSID);
-        assertThat(accessPoint.getBssid()).isEqualTo(TEST_BSSID);
-        assertThat(accessPoint.getNetworkInfo()).isNotNull();
-        assertThat(accessPoint.isActive()).isTrue();
-        assertThat(accessPoint.getSettingsSummary()).isEqualTo(
-                resourceString(WIFI_DISPLAY_STATUS_CONNECTED));
-
-        when(mWifiTracker.getAccessPoints()).thenReturn(
-                Lists.asList(accessPoint, new AccessPoint[]{}));
-    }
-
-    @Test
-    public void onConnected_shouldSeeConnectedMessage() throws Exception {
-        setWifiState(WifiManager.WIFI_STATE_ENABLED);
-        setupConnectedAccessPoint();
-        when(mWifiTracker.isConnected()).thenReturn(true);
-
-        launchActivity(TEST_DPP_URL);
-        callOnWifiStateChanged(WifiManager.WIFI_STATE_ENABLED);
-
-        onView(withText(resourceString(WIFI_DISPLAY_STATUS_CONNECTED))).check(
-                matches(isDisplayed()));
-    }
-}